summaryrefslogtreecommitdiff
path: root/recipes-connectivity/openssl/openssl/afalg.patch
diff options
context:
space:
mode:
authorJeff Hatch <jhatch@multitech.com>2022-03-18 13:08:03 -0500
committerJohn Klug <john.klug@multitech.com>2022-03-18 18:14:03 -0500
commitd10c1108d0e22f171ee2d0deb07a4191b3566dd1 (patch)
tree95ec2fd7da5f39d94336cbce245b5fa0de8bc9b0 /recipes-connectivity/openssl/openssl/afalg.patch
parent3a63f2f997b6ab20ec4e0c616b485755209fa304 (diff)
downloadmeta-mlinux-d10c1108d0e22f171ee2d0deb07a4191b3566dd1.tar.gz
meta-mlinux-d10c1108d0e22f171ee2d0deb07a4191b3566dd1.tar.bz2
meta-mlinux-d10c1108d0e22f171ee2d0deb07a4191b3566dd1.zip
Add OpenSSL 1.1.1n to override 1.1.1k for CVE-2022-0778
Diffstat (limited to 'recipes-connectivity/openssl/openssl/afalg.patch')
-rw-r--r--recipes-connectivity/openssl/openssl/afalg.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-connectivity/openssl/openssl/afalg.patch b/recipes-connectivity/openssl/openssl/afalg.patch
new file mode 100644
index 0000000..b7c0e96
--- /dev/null
+++ b/recipes-connectivity/openssl/openssl/afalg.patch
@@ -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) {
+- disable('too-old-kernel', 'afalgeng');
+- } else {
+- push @{$config{engdirs}}, "afalg";
+- }
+- } else {
+- disable('cross-compiling', 'afalgeng');
+- }
++ push @{$config{engdirs}}, "afalg";
+ } else {
+ disable('not-linux', 'afalgeng');
+ }