psa-arch-tests: Use designated initializers.
Armclang 6.21 reports missing-field-initializers warning for missing
designated initializers. This will be fixed in armclang 6.22.
Currently, use designated initializers as workaround.
Change-Id: I5a40849a0d9a9ba27dff3015c0bb8189669cfbdb
Signed-off-by: Summer Qin <summer.qin@arm.com>
diff --git a/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch b/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
index 0919a22..0237399 100644
--- a/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
+++ b/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
@@ -1,7 +1,7 @@
-From 7678a1ab55c2ef708778b51b67e0c3929c071b43 Mon Sep 17 00:00:00 2001
+From 317ecb73e2a8c7b4dd43c484ab6c2f0c3c0f1e8b Mon Sep 17 00:00:00 2001
From: Summer Qin <summer.qin@arm.com>
Date: Tue, 29 Aug 2023 17:08:19 +0800
-Subject: [PATCH 1/3] Place crypto test 16 at the beginning of the test
+Subject: [PATCH 1/4] Place crypto test 16 at the beginning of the test
HMAC_DRBG random generator is slower than CTR_DRBG, and this
will influence the time spending for test 16 RSA 2048. Placing
diff --git a/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch b/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
index e070138..01236a0 100644
--- a/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
+++ b/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
@@ -1,7 +1,7 @@
-From 61611b8b3bb70ab30fb0830f3bd816b6ddccaca0 Mon Sep 17 00:00:00 2001
+From ddbc21ecb46b742536d33e869672b03929e24e6b Mon Sep 17 00:00:00 2001
From: Summer Qin <summer.qin@arm.com>
Date: Sun, 8 Oct 2023 16:44:42 +0800
-Subject: [PATCH 2/3] Crypto: Add psa crypto config link for crypto tests
+Subject: [PATCH 2/4] Crypto: Add psa crypto config link for crypto tests
Test 16 uses macro PSA_EXPORT_KEY_PAIR_MAX_SIZE which is
related with PSA_WANT_KEY_TYPE_xxx_KEY_PAIR_BASIC defines
diff --git a/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch b/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch
index 06bf15d..16ded06 100644
--- a/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch
+++ b/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch
@@ -1,7 +1,7 @@
-From 5c84de8edab657b51430d7aba03410292d70e3b2 Mon Sep 17 00:00:00 2001
+From 18018c51ad67b41df6c8e1e1a49c81cc54419a88 Mon Sep 17 00:00:00 2001
From: Kevin Peng <kevin.peng@arm.com>
Date: Thu, 9 Nov 2023 14:40:48 +0800
-Subject: [PATCH 3/3] Build: Add manifest tool dependencies
+Subject: [PATCH 3/4] Build: Add manifest tool dependencies
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
---
diff --git a/tests_psa_arch/fetch_repo/0004-Attest-Use-designated-initializers.patch b/tests_psa_arch/fetch_repo/0004-Attest-Use-designated-initializers.patch
new file mode 100644
index 0000000..a4e33a5
--- /dev/null
+++ b/tests_psa_arch/fetch_repo/0004-Attest-Use-designated-initializers.patch
@@ -0,0 +1,214 @@
+From da03a9320646374d911df2945fdbf2093e72944c Mon Sep 17 00:00:00 2001
+From: Summer Qin <summer.qin@arm.com>
+Date: Thu, 9 Nov 2023 14:28:04 +0800
+Subject: [PATCH 4/4] Attest: Use designated initializers.
+
+Armclang 6.21 reports missing-field-initializers warning for missing
+designated initializers. This will be fixed in armclang 6.22.
+Currently, use designated initializers as workaround.
+
+Signed-off-by: Summer Qin <summer.qin@arm.com>
+---
+ .../tgt_dev_apis_tfm_an521/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_an524/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_an539/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_cs3x0/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_musca_a/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_musca_b1/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_musca_s1/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_nrf5340/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_nrf9160/nspe/pal_attestation_config.h | 5 +++--
+ .../tgt_dev_apis_tfm_psoc64/nspe/pal_attestation_config.h | 5 +++--
+ .../nspe/pal_attestation_config.h | 5 +++--
+ 11 files changed, 33 insertions(+), 22 deletions(-)
+
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_an521/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_an521/nspe/pal_attestation_config.h
+index 6817b5f..15d6ce4 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_an521/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_an521/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_an524/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_an524/nspe/pal_attestation_config.h
+index 6817b5f..15d6ce4 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_an524/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_an524/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_an539/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_an539/nspe/pal_attestation_config.h
+index 6817b5f..15d6ce4 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_an539/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_an539/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_cs3x0/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_cs3x0/nspe/pal_attestation_config.h
+index 35a951b..84d8c6f 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_cs3x0/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_cs3x0/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_a/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_a/nspe/pal_attestation_config.h
+index 6817b5f..15d6ce4 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_a/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_a/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_b1/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_b1/nspe/pal_attestation_config.h
+index 6817b5f..15d6ce4 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_b1/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_b1/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_s1/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_s1/nspe/pal_attestation_config.h
+index 6817b5f..15d6ce4 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_s1/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_s1/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_nrf5340/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_nrf5340/nspe/pal_attestation_config.h
+index bdef6c5..c096740 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_nrf5340/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_nrf5340/nspe/pal_attestation_config.h
+@@ -71,9 +71,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_nrf9160/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_nrf9160/nspe/pal_attestation_config.h
+index bdef6c5..c096740 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_nrf9160/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_nrf9160/nspe/pal_attestation_config.h
+@@ -71,9 +71,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_psoc64/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_psoc64/nspe/pal_attestation_config.h
+index 624a134..ed27b39 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_psoc64/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_psoc64/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_stm32l562e_dk/nspe/pal_attestation_config.h b/api-tests/platform/targets/tgt_dev_apis_tfm_stm32l562e_dk/nspe/pal_attestation_config.h
+index 6817b5f..15d6ce4 100644
+--- a/api-tests/platform/targets/tgt_dev_apis_tfm_stm32l562e_dk/nspe/pal_attestation_config.h
++++ b/api-tests/platform/targets/tgt_dev_apis_tfm_stm32l562e_dk/nspe/pal_attestation_config.h
+@@ -69,9 +69,10 @@ struct ecc_public_key_t {
+
+ static const struct ecc_public_key_t attest_public_key = {
+ /* Constant byte */
+- 0x04,
++ .a = 0x04,
+ /* X-coordinate */
+- {0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
++ .public_key = {
++ 0x79, 0xEB, 0xA9, 0x0E, 0x8B, 0xF4, 0x50, 0xA6,
+ 0x75, 0x15, 0x76, 0xAD, 0x45, 0x99, 0xB0, 0x7A,
+ 0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
+ 0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
+--
+2.25.1
+