One additional comment on the content of your subject line: You should start with the base recipe name so reviewers know what recipe you are changing, so something like "openssl: upgrade 3.0.7 -> 3.0.8" would be appropriate for this patch.
Thanks! Steve On Thu, Feb 9, 2023 at 4:37 AM mv <sdo...@mvista.com> wrote: > > From: Siddharth Doshi <sdo...@mvista.com> > > OpenSSL 3.0.8 fixes 1 HIGH level security vulnerability and 7 MODERATE level > security vulnerability [1]. > > Upgrade the recipe to point to 3.0.8. > > CVE-2022-3996 is reported fixed in 3.0.8, so drop the patch for that as > well. > > [1] https://www.openssl.org/news/vulnerabilities.html > > CVEs Fixed: > https://www.openssl.org/news/secadv/20230207.txt > > Signed-off-by: Siddharth Doshi <sdo...@mvista.com> > --- > .../openssl/openssl/CVE-2022-3996.patch | 43 ------------------- > .../{openssl_3.0.7.bb => openssl_3.0.8.bb} | 3 +- > 2 files changed, 1 insertion(+), 45 deletions(-) > delete mode 100644 > meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch > rename meta/recipes-connectivity/openssl/{openssl_3.0.7.bb => > openssl_3.0.8.bb} (98%) > > diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch > b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch > deleted file mode 100644 > index 6d70b323d1..0000000000 > --- a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 > -From: Pauli <pa...@openssl.org> > -Date: Fri, 11 Nov 2022 09:40:19 +1100 > -Subject: [PATCH] x509: fix double locking problem > - > -This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the > -redundant flag setting. > - > -Fixes #19643 > - > -Fixes LOW CVE-2022-3996 > - > -Reviewed-by: Dmitry Belyavskiy <beld...@gmail.com> > -Reviewed-by: Tomas Mraz <to...@openssl.org> > -(Merged from https://github.com/openssl/openssl/pull/19652) > - > -(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) > - > -Upstream-Status: Backport > [https://github.com/openssl/openssl/commit/7725e7bfe6f2ce8146b6552b44e0d226be7638e7] > -CVE: CVE-2022-3996 > -Signed-off-by: Vivek Kumbhar <vkumb...@mvista.com> > ---- > - crypto/x509/pcy_map.c | 4 ---- > - 1 file changed, 4 deletions(-) > - > -diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c > -index 05406c6493..60dfd1e320 100644 > ---- a/crypto/x509/pcy_map.c > -+++ b/crypto/x509/pcy_map.c > -@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, > POLICY_MAPPINGS *maps) > - > - ret = 1; > - bad_mapping: > -- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { > -- x->ex_flags |= EXFLAG_INVALID_POLICY; > -- CRYPTO_THREAD_unlock(x->lock); > -- } > - sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); > - return ret; > - > --- > -2.30.2 > - > diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb > b/meta/recipes-connectivity/openssl/openssl_3.0.8.bb > similarity index 98% > rename from meta/recipes-connectivity/openssl/openssl_3.0.7.bb > rename to meta/recipes-connectivity/openssl/openssl_3.0.8.bb > index 1842148592..8771884dda 100644 > --- a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb > +++ b/meta/recipes-connectivity/openssl/openssl_3.0.8.bb > @@ -12,14 +12,13 @@ SRC_URI = > "http://www.openssl.org/source/openssl-${PV}.tar.gz \ > > file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ > file://afalg.patch \ > file://0001-Configure-do-not-tweak-mips-cflags.patch \ > - file://CVE-2022-3996.patch \ > " > > SRC_URI:append:class-nativesdk = " \ > file://environment.d-openssl.sh \ > " > > -SRC_URI[sha256sum] = > "83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e" > +SRC_URI[sha256sum] = > "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e" > > inherit lib_package multilib_header multilib_script ptest perlnative > MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" > -- > 2.25.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176968): https://lists.openembedded.org/g/openembedded-core/message/176968 Mute This Topic: https://lists.openembedded.org/mt/96853888/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
