openssl: don't disable the AFALG engine based on host kernel

Whether the AFALG engine (use of hardware crypto via AF_ALG) is enable or
disable depends on whether the host kernel is 4.1 or above, which has no bearing
on whether the target system supports it.

Remove the complicated logic and simply enable/disable as requested.

(From OE-Core rev: 4b6c566c0540fe8e560d0feeb9c765c0eb6e5182)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-11-22 14:05:16 +00:00
committed by Richard Purdie
parent 64aca31a78
commit cd52b7670f
2 changed files with 32 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
Don't refuse to build afalgeng if cross-compiling or the host kernel is too old.
Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688]
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/Configure b/Configure
index 3baa8ce..9ef52ed 100755
--- a/Configure
+++ b/Configure
@@ -1550,20 +1550,7 @@ unless ($disabled{"crypto-mdebug-backtrace"})
unless ($disabled{afalgeng}) {
$config{afalgeng}="";
if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
- my $minver = 4*10000 + 1*100 + 0;
- if ($config{CROSS_COMPILE} eq "") {
- my $verstr = `uname -r`;
- my ($ma, $mi1, $mi2) = split("\\.", $verstr);
- ($mi2) = $mi2 =~ /(\d+)/;
- my $ver = $ma*10000 + $mi1*100 + $mi2;
- if ($ver < $minver) {
- $disabled{afalgeng} = "too-old-kernel";
- } else {
- push @{$config{engdirs}}, "afalg";
- }
- } else {
- $disabled{afalgeng} = "cross-compiling";
- }
+ push @{$config{engdirs}}, "afalg";
} else {
$disabled{afalgeng} = "not-linux";
}

View File

@@ -18,6 +18,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://0002-fix-CVE-2018-0734.patch \
file://0003-fix-CVE-2018-0735.patch \
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
file://afalg.patch \
"
SRC_URI_append_class-nativesdk = " \