diff options
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-riscv-Fix-mispelling-of-extension-test-macro.patch | 31 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/CVE-2023-6129.patch | 113 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/aarch64-bti.patch | 35 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_3.2.1.bb (renamed from meta/recipes-connectivity/openssl/openssl_3.2.0.bb) | 6 |
4 files changed, 2 insertions, 183 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-riscv-Fix-mispelling-of-extension-test-macro.patch b/meta/recipes-connectivity/openssl/openssl/0001-riscv-Fix-mispelling-of-extension-test-macro.patch deleted file mode 100644 index 1d217bd8e3..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/0001-riscv-Fix-mispelling-of-extension-test-macro.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From b51031b05f72923ff1cf3b6a4767450dee89d7f4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Grant Nichol <me@grantnichol.com> | ||
3 | Date: Fri, 22 Dec 2023 23:46:39 -0600 | ||
4 | Subject: [PATCH] riscv: Fix mispelling of extension test macro | ||
5 | |||
6 | When refactoring the riscv extension test macros, | ||
7 | RISCV_HAS_ZKND_AND_ZKNE was mispelled. | ||
8 | |||
9 | CLA: trivial | ||
10 | Upstream-Status: Backport [https://github.com/openssl/openssl/pull/23139] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c | ||
17 | index 564d6d6..4cf1361 100644 | ||
18 | --- a/providers/implementations/ciphers/cipher_aes_xts_hw.c | ||
19 | +++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c | ||
20 | @@ -225,7 +225,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ | ||
21 | # define PROV_CIPHER_HW_select_xts() \ | ||
22 | if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ | ||
23 | return &aes_xts_rv32i_zbkb_zknd_zkne; \ | ||
24 | -if (RISCV_HAS_ZKND_ZKNE()) \ | ||
25 | +if (RISCV_HAS_ZKND_AND_ZKNE()) \ | ||
26 | return &aes_xts_rv32i_zknd_zkne; | ||
27 | # else | ||
28 | /* The generic case */ | ||
29 | -- | ||
30 | 2.43.0 | ||
31 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2023-6129.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2023-6129.patch deleted file mode 100644 index c2cbedd1b7..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2023-6129.patch +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | From 5b139f95c9a47a55a0c54100f3837b1eee942b04 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rohan McLure <rmclure@linux.ibm.com> | ||
3 | Date: Thu, 4 Jan 2024 10:25:50 +0100 | ||
4 | Subject: [PATCH] poly1305-ppc.pl: Fix vector register clobbering | ||
5 | |||
6 | Fixes CVE-2023-6129 | ||
7 | |||
8 | The POLY1305 MAC (message authentication code) implementation in OpenSSL for | ||
9 | PowerPC CPUs saves the the contents of vector registers in different order | ||
10 | than they are restored. Thus the contents of some of these vector registers | ||
11 | is corrupted when returning to the caller. The vulnerable code is used only | ||
12 | on newer PowerPC processors supporting the PowerISA 2.07 instructions. | ||
13 | |||
14 | Reviewed-by: Matt Caswell <matt@openssl.org> | ||
15 | Reviewed-by: Richard Levitte <levitte@openssl.org> | ||
16 | Reviewed-by: Tomas Mraz <tomas@openssl.org> | ||
17 | (Merged from https://github.com/openssl/openssl/pull/23200) | ||
18 | |||
19 | (cherry picked from commit 8d847a3ffd4f0b17ee33962cf69c36224925b34f) | ||
20 | |||
21 | CVE: CVE-2023-6129 | ||
22 | Upstream-Status: Backport | ||
23 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
24 | --- | ||
25 | crypto/poly1305/asm/poly1305-ppc.pl | 42 ++++++++++++++--------------- | ||
26 | 1 file changed, 21 insertions(+), 21 deletions(-) | ||
27 | |||
28 | diff --git a/crypto/poly1305/asm/poly1305-ppc.pl b/crypto/poly1305/asm/poly1305-ppc.pl | ||
29 | index 9f86134d923fb..2e601bb9c24be 100755 | ||
30 | --- a/crypto/poly1305/asm/poly1305-ppc.pl | ||
31 | +++ b/crypto/poly1305/asm/poly1305-ppc.pl | ||
32 | @@ -744,7 +744,7 @@ | ||
33 | my $LOCALS= 6*$SIZE_T; | ||
34 | my $VSXFRAME = $LOCALS + 6*$SIZE_T; | ||
35 | $VSXFRAME += 128; # local variables | ||
36 | - $VSXFRAME += 13*16; # v20-v31 offload | ||
37 | + $VSXFRAME += 12*16; # v20-v31 offload | ||
38 | |||
39 | my $BIG_ENDIAN = ($flavour !~ /le/) ? 4 : 0; | ||
40 | |||
41 | @@ -919,12 +919,12 @@ | ||
42 | addi r11,r11,32 | ||
43 | stvx v22,r10,$sp | ||
44 | addi r10,r10,32 | ||
45 | - stvx v23,r10,$sp | ||
46 | - addi r10,r10,32 | ||
47 | - stvx v24,r11,$sp | ||
48 | + stvx v23,r11,$sp | ||
49 | addi r11,r11,32 | ||
50 | - stvx v25,r10,$sp | ||
51 | + stvx v24,r10,$sp | ||
52 | addi r10,r10,32 | ||
53 | + stvx v25,r11,$sp | ||
54 | + addi r11,r11,32 | ||
55 | stvx v26,r10,$sp | ||
56 | addi r10,r10,32 | ||
57 | stvx v27,r11,$sp | ||
58 | @@ -1153,12 +1153,12 @@ | ||
59 | addi r11,r11,32 | ||
60 | stvx v22,r10,$sp | ||
61 | addi r10,r10,32 | ||
62 | - stvx v23,r10,$sp | ||
63 | - addi r10,r10,32 | ||
64 | - stvx v24,r11,$sp | ||
65 | + stvx v23,r11,$sp | ||
66 | addi r11,r11,32 | ||
67 | - stvx v25,r10,$sp | ||
68 | + stvx v24,r10,$sp | ||
69 | addi r10,r10,32 | ||
70 | + stvx v25,r11,$sp | ||
71 | + addi r11,r11,32 | ||
72 | stvx v26,r10,$sp | ||
73 | addi r10,r10,32 | ||
74 | stvx v27,r11,$sp | ||
75 | @@ -1899,26 +1899,26 @@ | ||
76 | mtspr 256,r12 # restore vrsave | ||
77 | lvx v20,r10,$sp | ||
78 | addi r10,r10,32 | ||
79 | - lvx v21,r10,$sp | ||
80 | - addi r10,r10,32 | ||
81 | - lvx v22,r11,$sp | ||
82 | + lvx v21,r11,$sp | ||
83 | addi r11,r11,32 | ||
84 | - lvx v23,r10,$sp | ||
85 | + lvx v22,r10,$sp | ||
86 | addi r10,r10,32 | ||
87 | - lvx v24,r11,$sp | ||
88 | + lvx v23,r11,$sp | ||
89 | addi r11,r11,32 | ||
90 | - lvx v25,r10,$sp | ||
91 | + lvx v24,r10,$sp | ||
92 | addi r10,r10,32 | ||
93 | - lvx v26,r11,$sp | ||
94 | + lvx v25,r11,$sp | ||
95 | addi r11,r11,32 | ||
96 | - lvx v27,r10,$sp | ||
97 | + lvx v26,r10,$sp | ||
98 | addi r10,r10,32 | ||
99 | - lvx v28,r11,$sp | ||
100 | + lvx v27,r11,$sp | ||
101 | addi r11,r11,32 | ||
102 | - lvx v29,r10,$sp | ||
103 | + lvx v28,r10,$sp | ||
104 | addi r10,r10,32 | ||
105 | - lvx v30,r11,$sp | ||
106 | - lvx v31,r10,$sp | ||
107 | + lvx v29,r11,$sp | ||
108 | + addi r11,r11,32 | ||
109 | + lvx v30,r10,$sp | ||
110 | + lvx v31,r11,$sp | ||
111 | $POP r27,`$VSXFRAME-$SIZE_T*5`($sp) | ||
112 | $POP r28,`$VSXFRAME-$SIZE_T*4`($sp) | ||
113 | $POP r29,`$VSXFRAME-$SIZE_T*3`($sp) | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/aarch64-bti.patch b/meta/recipes-connectivity/openssl/openssl/aarch64-bti.patch deleted file mode 100644 index 2a16debb76..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/aarch64-bti.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From ad347c9ff0fd93bdd2fa2085611c65b88e94829f Mon Sep 17 00:00:00 2001 | ||
2 | From: "fangming.fang" <fangming.fang@arm.com> | ||
3 | Date: Thu, 7 Dec 2023 06:17:51 +0000 | ||
4 | Subject: [PATCH] Enable BTI feature for md5 on aarch64 | ||
5 | |||
6 | Fixes: #22959 | ||
7 | |||
8 | Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> | ||
9 | Reviewed-by: Tomas Mraz <tomas@openssl.org> | ||
10 | (Merged from https://github.com/openssl/openssl/pull/22971) | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
14 | --- | ||
15 | crypto/md5/asm/md5-aarch64.pl | 3 +++ | ||
16 | 1 file changed, 3 insertions(+) | ||
17 | |||
18 | diff --git a/crypto/md5/asm/md5-aarch64.pl b/crypto/md5/asm/md5-aarch64.pl | ||
19 | index 3200a0fa9bff0..5a8608069691d 100755 | ||
20 | --- a/crypto/md5/asm/md5-aarch64.pl | ||
21 | +++ b/crypto/md5/asm/md5-aarch64.pl | ||
22 | @@ -28,10 +28,13 @@ | ||
23 | *STDOUT=*OUT; | ||
24 | |||
25 | $code .= <<EOF; | ||
26 | +#include "arm_arch.h" | ||
27 | + | ||
28 | .text | ||
29 | .globl ossl_md5_block_asm_data_order | ||
30 | .type ossl_md5_block_asm_data_order,\@function | ||
31 | ossl_md5_block_asm_data_order: | ||
32 | + AARCH64_VALID_CALL_TARGET | ||
33 | // Save all callee-saved registers | ||
34 | stp x19,x20,[sp,#-80]! | ||
35 | stp x21,x22,[sp,#16] | ||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.2.0.bb b/meta/recipes-connectivity/openssl/openssl_3.2.1.bb index b2cdf761fc..549fa4cd94 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.2.0.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.2.1.bb | |||
@@ -12,16 +12,13 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ | 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ |
14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ | 14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ |
15 | file://aarch64-bti.patch \ | ||
16 | file://0001-riscv-Fix-mispelling-of-extension-test-macro.patch \ | ||
17 | file://CVE-2023-6129.patch \ | ||
18 | " | 15 | " |
19 | 16 | ||
20 | SRC_URI:append:class-nativesdk = " \ | 17 | SRC_URI:append:class-nativesdk = " \ |
21 | file://environment.d-openssl.sh \ | 18 | file://environment.d-openssl.sh \ |
22 | " | 19 | " |
23 | 20 | ||
24 | SRC_URI[sha256sum] = "14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e" | 21 | SRC_URI[sha256sum] = "83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39" |
25 | 22 | ||
26 | inherit lib_package multilib_header multilib_script ptest perlnative manpages | 23 | inherit lib_package multilib_header multilib_script ptest perlnative manpages |
27 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | 24 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" |
@@ -189,6 +186,7 @@ PTEST_BUILD_HOST_PATTERN = "perl_version =" | |||
189 | do_install_ptest () { | 186 | do_install_ptest () { |
190 | install -d ${D}${PTEST_PATH}/test | 187 | install -d ${D}${PTEST_PATH}/test |
191 | install -m755 ${B}/test/p_test.so ${D}${PTEST_PATH}/test | 188 | install -m755 ${B}/test/p_test.so ${D}${PTEST_PATH}/test |
189 | install -m755 ${B}/test/p_minimal.so ${D}${PTEST_PATH}/test | ||
192 | install -m755 ${B}/test/provider_internal_test.cnf ${D}${PTEST_PATH}/test | 190 | install -m755 ${B}/test/provider_internal_test.cnf ${D}${PTEST_PATH}/test |
193 | 191 | ||
194 | # Prune the build tree | 192 | # Prune the build tree |