summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Eatmon <reatmon@ti.com>2025-09-16 07:59:16 -0500
committerRyan Eatmon <reatmon@ti.com>2025-09-18 23:56:22 -0500
commit294a999b705615a54519ac576074055d43373c64 (patch)
treee6536071431334339eb61df5373e5afc803d8f9f
parent12a0133363a842c215b0205d9acebe6d83ef8867 (diff)
downloadmeta-ti-294a999b705615a54519ac576074055d43373c64.tar.gz
optee-test: Remove unneeded patch
The recent SRCREV change now includes the patch, so we no longer need it. Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc1
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-test/0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch68
2 files changed, 0 insertions, 69 deletions
diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
index 4a4a2f92..2d8fd8b2 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
@@ -3,4 +3,3 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:"
3PV = "4.7.0+git" 3PV = "4.7.0+git"
4SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb" 4SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb"
5 5
6SRC_URI += "file://0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-test/0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch b/meta-ti-bsp/recipes-security/optee/optee-test/0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch
deleted file mode 100644
index 018952f8..00000000
--- a/meta-ti-bsp/recipes-security/optee/optee-test/0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From a8e58203dcb4c13ee340259cd2692202ac8414d1 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@konsulko.com>
3Date: Tue, 6 May 2025 21:35:55 -0400
4Subject: [PATCH] Suppress new gcc-15 -Wunterminated-string-initialization
5
6GCC 15 now warns when character arrays are being initialized by strings
7and terminating NUL character doesn't fit. GCC 15.1 also allows marking
8such arrays with nonstring attribute to suppress the warning. W/o such
9attribute, the warning becomes error due to the global -Werror. Add the
10attribute accordingly.
11
12Fixes these errors:
13
14| ./regression_4000_data.h:7919:9: error: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (20 chars into 19 available) [-Werror=unterminated-string-initialization]
15| 7919 | "encryption standard";
16| | ^~~~~~~~~~~~~~~~~~~~~
17| ./regression_4000_data.h:8387:9: error: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (113 chars into 112 available) [-Werror=unterminated-string-initialization]
18| 8387 | "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomn"
19| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20| ./regression_4000.c:1295:47: error: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (4 chars into 3 available) [-Werror=unterminated-string-initialization]
21| 1295 | static const uint8_t hash_data_sm3_a1_in[3] = "abc";
22| | ^~~~~
23
24Upstream-Status: Pending
25
26Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
27---
28 host/xtest/regression_4000.c | 2 +-
29 host/xtest/regression_4000_data.h | 4 ++--
30 2 files changed, 3 insertions(+), 3 deletions(-)
31
32diff --git a/host/xtest/regression_4000.c b/host/xtest/regression_4000.c
33index 3aa15be..46e6f8e 100644
34--- a/host/xtest/regression_4000.c
35+++ b/host/xtest/regression_4000.c
36@@ -1292,7 +1292,7 @@ static const uint8_t hash_data_shake256_out2[] = {
37 * https://tools.ietf.org/html/draft-sca-cfrg-sm3-02
38 * Appendix A.1
39 */
40-static const uint8_t hash_data_sm3_a1_in[3] = "abc";
41+static const uint8_t hash_data_sm3_a1_in[3] __attribute__((nonstring)) = "abc";
42
43 static const uint8_t hash_data_sm3_a1_out[] = {
44 0x66, 0xc7, 0xf0, 0xf4, 0x62, 0xee, 0xed, 0xd9,
45diff --git a/host/xtest/regression_4000_data.h b/host/xtest/regression_4000_data.h
46index 0881ac3..eb101b2 100644
47--- a/host/xtest/regression_4000_data.h
48+++ b/host/xtest/regression_4000_data.h
49@@ -7914,7 +7914,7 @@ static struct derive_key_ecdh_t {
50 };
51
52 /* G/MT 0003 (SM2) Part 5 Annex C.2 - encryption/decryption */
53-static const uint8_t gmt_0003_part5_c2_sm2_testvector_ptx[19] =
54+static const uint8_t gmt_0003_part5_c2_sm2_testvector_ptx[19] __attribute__((nonstring)) =
55 /* M */
56 "encryption standard";
57 static const uint8_t gmt_0003_part5_c2_sm2_testvector_private[] = {
58@@ -8383,7 +8383,7 @@ static const uint8_t mac_data_sha3_512_out1[] = {
59 * GM/T 0042-2015
60 * Section D.3 Test vector 1
61 */
62-static const uint8_t mac_data_sm3_d31_in[112] =
63+static const uint8_t mac_data_sm3_d31_in[112] __attribute__((nonstring)) =
64 "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomn"
65 "opnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmn"
66 "lmnomnopnopq";
67--
682.25.1