summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2025-04-08 17:54:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-04-10 11:05:34 +0100
commit92c32a6de927af58ef072567c8d21a35657efcee (patch)
treea70cce17ae100b420771c8f5ede504716f840fbf
parentf762d4537c6ef968e3ec9dc695dea8568a413071 (diff)
downloadpoky-92c32a6de927af58ef072567c8d21a35657efcee.tar.gz
openssl: upgrade 3.4.1 -> 3.5.0
This is new openssl LTS release. Release information: * https://openssl-library.org/post/2025-02-20-openssl-3.5-lts/ * https://openssl-library.org/post/2025-04-08-openssl-35-final-release/ * https://github.com/openssl/openssl/releases/tag/openssl-3.5.0 * https://github.com/openssl/openssl/blob/openssl-3.5.0/NEWS.md#openssl-35 packages-split directory does not show any changes relevant for packaging change. There are new config options but they don't seem to be significant enough to need explicit packageconfig options. (From OE-Core rev: 6ff6e86a06ba081eb9afd83e62c128f987cce0ef) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch12
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch2
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch8
-rw-r--r--meta/recipes-connectivity/openssl/openssl_3.5.0.bb (renamed from meta/recipes-connectivity/openssl/openssl_3.4.1.bb)2
4 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch b/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch
index 31bbbd8679..5b7365a353 100644
--- a/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch
+++ b/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch
@@ -16,7 +16,7 @@ diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c
16index f611b3a..5703b48 100644 16index f611b3a..5703b48 100644
17--- a/test/helpers/handshake.c 17--- a/test/helpers/handshake.c
18+++ b/test/helpers/handshake.c 18+++ b/test/helpers/handshake.c
19@@ -24,6 +24,102 @@ 19@@ -25,6 +25,102 @@
20 #include <netinet/sctp.h> 20 #include <netinet/sctp.h>
21 #endif 21 #endif
22 22
@@ -119,7 +119,7 @@ index f611b3a..5703b48 100644
119 HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void) 119 HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void)
120 { 120 {
121 HANDSHAKE_RESULT *ret; 121 HANDSHAKE_RESULT *ret;
122@@ -725,15 +821,6 @@ static void configure_handshake_ssl(SSL *server, SSL *client, 122@@ -726,15 +822,6 @@ static void configure_handshake_ssl(SSL *server, SSL *client,
123 SSL_set_post_handshake_auth(client, 1); 123 SSL_set_post_handshake_auth(client, 1);
124 } 124 }
125 125
@@ -135,7 +135,7 @@ index f611b3a..5703b48 100644
135 /* An SSL object and associated read-write buffers. */ 135 /* An SSL object and associated read-write buffers. */
136 typedef struct peer_st { 136 typedef struct peer_st {
137 SSL *ssl; 137 SSL *ssl;
138@@ -1080,17 +1167,6 @@ static void do_shutdown_step(PEER *peer) 138@@ -1081,17 +1168,6 @@ static void do_shutdown_step(PEER *peer)
139 } 139 }
140 } 140 }
141 141
@@ -153,7 +153,7 @@ index f611b3a..5703b48 100644
153 static int renegotiate_op(const SSL_TEST_CTX *test_ctx) 153 static int renegotiate_op(const SSL_TEST_CTX *test_ctx)
154 { 154 {
155 switch (test_ctx->handshake_mode) { 155 switch (test_ctx->handshake_mode) {
156@@ -1168,19 +1244,6 @@ static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer, 156@@ -1169,19 +1245,6 @@ static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer,
157 } 157 }
158 } 158 }
159 159
@@ -173,7 +173,7 @@ index f611b3a..5703b48 100644
173 /* 173 /*
174 * Determine the handshake outcome. 174 * Determine the handshake outcome.
175 * last_status: the status of the peer to have acted last. 175 * last_status: the status of the peer to have acted last.
176@@ -1545,6 +1608,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( 176@@ -1546,6 +1609,10 @@ static HANDSHAKE_RESULT *do_handshake_internal(
177 177
178 start = time(NULL); 178 start = time(NULL);
179 179
@@ -184,7 +184,7 @@ index f611b3a..5703b48 100644
184 /* 184 /*
185 * Half-duplex handshake loop. 185 * Half-duplex handshake loop.
186 * Client and server speak to each other synchronously in the same process. 186 * Client and server speak to each other synchronously in the same process.
187@@ -1566,6 +1633,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( 187@@ -1567,6 +1634,10 @@ static HANDSHAKE_RESULT *do_handshake_internal(
188 0 /* server went last */); 188 0 /* server went last */);
189 } 189 }
190 190
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch
index c7e9c9d96e..7043188973 100644
--- a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch
+++ b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch
@@ -20,7 +20,7 @@ diff --git a/Configure b/Configure
20index fff97bd..5ee54c1 100755 20index fff97bd..5ee54c1 100755
21--- a/Configure 21--- a/Configure
22+++ b/Configure 22+++ b/Configure
23@@ -1529,16 +1529,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) 23@@ -1551,16 +1551,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m)
24 push @{$config{shared_ldflag}}, "-mno-cygwin"; 24 push @{$config{shared_ldflag}}, "-mno-cygwin";
25 } 25 }
26 26
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
index 91a95d8929..687d682976 100644
--- a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
+++ b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
@@ -67,10 +67,10 @@ index 09303c4..011bda1 100644
67 PERLASM_SCHEME= {- $target{perlasm_scheme} -} 67 PERLASM_SCHEME= {- $target{perlasm_scheme} -}
68 68
69 # For x86 assembler: Set PROCESSOR to 386 if you want to support 69 # For x86 assembler: Set PROCESSOR to 386 if you want to support
70Index: openssl-3.0.4/crypto/build.info 70diff --git a/crypto/build.info b/crypto/build.info
71=================================================================== 71index aee5c46..95c9577 100644
72--- openssl-3.0.4.orig/crypto/build.info 72--- a/crypto/build.info
73+++ openssl-3.0.4/crypto/build.info 73+++ b/crypto/build.info
74@@ -115,7 +115,7 @@ DEFINE[../libcrypto]=$UPLINKDEF 74@@ -115,7 +115,7 @@ DEFINE[../libcrypto]=$UPLINKDEF
75 75
76 DEPEND[info.o]=buildinf.h 76 DEPEND[info.o]=buildinf.h
diff --git a/meta/recipes-connectivity/openssl/openssl_3.4.1.bb b/meta/recipes-connectivity/openssl/openssl_3.5.0.bb
index 8da64aea6a..865e04deb2 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.4.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.5.0.bb
@@ -18,7 +18,7 @@ SRC_URI:append:class-nativesdk = " \
18 file://environment.d-openssl.sh \ 18 file://environment.d-openssl.sh \
19 " 19 "
20 20
21SRC_URI[sha256sum] = "002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3" 21SRC_URI[sha256sum] = "344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0"
22 22
23inherit lib_package multilib_header multilib_script ptest perlnative manpages 23inherit lib_package multilib_header multilib_script ptest perlnative manpages
24MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" 24MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"