Skip to content

Commit 874b8c2

Browse files
authored
Merge pull request #4 from ARM-software/main
update copyright : done
2 parents b50fcf3 + a206b70 commit 874b8c2

File tree

8 files changed

+93
-31
lines changed

8 files changed

+93
-31
lines changed

api-tests/dev_apis/crypto/common/test_crypto_common.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,24 @@ const uint8_t eddsa_448_signature[] = {0x26, 0xb8, 0xf9, 0x17, 0x27, 0xbd, 0x62,
540540
0xdc, 0xec, 0xbf, 0x15, 0x43, 0x36, 0xc1, 0x9f, 0x0a, 0xf7, 0xe0, 0xa6, 0x47, 0x29, 0x05, 0xe7,
541541
0x99, 0xf1, 0x95, 0x3d, 0x2a, 0x0f, 0xf3, 0x34, 0x8a, 0xb2, 0x1a, 0xa4, 0xad, 0xaf, 0xd1, 0xd2,
542542
0x34, 0x44, 0x1c, 0xf8, 0x07, 0xc0, 0x3a, 0x00};
543+
544+
const uint8_t eddsa_448ph_keypair[] = {0x83, 0x3f, 0xe6, 0x24, 0x09, 0x23, 0x7b, 0x9d, 0x62, 0xec,
545+
0x77, 0x58, 0x75, 0x20, 0x91, 0x1e, 0x9a, 0x75, 0x9c, 0xec, 0x1d, 0x19, 0x75, 0x5b, 0x7d, 0xa9,
546+
0x01, 0xb9, 0x6d, 0xca, 0x3d, 0x42, 0xef, 0x78, 0x22, 0xe0, 0xd5, 0x10, 0x41, 0x27, 0xdc, 0x05,
547+
0xd6, 0xdb, 0xef, 0xde, 0x69, 0xe3, 0xab, 0x2c, 0xec, 0x7c, 0x86, 0x7c, 0x6e, 0x2c, 0x49};
548+
const uint8_t eddsa_448ph_pubkey[] = {0x25, 0x9b, 0x71, 0xc1, 0x9f, 0x83, 0xef, 0x77, 0xa7, 0xab,
549+
0xd2, 0x65, 0x24, 0xcb, 0xdb, 0x31, 0x61, 0xb5, 0x90, 0xa4, 0x8f, 0x7d, 0x17, 0xde, 0x3e, 0xe0,
550+
0xba, 0x9c, 0x52, 0xbe, 0xb7, 0x43, 0xc0, 0x94, 0x28, 0xa1, 0x31, 0xd6, 0xb1, 0xb5, 0x73, 0x03,
551+
0xd9, 0x0d, 0x81, 0x32, 0xc2, 0x76, 0xd5, 0xed, 0x3d, 0x5d, 0x01, 0xc0, 0xf5, 0x38, 0x80};
552+
const uint8_t eddsa_448ph_message[] = {0x61, 0x62, 0x63};
553+
const uint8_t eddsa_448ph_signature[] = {0x82, 0x2f, 0x69, 0x01, 0xf7, 0x48, 0x0f, 0x3d, 0x5f, 0x56,
554+
0x2c, 0x59, 0x29, 0x94, 0xd9, 0x69, 0x36, 0x02, 0x87, 0x56, 0x14, 0x48, 0x32, 0x56, 0x50, 0x56,
555+
0x00, 0xbb, 0xc2, 0x81, 0xae, 0x38, 0x1f, 0x54, 0xd6, 0xbc, 0xe2, 0xea, 0x91, 0x15, 0x74, 0x93,
556+
0x2f, 0x52, 0xa4, 0xe6, 0xca, 0xdd, 0x78, 0x76, 0x93, 0x75, 0xec, 0x3f, 0xfd, 0x1b, 0x80, 0x1a,
557+
0x0d, 0x9b, 0x3f, 0x40, 0x30, 0xcd, 0x43, 0x39, 0x64, 0xb6, 0x45, 0x7e, 0xa3, 0x94, 0x76, 0x51,
558+
0x12, 0x14, 0xf9, 0x74, 0x69, 0xb5, 0x7d, 0xd3, 0x2d, 0xbc, 0x56, 0x0a, 0x9a, 0x94, 0xd0, 0x0b,
559+
0xff, 0x07, 0x62, 0x04, 0x64, 0xa3, 0xad, 0x20, 0x3d, 0xf7, 0xdc, 0x7c, 0xe3, 0x60, 0xc3, 0xcd,
560+
0x36, 0x96, 0xd9, 0xd9, 0xfa, 0xb9, 0x0f, 0x00};
543561
#endif
544562

545563
const uint8_t nonce[] = {

api-tests/dev_apis/crypto/common/test_crypto_common.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ extern const uint8_t eddsa_448_keypair[];
208208
extern const uint8_t eddsa_448_pubkey[];
209209
extern const uint8_t eddsa_448_message[];
210210
extern const uint8_t eddsa_448_signature[];
211+
extern const uint8_t eddsa_448ph_keypair[];
212+
extern const uint8_t eddsa_448ph_pubkey[];
213+
extern const uint8_t eddsa_448ph_message[];
214+
extern const uint8_t eddsa_448ph_signature[];
211215

212216
#endif
213217

api-tests/dev_apis/crypto/test_c052/test_data.h

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ static const test_data check1[] = {
242242

243243
#ifdef ARCH_TEST_TWISTED_EDWARDS
244244
{
245-
.test_desc = "Test psa_sign_message - EDDSA Ed25519\n",
245+
.test_desc = "Test psa_sign_message - PURE_EDDSA_25519\n",
246246
.type = PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_TWISTED_EDWARDS),
247247
.data = eddsa_25519_keypair,
248248
.data_length = 32,
@@ -258,13 +258,13 @@ static const test_data check1[] = {
258258
.expected_status = PSA_SUCCESS,
259259
},
260260
{
261-
.test_desc = "Test psa_sign_message - EDDSA 448PH\n",
261+
.test_desc = "Test psa_sign_message - PURE_EDDSA_448\n",
262262
.type = PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_TWISTED_EDWARDS),
263263
.data = eddsa_448_keypair,
264264
.data_length = 57,
265265
.usage_flags = PSA_KEY_USAGE_SIGN_MESSAGE,
266-
.alg = PSA_ALG_ED448PH,
267-
.sign_alg = PSA_ALG_ED448PH,
266+
.alg = PSA_ALG_PURE_EDDSA,
267+
.sign_alg = PSA_ALG_PURE_EDDSA,
268268
.input = eddsa_448_message,
269269
.input_length = 1,
270270
.signature = expected_output,
@@ -273,6 +273,22 @@ static const test_data check1[] = {
273273
.expected_signature_length = 114,
274274
.expected_status = PSA_SUCCESS,
275275
},
276+
{
277+
.test_desc = "Test psa_sign_message - EDDSA 448PH\n",
278+
.type = PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_TWISTED_EDWARDS),
279+
.data = eddsa_448ph_keypair,
280+
.data_length = 57,
281+
.usage_flags = PSA_KEY_USAGE_SIGN_MESSAGE,
282+
.alg = PSA_ALG_ED448PH,
283+
.sign_alg = PSA_ALG_ED448PH,
284+
.input = eddsa_448ph_message,
285+
.input_length = 3,
286+
.signature = expected_output,
287+
.signature_size = BUFFER_SIZE,
288+
.expected_signature = eddsa_448ph_signature,
289+
.expected_signature_length = 114,
290+
.expected_status = PSA_SUCCESS,
291+
}
276292
#endif
277293

278294
};

api-tests/dev_apis/crypto/test_c053/test_data.h

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,29 @@ static const test_data check1[] = {
242242
.signature_length = 64,
243243
.expected_status = PSA_SUCCESS
244244
},
245-
245+
{
246+
.test_desc = "Test psa_verify_message - Eddsa25519ph\n",
247+
.type = PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_TWISTED_EDWARDS),
248+
.data = eddsa_25519ph_keypair,
249+
.data_length = 32,
250+
.usage_flags = PSA_KEY_USAGE_VERIFY_MESSAGE,
251+
.alg = PSA_ALG_ED25519PH,
252+
.input = eddsa_25519ph_message,
253+
.input_length = 3,
254+
.signature = eddsa_25519ph_signature,
255+
.signature_length = 64,
256+
.expected_status = PSA_SUCCESS,
257+
},
246258
{
247259
.test_desc = "Test psa_verify_message - EDDSA 448PH\n",
248260
.type = PSA_KEY_TYPE_ECC_PUBLIC_KEY(PSA_ECC_FAMILY_TWISTED_EDWARDS),
249-
.data = eddsa_448_pubkey,
261+
.data = eddsa_448ph_pubkey,
250262
.data_length = 57,
251263
.usage_flags = PSA_KEY_USAGE_VERIFY_MESSAGE,
252264
.alg = PSA_ALG_ED448PH,
253-
.input = eddsa_448_message,
254-
.input_length = 1,
255-
.signature = eddsa_448_signature,
265+
.input = eddsa_448ph_message,
266+
.input_length = 3,
267+
.signature = eddsa_448ph_signature,
256268
.signature_length = 114,
257269
.expected_status = PSA_SUCCESS
258270
},

api-tests/dev_apis/crypto/test_c061/test_data.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static const test_data check1[] = {
5454
0x48, 0x61, 0xa4, 0xa2, 0x01, 0xcc, 0xe4, 0x9f, 0x19, 0x99, 0x7d, 0x19, 0x20,
5555
0x6d, 0x8c, 0x8a, 0x34, 0x39, 0x51},
5656
{0x48, 0xc0, 0x90, 0x69, 0x30, 0x56, 0x1e, 0x0a, 0xb0, 0xef, 0x4c, 0xd9, 0x72},
57-
13, 32, 24, 24, BUFFER_SIZE,
57+
13, 32, 24, 24, PSA_AEAD_FINISH_OUTPUT_MAX_SIZE,
5858
{0x26, 0xc5, 0x69, 0x61, 0xc0, 0x35, 0xa7, 0xe4, 0x52, 0xcc, 0xe6, 0x1b, 0xc6,
5959
0xee, 0x22, 0x0d, 0x77, 0xb3, 0xf9, 0x4d, 0x18, 0xfd, 0x10, 0xb6},
6060
24, SIZE_32B,
@@ -74,7 +74,7 @@ static const test_data check1[] = {
7474
0x48, 0x61, 0xa4, 0xa2, 0x01, 0xcc, 0xe4, 0x9f, 0x19, 0x99, 0x7d, 0x19, 0x20,
7575
0x6d, 0x8c, 0x8a, 0x34, 0x39, 0x51},
7676
{0x48, 0xc0, 0x90, 0x69, 0x30, 0x56, 0x1e, 0x0a, 0xb0, 0xef, 0x4c, 0xd9, 0x72},
77-
13, 32, 24, 24, BUFFER_SIZE,
77+
13, 32, 24, 24, PSA_AEAD_FINISH_OUTPUT_MAX_SIZE,
7878
{0x26, 0xc5, 0x69, 0x61, 0xc0, 0x35, 0xa7, 0xe4, 0x52, 0xcc, 0xe6, 0x1b, 0xc6,
7979
0xee, 0x22, 0x0d, 0x77, 0xb3, 0xf9, 0x4d, 0x18, 0xfd, 0x10, 0xb6},
8080
24, SIZE_32B, {0x64, 0x3b, 0x4f, 0x39}, 4,
@@ -91,7 +91,7 @@ static const test_data check1[] = {
9191
0x48, 0x61, 0xa4, 0xa2, 0x01, 0xcc, 0xe4, 0x9f, 0x19, 0x99, 0x7d, 0x19, 0x20,
9292
0x6d, 0x8c, 0x8a, 0x34, 0x39, 0x51},
9393
{0x48, 0xc0, 0x90, 0x69, 0x30, 0x56, 0x1e, 0x0a, 0xb0, 0xef, 0x4c, 0xd9, 0x72},
94-
13, 32, 24, 24, BUFFER_SIZE, {0}, 0, 10, {0}, 0,
94+
13, 32, 24, 24, PSA_AEAD_FINISH_OUTPUT_MAX_SIZE, {0}, 0, 10, {0}, 0,
9595
PSA_ERROR_BUFFER_TOO_SMALL
9696
},
9797

@@ -105,7 +105,7 @@ static const test_data check1[] = {
105105
0x48, 0x61, 0xa4, 0xa2, 0x01, 0xcc, 0xe4, 0x9f, 0x19, 0x99, 0x7d, 0x19, 0x20,
106106
0x6d, 0x8c, 0x8a, 0x34, 0x39, 0x51},
107107
{0x48, 0xc0, 0x90, 0x69, 0x30, 0x56, 0x1e, 0x0a, 0xb0, 0xef, 0x4c, 0xd9, 0x72},
108-
13, 32, 24, 30, BUFFER_SIZE, {0}, 0, SIZE_32B, {0}, 0,
108+
13, 32, 24, 30, PSA_AEAD_FINISH_OUTPUT_MAX_SIZE, {0}, 0, SIZE_32B, {0}, 0,
109109
PSA_ERROR_INVALID_ARGUMENT
110110
},
111111
#endif
@@ -121,7 +121,7 @@ static const test_data check1[] = {
121121
0x02, 0x01},
122122
{0x42, 0xf6, 0x7e, 0x3f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
123123
{0x57, 0x69, 0x0e, 0x43, 0x4e, 0x28, 0x00, 0x00, 0xa2, 0xfc, 0xa1, 0xa3},
124-
12, 12, 28, 28, BUFFER_SIZE,
124+
12, 12, 28, 28, PSA_AEAD_FINISH_OUTPUT_MAX_SIZE,
125125
{0xFB, 0xA2, 0xCA, 0x84, 0x5E, 0x5D, 0xF9, 0xF0, 0xF2, 0x2C, 0x3E, 0x6E, 0x86,
126126
0xDD, 0x83, 0x1E, 0x1F, 0xC6, 0x57, 0x92, 0xCD, 0x1A, 0xF9, 0x13, 0x0E, 0x13,
127127
0x79, 0xED}, 28, SIZE_32B,
@@ -148,14 +148,14 @@ PSA_ALG_CHACHA20_POLY1305, PSA_ALG_CHACHA20_POLY1305,
148148
0x74, 0x2e},
149149
{0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7},
150150
{0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47}, 12, 12, 114, 114,
151-
BUFFER_SIZE, {0xd3, 0x1a, 0x8d, 0x34, 0x64, 0x8e, 0x60, 0xdb, 0x7b, 0x86, 0xaf, 0xbc, 0x53,
152-
0xef, 0x7e, 0xc2, 0xa4, 0xad, 0xed, 0x51, 0x29, 0x6e, 0x08, 0xfe, 0xa9, 0xe2, 0xb5, 0xa7, 0x36,
153-
0xee, 0x62, 0xd6, 0x3d, 0xbe, 0xa4, 0x5e, 0x8c, 0xa9, 0x67, 0x12, 0x82, 0xfa, 0xfb, 0x69, 0xda,
154-
0x92, 0x72, 0x8b, 0x1a, 0x71, 0xde, 0x0a, 0x9e, 0x06, 0x0b, 0x29, 0x05, 0xd6, 0xa5, 0xb6, 0x7e,
155-
0xcd, 0x3b, 0x36, 0x92, 0xdd, 0xbd, 0x7f, 0x2d, 0x77, 0x8b, 0x8c, 0x98, 0x03, 0xae, 0xe3, 0x28,
156-
0x09, 0x1b, 0x58, 0xfa, 0xb3, 0x24, 0xe4, 0xfa, 0xd6, 0x75, 0x94, 0x55, 0x85, 0x80, 0x8b, 0x48,
157-
0x31, 0xd7, 0xbc, 0x3f, 0xf4, 0xde, 0xf0, 0x8e, 0x4b, 0x7a, 0x9d, 0xe5, 0x76, 0xd2, 0x65, 0x86,
158-
0xce, 0xc6, 0x4b, 0x61, 0x16},
151+
PSA_AEAD_FINISH_OUTPUT_MAX_SIZE, {0xd3, 0x1a, 0x8d, 0x34, 0x64, 0x8e, 0x60, 0xdb, 0x7b, 0x86,
152+
0xaf, 0xbc, 0x53, 0xef, 0x7e, 0xc2, 0xa4, 0xad, 0xed, 0x51, 0x29, 0x6e, 0x08, 0xfe, 0xa9, 0xe2,
153+
0xb5, 0xa7, 0x36, 0xee, 0x62, 0xd6, 0x3d, 0xbe, 0xa4, 0x5e, 0x8c, 0xa9, 0x67, 0x12, 0x82, 0xfa,
154+
0xfb, 0x69, 0xda, 0x92, 0x72, 0x8b, 0x1a, 0x71, 0xde, 0x0a, 0x9e, 0x06, 0x0b, 0x29, 0x05, 0xd6,
155+
0xa5, 0xb6, 0x7e, 0xcd, 0x3b, 0x36, 0x92, 0xdd, 0xbd, 0x7f, 0x2d, 0x77, 0x8b, 0x8c, 0x98, 0x03,
156+
0xae, 0xe3, 0x28, 0x09, 0x1b, 0x58, 0xfa, 0xb3, 0x24, 0xe4, 0xfa, 0xd6, 0x75, 0x94, 0x55, 0x85,
157+
0x80, 0x8b, 0x48, 0x31, 0xd7, 0xbc, 0x3f, 0xf4, 0xde, 0xf0, 0x8e, 0x4b, 0x7a, 0x9d, 0xe5, 0x76,
158+
0xd2, 0x65, 0x86, 0xce, 0xc6, 0x4b, 0x61, 0x16},
159159
114, PSA_AEAD_TAG_LENGTH(PSA_KEY_TYPE_CHACHA20, 256, PSA_ALG_CHACHA20_POLY1305),
160160
{0x1a, 0xe1, 0x0b, 0x59, 0x4f, 0x09, 0xe2, 0x6a, 0x7e, 0x90, 0x2e, 0xcb, 0xd0, 0x60, 0x06, 0x91},
161161
16, PSA_SUCCESS},
@@ -177,7 +177,7 @@ PSA_ALG_XCHACHA20_POLY1305, PSA_ALG_XCHACHA20_POLY1305,
177177
0x74, 0x2e},
178178
{0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7},
179179
{0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
180-
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57}, 24, 12, 114, 114, BUFFER_SIZE,
180+
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57}, 24, 12, 114, 114, PSA_AEAD_FINISH_OUTPUT_MAX_SIZE,
181181
{0xbd, 0x6d, 0x17, 0x9d, 0x3e, 0x83, 0xd4, 0x3b, 0x95, 0x76, 0x57, 0x94, 0x93, 0xc0, 0xe9, 0x39,
182182
0x57, 0x2a, 0x17, 0x00, 0x25, 0x2b, 0xfa, 0xcc, 0xbe, 0xd2, 0x90, 0x2c, 0x21, 0x39, 0x6c, 0xbb,
183183
0x73, 0x1c, 0x7f, 0x1b, 0x0b, 0x4a, 0xa6, 0x44, 0x0b, 0xf3, 0xa8, 0x2f, 0x4e, 0xda, 0x7e, 0x39,

api-tests/dev_apis/crypto/test_c063/test_data.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @file
2-
* Copyright (c) 2019-2024, Arm Limited or its affiliates. All rights reserved.
2+
* Copyright (c) 2019-2025, Arm Limited or its affiliates. All rights reserved.
33
* SPDX-License-Identifier : Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -54,7 +54,7 @@ static const test_data check1[] = {
5454
0x48, 0x61, 0xa4, 0xa2, 0x01, 0xcc, 0xe4, 0x9f, 0x19, 0x99, 0x7d, 0x19, 0x20,
5555
0x6d, 0x8c, 0x8a, 0x34, 0x39, 0x51},
5656
{0x48, 0xc0, 0x90, 0x69, 0x30, 0x56, 0x1e, 0x0a, 0xb0, 0xef, 0x4c, 0xd9, 0x72},
57-
13, 32, 24, 24, BUFFER_SIZE,
57+
13, 32, 24, 24, PSA_AEAD_VERIFY_OUTPUT_MAX_SIZE,
5858
{0x26, 0xc5, 0x69, 0x61, 0xc0, 0x35, 0xa7, 0xe4, 0x52, 0xcc, 0xe6, 0x1b, 0xc6,
5959
0xee, 0x22, 0x0d, 0x77, 0xb3, 0xf9, 0x4d, 0x18, 0xfd, 0x10, 0xb6},
6060
24,
@@ -74,7 +74,7 @@ static const test_data check1[] = {
7474
0x48, 0x61, 0xa4, 0xa2, 0x01, 0xcc, 0xe4, 0x9f, 0x19, 0x99, 0x7d, 0x19, 0x20,
7575
0x6d, 0x8c, 0x8a, 0x34, 0x39, 0x51},
7676
{0x48, 0xc0, 0x90, 0x69, 0x30, 0x56, 0x1e, 0x0a, 0xb0, 0xef, 0x4c, 0xd9, 0x72},
77-
13, 32, 24, 24, BUFFER_SIZE,
77+
13, 32, 24, 24, PSA_AEAD_VERIFY_OUTPUT_MAX_SIZE,
7878
{0x26, 0xc5, 0x69, 0x61, 0xc0, 0x35, 0xa7, 0xe4, 0x52, 0xcc, 0xe6, 0x1b, 0xc6,
7979
0xee, 0x22, 0x0d, 0x77, 0xb3, 0xf9, 0x4d, 0x18, 0xfd, 0x10, 0xb6},
8080
24, {0x64, 0x3b, 0x4f, 0x39}, 4,
@@ -109,7 +109,7 @@ static const test_data check1[] = {
109109
0x48, 0x61, 0xa4, 0xa2, 0x01, 0xcc, 0xe4, 0x9f, 0x19, 0x99, 0x7d, 0x19, 0x20,
110110
0x6d, 0x8c, 0x8a, 0x34, 0x39, 0x51},
111111
{0x48, 0xc0, 0x90, 0x69, 0x30, 0x56, 0x1e, 0x0a, 0xb0, 0xef, 0x4c, 0xd9, 0x72},
112-
13, 32, 0, 30, BUFFER_SIZE,
112+
13, 32, 0, 30, PSA_AEAD_VERIFY_OUTPUT_MAX_SIZE,
113113
{0x26, 0xc5, 0x69, 0x61, 0xc0, 0x35, 0xa7, 0xe4, 0x52, 0xcc, 0xe6, 0x1b, 0xc6,
114114
0xee, 0x22, 0x0d, 0x77, 0xb3, 0xf9, 0x4d, 0x18, 0xfd, 0x10, 0xb6},
115115
24,
@@ -130,7 +130,7 @@ static const test_data check1[] = {
130130
0x02, 0x01},
131131
{0x42, 0xf6, 0x7e, 0x3f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
132132
{0x57, 0x69, 0x0e, 0x43, 0x4e, 0x28, 0x00, 0x00, 0xa2, 0xfc, 0xa1, 0xa3},
133-
12, 12, 28, 28, BUFFER_SIZE,
133+
12, 12, 28, 28, PSA_AEAD_VERIFY_OUTPUT_MAX_SIZE,
134134
{0xFB, 0xA2, 0xCA, 0x84, 0x5E, 0x5D, 0xF9, 0xF0, 0xF2, 0x2C, 0x3E, 0x6E, 0x86,
135135
0xDD, 0x83, 0x1E, 0x1F, 0xC6, 0x57, 0x92, 0xCD, 0x1A, 0xF9, 0x13, 0x0E, 0x13,
136136
0x79, 0xED}, 28,

api-tests/ff/ipc/test_i047/test_supp_i047.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @file
2-
* Copyright (c) 2019-2024, Arm Limited or its affiliates. All rights reserved.
2+
* Copyright (c) 2019-2025, Arm Limited or its affiliates. All rights reserved.
33
* SPDX-License-Identifier : Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -206,9 +206,21 @@ int32_t server_test_psa_get_with_invalid_msg_pointer(void)
206206
val->print(PRINT_ERROR, "\tFailed to set boot flag after check\n", 0);
207207
}
208208

209+
/* GCC null-dereference check fails because of invalid_msg, however this
210+
* part should not be reached according the comment above.
211+
*/
212+
#if defined(__GNUC__)
213+
#pragma GCC diagnostic push
214+
#pragma GCC diagnostic ignored "-Wnull-dereference"
215+
#endif
216+
209217
/* Reject the connection */
210218
psa->reply(invalid_msg->handle, PSA_ERROR_CONNECTION_REFUSED);
211219

220+
#if defined(__GNUC__)
221+
#pragma GCC diagnostic pop
222+
#endif
223+
212224
return VAL_STATUS_SPM_FAILED;
213225
}
214226

api-tests/platform/targets/tgt_ff_tfm_mps4/target.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
///** @file
2-
// * Copyright (c) 2023-2024, Arm Limited or its affiliates. All rights reserved.
2+
// * Copyright (c) 2023-2025, Arm Limited or its affiliates. All rights reserved.
33
// * SPDX-License-Identifier : Apache-2.0
44
// *
55
// * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
1717

1818
// UART device info
1919
uart.num=1;
20-
uart.0.base = 0x59305000; // UART2_S
20+
uart.0.base = 0x58205000; // UART2_S
2121
uart.0.size = 0xFFF;
2222
uart.0.intr_id = 0xFF;
2323
uart.0.permission = TYPE_READ_WRITE;

0 commit comments

Comments
 (0)