Skip to contentSkip to conversation

openssl: Upgrade 3.0.14 -> 3.0.15

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.0.14 -> 3.0.15

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.

Detailed Information:
https://github.com/openssl/openssl/blob/openssl-3.0/CHANGES.md#changes-between-3014-and-3015-3-sep-2024

---
 .../openssl/openssl/CVE-2024-5535_1.patch     |  115 --
 .../openssl/openssl/CVE-2024-5535_2.patch     |   44 -
 .../openssl/openssl/CVE-2024-5535_3.patch     |   84 --
 .../openssl/openssl/CVE-2024-5535_4.patch     |  178 ---
 .../openssl/openssl/CVE-2024-5535_5.patch     | 1175 -----------------
 .../openssl/openssl/CVE-2024-5535_6.patch     |   45 -
 .../openssl/openssl/CVE-2024-5535_7.patch     |   68 -
 .../openssl/openssl/CVE-2024-5535_8.patch     |  273 ----
 .../openssl/openssl/CVE-2024-5535_9.patch     |  205 ---
 .../{openssl_3.0.14.bb => openssl_3.0.15.bb}  |   13 +-
 10 files changed, 2 insertions(+), 2198 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_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.0.14.bb => openssl_3.0.15.bb} (94%)
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_1.patch deleted +0 -115
deleted file mode 100644
index a96af0ed13..0000000000
@@ -1,115 +0,0 @@
-From e6190fc977f086428cc7880f95e8bcd5a11ac193 Mon Sep 17 00:00:00 2001
-From: Matt Caswell <[email protected]>
-Date: Fri, 31 May 2024 11:14:33 +0100
-Subject: [PATCH 1/9] Fix SSL_select_next_proto
-
-Ensure that the provided client list is non-NULL and starts with a valid
-entry. When called from the ALPN callback the client list should already
-have been validated by OpenSSL so this should not cause a problem. When
-called from the NPN callback the client list is locally configured and
-will not have already been validated. Therefore SSL_select_next_proto
-should not assume that it is correctly formatted.
-
-We implement stricter checking of the client protocol list. We also do the
-same for the server list while we are about it.
-
-CVE-2024-5535
-
-Reviewed-by: Neil Horman <[email protected]>
-Reviewed-by: Tomas Mraz <[email protected]>
-(Merged from https://github.com/openssl/openssl/pull/24718)
-
-(cherry picked from commit 4ada436a1946cbb24db5ab4ca082b69c1bc10f37)
-
-Upstream-Status: Backport from [https://github.com/openssl/openssl/commit/cf6f91f6121f4db167405db2f0de410a456f260c]
-CVE: CVE-2024-5535
-Signed-off-by: Siddharth Doshi <[email protected]>
----
- ssl/ssl_lib.c | 63 ++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 40 insertions(+), 23 deletions(-)
-
-diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
-index cb4e006..e628140 100644
---- a/ssl/ssl_lib.c
-+++ b/ssl/ssl_lib.c
-@@ -2952,37 +2952,54 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
-                           unsigned int server_len,
-                           const unsigned char *client, unsigned int client_len)
- {
--    unsigned int i, j;
--    const unsigned char *result;
--    int status = OPENSSL_NPN_UNSUPPORTED;
-+    PACKET cpkt, csubpkt, spkt, ssubpkt;
-+
-+    if (!PACKET_buf_init(&cpkt, client, client_len)
-+            || !PACKET_get_length_prefixed_1(&cpkt, &csubpkt)
-+            || PACKET_remaining(&csubpkt) == 0) {
-+        *out = NULL;
-+        *outlen = 0;
-+        return OPENSSL_NPN_NO_OVERLAP;
-+    }
-+
-+    /*
-+     * Set the default opportunistic protocol. Will be overwritten if we find
-+     * a match.
-+     */
-+    *out = (unsigned char *)PACKET_data(&csubpkt);
-+    *outlen = (unsigned char)PACKET_remaining(&csubpkt);
- 
-     /*
-      * For each protocol in server preference order, see if we support it.
-      */
--    for (i = 0; i < server_len;) {
--        for (j = 0; j < client_len;) {
--            if (server[i] == client[j] &&
--                memcmp(&server[i + 1], &client[j + 1], server[i]) == 0) {
--                /* We found a match */
--                result = &server[i];
--                status = OPENSSL_NPN_NEGOTIATED;
--                goto found;
-+    if (PACKET_buf_init(&spkt, server, server_len)) {
-+        while (PACKET_get_length_prefixed_1(&spkt, &ssubpkt)) {
-+            if (PACKET_remaining(&ssubpkt) == 0)
-+                continue; /* Invalid - ignore it */
-+            if (PACKET_buf_init(&cpkt, client, client_len)) {
-+                while (PACKET_get_length_prefixed_1(&cpkt, &csubpkt)) {
-+                    if (PACKET_equal(&csubpkt, PACKET_data(&ssubpkt),
-+                                     PACKET_remaining(&ssubpkt))) {
-+                        /* We found a match */
-+                        *out = (unsigned char *)PACKET_data(&ssubpkt);
-+                        *outlen = (unsigned char)PACKET_remaining(&ssubpkt);
-+                        return OPENSSL_NPN_NEGOTIATED;
-+                    }
-+                }
-+                /* Ignore spurious trailing bytes in the client list */
-+            } else {
-+                /* This should never happen */
-+                return OPENSSL_NPN_NO_OVERLAP;
-             }
--            j += client[j];
--            j++;
-         }
--        i += server[i];
--        i++;
-+        /* Ignore spurious trailing bytes in the server list */
-     }
- 
--    /* There's no overlap between our protocols and the server's list. */
--    result = client;
--    status = OPENSSL_NPN_NO_OVERLAP;
--
-- found:
--    *out = (unsigned char *)result + 1;
--    *outlen = result[0];
--    return status;
-+    /*
-+     * There's no overlap between our protocols and the server's list. We use
-+     * the default opportunistic protocol selected earlier
-+     */
-+    return OPENSSL_NPN_NO_OVERLAP;
- }
- 
- #ifndef OPENSSL_NO_NEXTPROTONEG
--- 
-2.25.1
-
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_2.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_3.patch deleted +0 -84

84 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_4.patch deleted +0 -178

178 lines not on this page · raw message

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

1,175 lines not on this page · raw message

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

45 lines not on this page · raw message

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

68 lines not on this page · raw message

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

273 lines not on this page · raw message

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

205 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl_3.0.15.bb renamed from meta/recipes-connectivity/openssl/openssl_3.0.14.bb +2 -11
similarity index 94%
rename from meta/recipes-connectivity/openssl/openssl_3.0.14.bb
rename to meta/recipes-connectivity/openssl/openssl_3.0.15.bb
index 8b9fd4a96b..b76a763cc3 100644
@@ -7,27 +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://afalg.patch \
            file://0001-Configure-do-not-tweak-mips-cflags.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 \
            "
 
 SRC_URI:append:class-nativesdk = " \
            file://environment.d-openssl.sh \
            "
 
-SRC_URI[sha256sum] = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"
+SRC_URI[sha256sum] = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533"
 
 inherit lib_package multilib_header multilib_script ptest perlnative
 MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
Signature · 1 line
2.34.1