diff --git a/package/mongoose/0001-improve-resiliency.patch b/package/mongoose/0001-improve-resiliency.patch deleted file mode 100644 index edeea4efba..0000000000 --- a/package/mongoose/0001-improve-resiliency.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 64abf061bf018fd78f31c200a57a3fb04f9f3ef2 Mon Sep 17 00:00:00 2001 -From: "Sergio R. Caprile" -Date: Mon, 13 Oct 2025 10:43:45 -0300 -Subject: [PATCH] improve resiliency - -CVE: CVE-2025-65502 -Upstream: https://github.com/cesanta/mongoose/commit/64abf061bf018fd78f31c200a57a3fb04f9f3ef2 -Signed-off-by: Thomas Perale ---- - mongoose.c | 1 + - src/tls_openssl.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/mongoose.c b/mongoose.c -index 4c72be8201..f860ab3b07 100644 ---- a/mongoose.c -+++ b/mongoose.c -@@ -14581,6 +14581,7 @@ static STACK_OF(X509_INFO) * load_ca_certs(struct mg_str ca) { - static bool add_ca_certs(SSL_CTX *ctx, STACK_OF(X509_INFO) * certs) { - int i; - X509_STORE *cert_store = SSL_CTX_get_cert_store(ctx); -+ if (cert_store == NULL) return false; - for (i = 0; i < sk_X509_INFO_num(certs); i++) { - X509_INFO *cert_info = sk_X509_INFO_value(certs, i); - if (cert_info->x509 && !X509_STORE_add_cert(cert_store, cert_info->x509)) -diff --git a/src/tls_openssl.c b/src/tls_openssl.c -index 37838d95ba..f51d6dd8b7 100644 ---- a/src/tls_openssl.c -+++ b/src/tls_openssl.c -@@ -39,6 +39,7 @@ static STACK_OF(X509_INFO) * load_ca_certs(struct mg_str ca) { - static bool add_ca_certs(SSL_CTX *ctx, STACK_OF(X509_INFO) * certs) { - int i; - X509_STORE *cert_store = SSL_CTX_get_cert_store(ctx); -+ if (cert_store == NULL) return false; - for (i = 0; i < sk_X509_INFO_num(certs); i++) { - X509_INFO *cert_info = sk_X509_INFO_value(certs, i); - if (cert_info->x509 && !X509_STORE_add_cert(cert_store, cert_info->x509)) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index 18b5e222ac..1a60b0c89c 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b6a6f69912c2cd0c67f85633c6b578d4dcdf385c3628acdcd21de28787c676e5 mongoose-7.17.tar.gz -sha256 9abc2509d90c01ff2a0c91abf73582cdbcf1d2dbcc0b7973097eced43cf4cdd4 LICENSE +sha256 87727cd2c240ff559b16e9710d44b61ba3513dbee50428bd8ee1596d7c58460a mongoose-7.22.tar.gz +sha256 f0d9cfd6f7d92f6ec061a5fb2882f67d2521a151bf09a637c33ca6181834b048 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 9b8920a9f3..207d31cdfa 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.17 +MONGOOSE_VERSION = 7.22 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE @@ -13,9 +13,6 @@ MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO -# 0001-improve-resiliency.patch -MONGOOSE_IGNORE_CVES += CVE-2025-65502 - MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y)