commit 23a6784cb927dacf9e46080e037870d2bbe80e0f
author Oren Cohen <oren.cohen@arm.com> Thu Jan 24 14:32:11 2019 +0200
committer Oren Cohen <oren.cohen@arm.com> Sun Jan 27 10:19:18 2019 +0200
tree 8db5f2894261539d927a798154036da361f41c75
parent 0b6b87105624b52f1c7c2f9ac4e8e2ff977a58f9

Update usage of PSA ITS to comply with v1.0

library/psa_crypto_storage_its.c

diff --git a/library/psa_crypto_storage_its.c b/library/psa_crypto_storage_its.c
index d53467a..1c7e171 100644
--- a/library/psa_crypto_storage_its.c
+++ b/library/psa_crypto_storage_its.c
@@ -29,7 +29,7 @@
 
 #include "psa/crypto.h"
 #include "psa_crypto_storage_backend.h"
-#include "psa_prot_internal_storage.h"
+#include "psa/internal_trusted_storage.h"
 
 #if defined(MBEDTLS_PLATFORM_C)
 #include "mbedtls/platform.h"
@@ -42,7 +42,7 @@
         case PSA_ITS_SUCCESS:
             return( PSA_SUCCESS );
 
-        case PSA_ITS_ERROR_KEY_NOT_FOUND:
+        case PSA_ITS_ERROR_UID_NOT_FOUND:
             return( PSA_ERROR_EMPTY_SLOT );
 
         case PSA_ITS_ERROR_STORAGE_FAILURE:
@@ -51,10 +51,9 @@
         case PSA_ITS_ERROR_INSUFFICIENT_SPACE:
             return( PSA_ERROR_INSUFFICIENT_STORAGE );
 
-        case PSA_ITS_ERROR_INVALID_KEY:
         case PSA_ITS_ERROR_OFFSET_INVALID:
         case PSA_ITS_ERROR_INCORRECT_SIZE:
-        case PSA_ITS_ERROR_BAD_POINTER:
+        case PSA_ITS_ERROR_INVALID_ARGUMENTS:
             return( PSA_ERROR_INVALID_ARGUMENT );
 
         case PSA_ITS_ERROR_FLAGS_NOT_SUPPORTED:
@@ -100,7 +99,7 @@
 
     ret = psa_its_get_info( data_identifier, &data_identifier_info );
 
-    if( ret == PSA_ITS_ERROR_KEY_NOT_FOUND )
+    if( ret == PSA_ITS_ERROR_UID_NOT_FOUND )
         return( 0 );
     return( 1 );
 }
@@ -150,14 +149,14 @@
     struct psa_its_info_t data_identifier_info;
 
     ret = psa_its_get_info( data_identifier, &data_identifier_info );
-    if( ret == PSA_ITS_ERROR_KEY_NOT_FOUND )
+    if( ret == PSA_ITS_ERROR_UID_NOT_FOUND )
         return( PSA_SUCCESS );
 
     if( psa_its_remove( data_identifier ) != PSA_ITS_SUCCESS )
         return( PSA_ERROR_STORAGE_FAILURE );
 
     ret = psa_its_get_info( data_identifier, &data_identifier_info );
-    if( ret != PSA_ITS_ERROR_KEY_NOT_FOUND )
+    if( ret != PSA_ITS_ERROR_UID_NOT_FOUND )
         return( PSA_ERROR_STORAGE_FAILURE );
 
     return( PSA_SUCCESS );