Skip to content

Commit cc72675

Browse files
Add some more KDF test cases
1 parent b1eaed7 commit cc72675

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

tests/suites/test_suite_psa_crypto_metadata.data

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,26 @@ Key derivation: HKDF using SHA-256
262262
depends_on:MBEDTLS_SHA256_C
263263
key_derivation_algorithm:PSA_ALG_HKDF( PSA_ALG_SHA_256 ):ALG_IS_HKDF
264264

265+
Key derivation: HKDF using SHA-384
266+
depends_on:MBEDTLS_SHA512_C
267+
key_derivation_algorithm:PSA_ALG_HKDF( PSA_ALG_SHA_384 ):ALG_IS_HKDF
268+
269+
Key derivation: TLS 1.2 PRF using SHA-256
270+
depends_on:MBEDTLS_SHA256_C
271+
key_derivation_algorithm:PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 ):ALG_IS_TLS12_PRF
272+
273+
Key derivation: TLS 1.2 PRF using SHA-384
274+
depends_on:MBEDTLS_SHA512_C
275+
key_derivation_algorithm:PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 ):ALG_IS_TLS12_PRF
276+
277+
Key derivation: TLS 1.2 PSK-to-MS using SHA-256
278+
depends_on:MBEDTLS_SHA256_C
279+
key_derivation_algorithm:PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 ):ALG_IS_TLS12_PSK_TO_MS
280+
281+
Key derivation: TLS 1.2 PSK-to-MS using SHA-384
282+
depends_on:MBEDTLS_SHA512_C
283+
key_derivation_algorithm:PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 ):ALG_IS_TLS12_PSK_TO_MS
284+
265285
Key agreement: FFDH, raw output
266286
depends_on:MBEDTLS_DHM_C
267287
key_agreement_algorithm:PSA_ALG_FFDH:ALG_IS_FFDH | ALG_IS_RAW_KEY_AGREEMENT:PSA_ALG_FFDH:PSA_ALG_CATEGORY_KEY_DERIVATION
@@ -270,6 +290,10 @@ Key agreement: FFDH, HKDF using SHA-256
270290
depends_on:MBEDTLS_DHM_C
271291
key_agreement_algorithm:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):ALG_IS_FFDH:PSA_ALG_FFDH:PSA_ALG_HKDF( PSA_ALG_SHA_256 )
272292

293+
Key agreement: FFDH, HKDF using SHA-384
294+
depends_on:MBEDTLS_DHM_C
295+
key_agreement_algorithm:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):ALG_IS_FFDH:PSA_ALG_FFDH:PSA_ALG_HKDF( PSA_ALG_SHA_384 )
296+
273297
Key agreement: ECDH, raw output
274298
depends_on:MBEDTLS_ECDH_C
275299
key_agreement_algorithm:PSA_ALG_ECDH:ALG_IS_ECDH | ALG_IS_RAW_KEY_AGREEMENT:PSA_ALG_ECDH:PSA_ALG_CATEGORY_KEY_DERIVATION
@@ -278,6 +302,10 @@ Key agreement: ECDH, HKDF using SHA-256
278302
depends_on:MBEDTLS_ECDH_C
279303
key_agreement_algorithm:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):ALG_IS_ECDH:PSA_ALG_ECDH:PSA_ALG_HKDF( PSA_ALG_SHA_256 )
280304

305+
Key agreement: ECDH, HKDF using SHA-384
306+
depends_on:MBEDTLS_ECDH_C
307+
key_agreement_algorithm:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):ALG_IS_ECDH:PSA_ALG_ECDH:PSA_ALG_HKDF( PSA_ALG_SHA_384 )
308+
281309
Key type: raw data
282310
key_type:PSA_KEY_TYPE_RAW_DATA:KEY_TYPE_IS_UNSTRUCTURED
283311

tests/suites/test_suite_psa_crypto_metadata.function

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
#define ALG_IS_WILDCARD ( 1u << 19 )
3838
#define ALG_IS_RAW_KEY_AGREEMENT ( 1u << 20 )
3939
#define ALG_IS_AEAD_ON_BLOCK_CIPHER ( 1u << 21 )
40+
#define ALG_IS_TLS12_PRF ( 1u << 22 )
41+
#define ALG_IS_TLS12_PSK_TO_MS ( 1u << 23 )
4042

4143
/* Flags for key type classification macros. There is a flag for every
4244
* key type classification macro PSA_KEY_TYPE_IS_xxx except for some that

0 commit comments

Comments
 (0)