commit a7e6df76ead156437d97aa592aa8bbec28f77b9d
author mohammad1603 <mohammad.abomokh@arm.com> Mon Apr 30 17:25:45 2018 +0300
committer itayzafrir <itay.zafrir@arm.com> Wed Sep 05 12:38:18 2018 +0300
tree 021f3b60230af2d5fe0924ed9296355e92da4c82
parent 091e73b22b4759d938ee0afeb9bf6d7b112fd861

Validation fixes for key_type

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 0ed9dd9..33e2657 100755
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1600,8 +1600,9 @@
     if( cipher_info == NULL )
         return( PSA_ERROR_NOT_SUPPORTED );
 
-    if ( key_type != PSA_KEY_TYPE_RAW_DATA)
-        return( PSA_ERROR_BAD_STATE );
+    if ( ( key_type & PSA_KEY_TYPE_CATEGORY_MASK ) == PSA_KEY_TYPE_CATEGORY_CIPHER
+           && PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ) == 16 )
+        return( PSA_ERROR_INVALID_ARGUMENT );
 
     operation->block_size = cipher_info->block_size;