commit 593773d9f23f2a494c462f6e02d9fba47b1afd88
author Gilles Peskine <Gilles.Peskine@arm.com> Mon Sep 23 18:17:40 2019 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Tue Sep 24 18:39:03 2019 +0200
tree 9d9f45ea99ea3674c27bb69ad114a90e75c97ee5
parent 224b0d656a9d64ccf3d131bc41bd9f4052b8923f

Consistently abort key derivation operations on input error

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 1494593..07c6261 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5163,7 +5163,10 @@
                                       PSA_KEY_USAGE_DERIVE,
                                       operation->alg );
     if( status != PSA_SUCCESS )
+    {
+        psa_key_derivation_abort( operation );
         return( status );
+    }
     return( psa_key_derivation_input_internal( operation,
                                                step, slot->attr.type,
                                                slot->data.raw.data,

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 bfa3c1d..bf5b4cd 100644
--- a/tests/suites/test_suite_psa_crypto.data
+++ b/tests/suites/test_suite_psa_crypto.data
@@ -1898,7 +1898,7 @@
 
 PSA key derivation: HKDF-SHA-256, bad key type
 depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
-derive_input:PSA_ALG_HKDF(PSA_ALG_SHA_256):PSA_KEY_DERIVATION_INPUT_SALT:0:"":PSA_KEY_DERIVATION_INPUT_SECRET:PSA_KEY_TYPE_RAW_DATA:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":PSA_KEY_DERIVATION_INPUT_INFO:0:"":PSA_SUCCESS:PSA_ERROR_INVALID_ARGUMENT:PSA_SUCCESS
+derive_input:PSA_ALG_HKDF(PSA_ALG_SHA_256):PSA_KEY_DERIVATION_INPUT_SALT:0:"":PSA_KEY_DERIVATION_INPUT_SECRET:PSA_KEY_TYPE_RAW_DATA:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":PSA_KEY_DERIVATION_INPUT_INFO:0:"":PSA_SUCCESS:PSA_ERROR_INVALID_ARGUMENT:PSA_ERROR_BAD_STATE
 
 PSA key derivation: HKDF-SHA-256, direct secret
 depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C