Skip to contentSkip to conversation

openssl: Upgrade 3.2.2 -> 3.2.3

PATCH New Siddharth 1 participant 1 message Sep 6, 2024

lore
Share & tools
lore

Siddharth

author
#0 lore raw

PATCH 1/1 openssl: Upgrade 3.2.2 -> 3.2.3

From: Siddharth Doshi <[email protected]>

Updated SRC_URI link and format due to change in openssl website.

CVE's Fixed by upgrade:
CVE-2024-5535: Fixed possible buffer overread in SSL_select_next_proto().
CVE-2024-6119: Fixed possible denial of service in X.509 name checks

- Removed backports of CVE-2024-5535 as it is already fixed.
- Removed first hunk of 0001-Added-handshake-history-reporting-when-test-fails.patch as the copyright years are already updated in test/helpers/handshake.c file

Detailed Information:
https://github.com/openssl/openssl/blob/openssl-3.2/CHANGES.md#changes-between-322-and-323-3-sep-2024

---
 ...ke-history-reporting-when-test-fails.patch |    8 +-
 .../openssl/openssl/CVE-2024-5535_1.patch     |  113 --
 .../openssl/openssl/CVE-2024-5535_10.patch    |  203 ---
 .../openssl/openssl/CVE-2024-5535_2.patch     |   43 -
 .../openssl/openssl/CVE-2024-5535_3.patch     |   38 -
 .../openssl/openssl/CVE-2024-5535_4.patch     |   82 --
 .../openssl/openssl/CVE-2024-5535_5.patch     |  176 ---
 .../openssl/openssl/CVE-2024-5535_6.patch     | 1173 -----------------
 .../openssl/openssl/CVE-2024-5535_7.patch     |   43 -
 .../openssl/openssl/CVE-2024-5535_8.patch     |   66 -
 .../openssl/openssl/CVE-2024-5535_9.patch     |  271 ----
 .../{openssl_3.2.2.bb => openssl_3.2.3.bb}    |   14 +-
 12 files changed, 3 insertions(+), 2227 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_1.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_10.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_2.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_3.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_4.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_5.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_6.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_7.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_8.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_9.patch
 rename meta/recipes-connectivity/openssl/{openssl_3.2.2.bb => openssl_3.2.3.bb} (94%)
meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch +1 -7
index aa2e5bb800..9baa0c2d75 100644
@@ -6,6 +6,7 @@ Subject: [PATCH] Added handshake history reporting when test fails
 Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/22481]
 
 Signed-off-by: William Lyu <[email protected]>
+Signed-off-by: Siddharth Doshi <[email protected]>
 ---
  test/helpers/handshake.c | 139 +++++++++++++++++++++++++++++----------
  test/helpers/handshake.h |  70 +++++++++++++++++++-
@@ -16,13 +17,6 @@ diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c
 index e0422469e4..ae2ad59dd4 100644
 --- a/test/helpers/handshake.c
 +++ b/test/helpers/handshake.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
-+ * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
-  *
-  * Licensed under the Apache License 2.0 (the "License").  You may not use
-  * this file except in compliance with the License.  You can obtain a copy
 @@ -24,6 +24,102 @@
  #include <netinet/sctp.h>
  #endif
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_1.patch deleted +0 -113

113 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_10.patch deleted +0 -203

203 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_2.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_3.patch deleted +0 -38
deleted file mode 100644
index d6d4d869be..0000000000
@@ -1,38 +0,0 @@
-From 4f9334a33da89949f97927c8fe7df1003c42cda4 Mon Sep 17 00:00:00 2001
-From: Matt Caswell <[email protected]>
-Date: Fri, 31 May 2024 11:22:13 +0100
-Subject: [PATCH 03/10] Use correctly formatted ALPN data in tserver
-
-The QUIC test server was using incorrectly formatted ALPN data. With the
-previous implementation of SSL_select_next_proto this went unnoticed. With
-the new stricter implemenation it was failing.
-
-Follow on from CVE-2024-5535
-
-Reviewed-by: Neil Horman <[email protected]>
-Reviewed-by: Tomas Mraz <[email protected]>
-(Merged from https://github.com/openssl/openssl/pull/24717)
-
-Upstream-Status: Backport from [https://github.com/openssl/openssl/commit/6cc511826f09e513b4ec066d9b95acaf4f86d991]
-CVE: CVE-2024-5535
-Signed-off-by: Siddharth Doshi <[email protected]>
----
- ssl/quic/quic_tserver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ssl/quic/quic_tserver.c b/ssl/quic/quic_tserver.c
-index 86187d0..15694e7 100644
---- a/ssl/quic/quic_tserver.c
-+++ b/ssl/quic/quic_tserver.c
-@@ -58,7 +58,7 @@ static int alpn_select_cb(SSL *ssl, const unsigned char **out,
- 
-     if (srv->args.alpn == NULL) {
-         alpn = alpndeflt;
--        alpnlen = sizeof(alpn);
-+        alpnlen = sizeof(alpndeflt);
-     } else {
-         alpn = srv->args.alpn;
-         alpnlen = srv->args.alpnlen;
--- 
-2.44.0
-
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_4.patch deleted +0 -82

82 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_5.patch deleted +0 -176

176 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_6.patch deleted +0 -1173

1,173 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_7.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_8.patch deleted +0 -66

66 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_9.patch deleted +0 -271

271 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl_3.2.3.bb renamed from meta/recipes-connectivity/openssl/openssl_3.2.2.bb +2 -12
similarity index 94%
rename from meta/recipes-connectivity/openssl/openssl_3.2.2.bb
rename to meta/recipes-connectivity/openssl/openssl_3.2.3.bb
index 3242dd69c6..53139df40c 100644
@@ -7,28 +7,18 @@ SECTION = "libs/network"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04"
 
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
+SRC_URI = "https://github.com/openssl/openssl/releases/download/openssl-${PV}/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://0001-Added-handshake-history-reporting-when-test-fails.patch \
-           file://CVE-2024-5535_1.patch \
-           file://CVE-2024-5535_2.patch \
-           file://CVE-2024-5535_3.patch \
-           file://CVE-2024-5535_4.patch \
-           file://CVE-2024-5535_5.patch \
-           file://CVE-2024-5535_6.patch \
-           file://CVE-2024-5535_7.patch \
-           file://CVE-2024-5535_8.patch \
-           file://CVE-2024-5535_9.patch \
-           file://CVE-2024-5535_10.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
            file://environment.d-openssl.sh \
            "
 
-SRC_URI[sha256sum] = "197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7"
+SRC_URI[sha256sum] = "52b5f1c6b8022bc5868c308c54fb77705e702d6c6f4594f99a0df216acf46239"
 
 inherit lib_package multilib_header multilib_script ptest perlnative manpages
 MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
Signature · 1 line
2.34.1