From f4fbf3e794953e80da1113a11ea7eb5fdad581cf Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 22 Sep 2025 15:22:20 -0400 Subject: [PATCH] openssl: update to 3.5.3 Removed upstreamed patch: 0001-Don-t-keep-the-store-open-in-by_store_ctrl_ex.patch Release notes: This is a bug fix release. This release incorporates the following bug fixes and mitigations: Added FIPS 140-3 PCT on DH key generation. Fixed the synthesised OPENSSL_VERSION_NUMBER. Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/20133 Signed-off-by: Hauke Mehrtens --- package/libs/openssl/Makefile | 6 +- ...p-the-store-open-in-by_store_ctrl_ex.patch | 129 ------------------ 2 files changed, 3 insertions(+), 132 deletions(-) delete mode 100644 package/libs/openssl/patches/0001-Don-t-keep-the-store-open-in-by_store_ctrl_ex.patch diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index beb682441d5..5ca2a2493b2 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=3.5.2 -PKG_RELEASE:=3 +PKG_VERSION:=3.5.3 +PKG_RELEASE:=1 PKG_BUILD_FLAGS:=no-mips16 gc-sections no-lto PKG_BUILD_PARALLEL:=1 @@ -21,7 +21,7 @@ PKG_SOURCE_URL:= \ https://www.openssl.org/source/old/$(PKG_BASE)/ \ https://github.com/openssl/openssl/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_HASH:=c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec +PKG_HASH:=c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE.txt diff --git a/package/libs/openssl/patches/0001-Don-t-keep-the-store-open-in-by_store_ctrl_ex.patch b/package/libs/openssl/patches/0001-Don-t-keep-the-store-open-in-by_store_ctrl_ex.patch deleted file mode 100644 index c1455815dde..00000000000 --- a/package/libs/openssl/patches/0001-Don-t-keep-the-store-open-in-by_store_ctrl_ex.patch +++ /dev/null @@ -1,129 +0,0 @@ -From c4c92f3e8aff38d75047847ded940e1b3f9b688f Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Thu, 7 Aug 2025 17:50:17 +0100 -Subject: [PATCH] Don't keep the store open in by_store_ctrl_ex -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Previously #27529 made a change to `by_store_ctrl_ex` in order to open -the OSSL_STORE early. The reason given in that PR is: - -"This way, we can call OSSL_STORE_open_ex() in by_store_ctrl_ex(), and -get to see possible errors when the URI is loaded" - -That PR then kept the store open until cache_objects is called and then -reused it. Unfortunately by the time cache_objects() is called we could be -in a multi-threaded scenario where the X509_STORE is being shared by -multiple threads. We then get a race condition where multiple threads are -all using (and ultimately closing) the same `OSSL_STORE_CTX`. - -The purpose of keeping the `OSSL_STORE` object between by_store_ctrl_ex() -and `cache_objects` is presumably an optimisation to avoid having to open -the store twice. But this does not work because of the above issue. - -We just take the hit and open it again. - -Fixes #28171 - -Reviewed-by: Saša Nedvědický -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/28198) - -(cherry picked from commit 08951fb27306ad9b4365103b8616b8545658ffcc) ---- - crypto/x509/by_store.c | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - ---- a/crypto/x509/by_store.c -+++ b/crypto/x509/by_store.c -@@ -17,7 +17,6 @@ typedef struct cached_store_st { - char *uri; - OSSL_LIB_CTX *libctx; - char *propq; -- OSSL_STORE_CTX *ctx; - } CACHED_STORE; - - DEFINE_STACK_OF(CACHED_STORE) -@@ -27,14 +26,12 @@ static int cache_objects(X509_LOOKUP *lc - const OSSL_STORE_SEARCH *criterion, int depth) - { - int ok = 0; -- OSSL_STORE_CTX *ctx = store->ctx; -+ OSSL_STORE_CTX *ctx; - X509_STORE *xstore = X509_LOOKUP_get_store(lctx); - -- if (ctx == NULL -- && (ctx = OSSL_STORE_open_ex(store->uri, store->libctx, store->propq, -- NULL, NULL, NULL, NULL, NULL)) == NULL) -+ if ((ctx = OSSL_STORE_open_ex(store->uri, store->libctx, store->propq, -+ NULL, NULL, NULL, NULL, NULL)) == NULL) - return 0; -- store->ctx = ctx; - - /* - * We try to set the criterion, but don't care if it was valid or not. -@@ -79,7 +76,6 @@ static int cache_objects(X509_LOOKUP *lc - substore.uri = (char *)OSSL_STORE_INFO_get0_NAME(info); - substore.libctx = store->libctx; - substore.propq = store->propq; -- substore.ctx = NULL; - ok = cache_objects(lctx, &substore, criterion, depth - 1); - } - } else { -@@ -105,7 +101,6 @@ static int cache_objects(X509_LOOKUP *lc - break; - } - OSSL_STORE_close(ctx); -- store->ctx = NULL; - - return ok; - } -@@ -114,7 +109,6 @@ static int cache_objects(X509_LOOKUP *lc - static void free_store(CACHED_STORE *store) - { - if (store != NULL) { -- OSSL_STORE_close(store->ctx); - OPENSSL_free(store->uri); - OPENSSL_free(store->propq); - OPENSSL_free(store); -@@ -136,6 +130,7 @@ static int by_store_ctrl_ex(X509_LOOKUP - if (argp != NULL) { - STACK_OF(CACHED_STORE) *stores = X509_LOOKUP_get_method_data(ctx); - CACHED_STORE *store = OPENSSL_zalloc(sizeof(*store)); -+ OSSL_STORE_CTX *sctx; - - if (store == NULL) { - return 0; -@@ -145,14 +140,20 @@ static int by_store_ctrl_ex(X509_LOOKUP - store->libctx = libctx; - if (propq != NULL) - store->propq = OPENSSL_strdup(propq); -- store->ctx = OSSL_STORE_open_ex(argp, libctx, propq, NULL, NULL, -- NULL, NULL, NULL); -- if (store->ctx == NULL -+ /* -+ * We open this to check for errors now - so we can report those -+ * errors early. -+ */ -+ sctx = OSSL_STORE_open_ex(argp, libctx, propq, NULL, NULL, -+ NULL, NULL, NULL); -+ if (sctx == NULL - || (propq != NULL && store->propq == NULL) - || store->uri == NULL) { -+ OSSL_STORE_close(sctx); - free_store(store); - return 0; - } -+ OSSL_STORE_close(sctx); - - if (stores == NULL) { - stores = sk_CACHED_STORE_new_null(); -@@ -174,7 +175,6 @@ static int by_store_ctrl_ex(X509_LOOKUP - store.uri = (char *)argp; - store.libctx = libctx; - store.propq = (char *)propq; -- store.ctx = NULL; - return cache_objects(ctx, &store, NULL, 0); - } - default: -- 2.47.3