commit e665466a807bb8a7bb255e46f41733aabbeb5ee4
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Wed Apr 20 09:14:51 2022 +0200
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Thu Apr 21 11:53:57 2022 +0200
tree 55613853a82364a525bddc1e3fa3d5675be496ce
parent c5bd1b8b243da7ca595a533ec400f00cc3d464c4

derive_output test: add other key type value 11 to handle raw key type

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>

tests/suites/test_suite_psa_crypto.data

diff --git a/tests/suites/test_suite_psa_crypto.data b/tests/suites/test_suite_psa_crypto.data
index 4f685e6..e0fa90e 100644
--- a/tests/suites/test_suite_psa_crypto.data
+++ b/tests/suites/test_suite_psa_crypto.data
@@ -5450,7 +5450,7 @@
 
 PSA key derivation: TLS 1.2 Mix-PSK-to-MS, other key is raw data
 depends_on:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS
-derive_output:PSA_ALG_TLS12_PSK_TO_MS(PSA_ALG_SHA_256):PSA_KEY_DERIVATION_INPUT_SEED:"5bc0b19b4a8b24b07afe7ec65c471e94a7d518fcef06c3574315255c52afe21b5bc0b19b872b9b26508458f03603744d575f463a11ae7f1b090c012606fd3e9f":PSA_SUCCESS:PSA_KEY_DERIVATION_INPUT_OTHER_SECRET:"c4eb02cb10175ab8a33aeeb068ba23df08206b0e":PSA_ERROR_INVALID_ARGUMENT:PSA_KEY_DERIVATION_INPUT_SECRET:"01020304":PSA_SUCCESS:PSA_KEY_DERIVATION_INPUT_LABEL:"6d617374657220736563726574":PSA_SUCCESS:"":48:"2d6cba7ad474ac3dfcc01516ed7161a9b00c2e8a35b3e921b9eb09b546a54c98491b21d1baafb659c9094b760144ea1f":"":1:1:0
+derive_output:PSA_ALG_TLS12_PSK_TO_MS(PSA_ALG_SHA_256):PSA_KEY_DERIVATION_INPUT_SEED:"5bc0b19b4a8b24b07afe7ec65c471e94a7d518fcef06c3574315255c52afe21b5bc0b19b872b9b26508458f03603744d575f463a11ae7f1b090c012606fd3e9f":PSA_SUCCESS:PSA_KEY_DERIVATION_INPUT_OTHER_SECRET:"c4eb02cb10175ab8a33aeeb068ba23df08206b0e":PSA_ERROR_INVALID_ARGUMENT:PSA_KEY_DERIVATION_INPUT_SECRET:"01020304":PSA_SUCCESS:PSA_KEY_DERIVATION_INPUT_LABEL:"6d617374657220736563726574":PSA_SUCCESS:"":48:"2d6cba7ad474ac3dfcc01516ed7161a9b00c2e8a35b3e921b9eb09b546a54c98491b21d1baafb659c9094b760144ea1f":"":11:1:0
 
 PSA key derivation: TLS 1.2 Mix-PSK-to-MS, output key not permitted
 depends_on:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index accd4b3..45f2c67 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -6998,13 +6998,14 @@
                                                                     inputs[i]->len ),
                                     statuses[i] );
                         break;
-                    case 1: // input key
+                    case 1: // input key, type DERIVE
+                    case 11: // input key, type RAW
                         psa_set_key_usage_flags( &attributes2, PSA_KEY_USAGE_DERIVE );
                         psa_set_key_algorithm( &attributes2, alg );
                         psa_set_key_type( &attributes2, PSA_KEY_TYPE_DERIVE );
 
                         // other secret of type RAW_DATA passed with input_key
-                        if( statuses[i] == PSA_ERROR_INVALID_ARGUMENT )
+                        if( other_key_input_type == 11 )
                             psa_set_key_type( &attributes2, PSA_KEY_TYPE_RAW_DATA );
 
                         PSA_ASSERT( psa_import_key( &attributes2,