Skip to content

Commit 6ddb4d8

Browse files
Improve descriptions of derive test cases
Systematically use "PSA key derivation setup" for derive_setup. This resolves the ambiguity between derive_setup and derive_input calls.
1 parent 0a048b2 commit 6ddb4d8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

tests/suites/test_suite_psa_crypto.data

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,43 +1864,43 @@ asymmetric_decrypt_fail:PSA_KEY_TYPE_RSA_KEY_PAIR:"3082025e02010002818100af057d3
18641864
Crypto derivation operation object initializers zero properly
18651865
key_derivation_init:
18661866

1867-
PSA key derivation: HKDF-SHA-256, good case [#1]
1867+
PSA key derivation setup: HKDF-SHA-256, good case
18681868
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
18691869
derive_setup:PSA_ALG_HKDF(PSA_ALG_SHA_256):PSA_SUCCESS
18701870

1871-
PSA key derivation: HKDF-SHA-512, good case [#1]
1871+
PSA key derivation setup: HKDF-SHA-512, good case
18721872
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA512_C
18731873
derive_setup:PSA_ALG_HKDF(PSA_ALG_SHA_512):PSA_SUCCESS
18741874

1875-
PSA key derivation: TLS 1.2 PRF SHA-256, good case [#1]
1875+
PSA key derivation setup: TLS 1.2 PRF SHA-256, good case
18761876
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
18771877
derive_setup:PSA_ALG_TLS12_PRF(PSA_ALG_SHA_256):PSA_SUCCESS
18781878

1879-
PSA key derivation: not a key derivation algorithm (HMAC)
1879+
PSA key derivation setup: not a key derivation algorithm (HMAC)
18801880
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
18811881
derive_setup:PSA_ALG_HMAC(PSA_ALG_SHA_256):PSA_ERROR_INVALID_ARGUMENT
18821882

1883-
PSA key derivation: unsupported key derivation algorithm [#1]
1883+
PSA key derivation setup: algorithm from bad hash
18841884
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
18851885
derive_setup:PSA_ALG_HKDF(PSA_ALG_CATEGORY_HASH):PSA_ERROR_NOT_SUPPORTED
18861886

1887-
PSA key derivation: unsupported key derivation algorithm [#2]
1887+
PSA key derivation setup: bad algorithm
18881888
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
18891889
derive_setup:PSA_ALG_CATEGORY_KEY_DERIVATION:PSA_ERROR_NOT_SUPPORTED
18901890

1891-
PSA key derivation: HKDF-SHA-256, good case [#2]
1891+
PSA key derivation: HKDF-SHA-256, good case
18921892
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
18931893
derive_input:PSA_ALG_HKDF(PSA_ALG_SHA_256):PSA_KEY_TYPE_DERIVE:PSA_KEY_DERIVATION_INPUT_SALT:"":PSA_KEY_DERIVATION_INPUT_SECRET:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":PSA_KEY_DERIVATION_INPUT_INFO:"":PSA_SUCCESS:PSA_SUCCESS:PSA_SUCCESS
18941894

1895-
PSA key derivation: HKDF-SHA-512, good case [#2]
1895+
PSA key derivation: HKDF-SHA-512, good case
18961896
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA512_C
18971897
derive_input:PSA_ALG_HKDF(PSA_ALG_SHA_512):PSA_KEY_TYPE_DERIVE:PSA_KEY_DERIVATION_INPUT_SALT:"":PSA_KEY_DERIVATION_INPUT_SECRET:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":PSA_KEY_DERIVATION_INPUT_INFO:"":PSA_SUCCESS:PSA_SUCCESS:PSA_SUCCESS
18981898

18991899
PSA key derivation: HKDF-SHA-256, bad key type
19001900
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
19011901
derive_input:PSA_ALG_HKDF(PSA_ALG_SHA_256):PSA_KEY_TYPE_RAW_DATA:PSA_KEY_DERIVATION_INPUT_SALT:"":PSA_KEY_DERIVATION_INPUT_SECRET:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":PSA_KEY_DERIVATION_INPUT_INFO:"":PSA_SUCCESS:PSA_ERROR_INVALID_ARGUMENT:PSA_SUCCESS
19021902

1903-
PSA key derivation: TLS 1.2 PRF SHA-256, good case [#2]
1903+
PSA key derivation: TLS 1.2 PRF SHA-256, good case
19041904
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
19051905
derive_input:PSA_ALG_TLS12_PRF(PSA_ALG_SHA_256):PSA_KEY_TYPE_DERIVE:PSA_KEY_DERIVATION_INPUT_SEED:"":PSA_KEY_DERIVATION_INPUT_SECRET:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":PSA_KEY_DERIVATION_INPUT_LABEL:"":PSA_SUCCESS:PSA_SUCCESS:PSA_SUCCESS
19061906

0 commit comments

Comments
 (0)