From: Lee Chee Yang <chee.yang....@intel.com> upgrade include fix for CVE-2023-5678.
Changes in 3.2.0 https://www.openssl.org/news/cl32.txt drop upstreamed 0001-Link-libatomic-on-riscv32.patch. drop fix_random_labels.patch as fixed by https://github.com/openssl/openssl/commit/0fbc50ef0cb8894973d4739af62e95be825b7ccf Signed-off-by: Lee Chee Yang <chee.yang....@intel.com> --- .../0001-Link-libatomic-on-riscv32.patch | 35 ------------------- .../openssl/openssl/fix_random_labels.patch | 22 ------------ .../{openssl_3.1.4.bb => openssl_3.2.0.bb} | 4 +-- 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch delete mode 100644 meta/recipes-connectivity/openssl/openssl/fix_random_labels.patch rename meta/recipes-connectivity/openssl/{openssl_3.1.4.bb => openssl_3.2.0.bb} (98%) diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch b/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch deleted file mode 100644 index 2c54d8f685..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 73266b8573c71e6720453c4c5a9e6e8fa4daec65 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Sat, 21 Oct 2023 13:03:52 -0700 -Subject: [PATCH] Link libatomic on riscv32 - -GCC toolchains on linux are not able to build libcrypto without linking -to libatomic as it does not have all needed atomics implemented as -intrinsics - -Fixes errors like - -| ld: ./libcrypto.so: undefined reference to `__atomic_is_lock_free' - -Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/22460] -Signed-off-by: Khem Raj <raj.k...@gmail.com> ---- - Configurations/10-main.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf -index 46094f59c2..d1a15a1152 100644 ---- a/Configurations/10-main.conf -+++ b/Configurations/10-main.conf -@@ -816,7 +816,7 @@ my %targets = ( - }, - - "linux32-riscv32" => { -- inherit_from => [ "linux-generic32"], -+ inherit_from => [ "linux-latomic" ], - perlasm_scheme => "linux32", - asm_arch => 'riscv32', - }, --- -2.42.0 - diff --git a/meta/recipes-connectivity/openssl/openssl/fix_random_labels.patch b/meta/recipes-connectivity/openssl/openssl/fix_random_labels.patch deleted file mode 100644 index 78dcd81685..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/fix_random_labels.patch +++ /dev/null @@ -1,22 +0,0 @@ -The perl script adds random suffixes to the local function names to ensure -it doesn't clash with other parts of openssl. Set the random number seed -to something predictable so the assembler files are generated consistently -and our own reproducible builds tests pass. - -Upstream-Status: Pending -Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> - -Index: openssl-3.1.0/crypto/modes/asm/aes-gcm-avx512.pl -=================================================================== ---- openssl-3.1.0.orig/crypto/modes/asm/aes-gcm-avx512.pl -+++ openssl-3.1.0/crypto/modes/asm/aes-gcm-avx512.pl -@@ -191,6 +191,9 @@ my $CTX_OFFSET_HTable = (16 * 6); - # ;;; Helper functions - # ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -+# Ensure the local labels are reproduicble -+srand(10000); -+ - # ; Generates "random" local labels - sub random_string() { - my @chars = ('a' .. 'z', 'A' .. 'Z', '0' .. '9', '_'); diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.4.bb b/meta/recipes-connectivity/openssl/openssl_3.2.0.bb similarity index 98% rename from meta/recipes-connectivity/openssl/openssl_3.1.4.bb rename to meta/recipes-connectivity/openssl/openssl_3.2.0.bb index c6c70a1213..ab0562bd73 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.1.4.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.2.0.bb @@ -11,8 +11,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://run-ptest \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ - file://fix_random_labels.patch \ - file://0001-Link-libatomic-on-riscv32.patch \ file://0001-Added-handshake-history-reporting-when-test-fails.patch \ " @@ -20,7 +18,7 @@ SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "840af5366ab9b522bde525826be3ef0fb0af81c6a9ebd84caa600fea1731eee3" +SRC_URI[sha256sum] = "14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e" inherit lib_package multilib_header multilib_script ptest perlnative manpages MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191450): https://lists.openembedded.org/g/openembedded-core/message/191450 Mute This Topic: https://lists.openembedded.org/mt/102871091/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
