Merge pull request #9862 from netanelgonen/backward_support_its

Backward support PSA_ITS

Author: Cruz Monrreal

components/TARGET_PSA/services/storage/common/psa_storage_common_impl.cpp

@@ -191,6 +191,9 @@ psa_status_t psa_storage_set_impl(KVStore *kvstore, int32_t pid, psa_storage_uid
         return PSA_ERROR_NOT_SUPPORTED;
     }
 
+    if (uid == 0) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
     // Generate KVStore key
     char kv_key[PSA_STORAGE_FILE_NAME_MAX] = {'\0'};
     generate_fn(kv_key, PSA_STORAGE_FILE_NAME_MAX, uid, pid);
@@ -208,6 +211,10 @@ psa_status_t psa_storage_set_impl(KVStore *kvstore, int32_t pid, psa_storage_uid
 psa_status_t psa_storage_get_impl(KVStore *kvstore, int32_t pid, psa_storage_uid_t uid,
                                   uint32_t data_offset, uint32_t data_length, void *p_data)
 {
+    if (uid == 0) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
+
     // Generate KVStore key
     char kv_key[PSA_STORAGE_FILE_NAME_MAX] = {'\0'};
     generate_fn(kv_key, PSA_STORAGE_FILE_NAME_MAX, uid, pid);
@@ -242,6 +249,11 @@ psa_status_t psa_storage_get_impl(KVStore *kvstore, int32_t pid, psa_storage_uid
 psa_status_t psa_storage_get_info_impl(KVStore *kvstore, int32_t pid, psa_storage_uid_t uid,
                                        struct psa_storage_info_t *p_info)
 {
+
+    if (uid == 0) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
+
     // Generate KVStore key
     char kv_key[PSA_STORAGE_FILE_NAME_MAX] = {'\0'};
     generate_fn(kv_key, PSA_STORAGE_FILE_NAME_MAX, uid, pid);
@@ -262,6 +274,10 @@ psa_status_t psa_storage_get_info_impl(KVStore *kvstore, int32_t pid, psa_storag
 
 psa_status_t psa_storage_remove_impl(KVStore *kvstore, int32_t pid, psa_storage_uid_t uid)
 {
+    if (uid == 0) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
+
     // Generate KVStore key
     char kv_key[PSA_STORAGE_FILE_NAME_MAX] = {'\0'};
     generate_fn(kv_key, PSA_STORAGE_FILE_NAME_MAX, uid, pid);

components/TARGET_PSA/services/storage/its/psa_prot_internal_storage.h

@@ -55,11 +55,33 @@ struct psa_its_info_t {
 #define PSA_ITS_ERROR_STORAGE_FAILURE       PSA_ERROR_STORAGE_FAILURE
 #define PSA_ITS_ERROR_INSUFFICIENT_SPACE    PSA_ERROR_INSUFFICIENT_STORAGE
 #define PSA_ITS_ERROR_OFFSET_INVALID        PSA_ERROR_INVALID_ARGUMENT
-#define PSA_ITS_ERROR_INCORRECT_SIZE        PSA_ERROR_INVALID_ARGUMENT
+#define PSA_ITS_ERROR_INCORRECT_SIZE        PSA_ERROR_BUFFER_TOO_SMALL
 #define PSA_ITS_ERROR_INVALID_ARGUMENTS     PSA_ERROR_INVALID_ARGUMENT
 #define PSA_ITS_ERROR_FLAGS_NOT_SUPPORTED   PSA_ERROR_NOT_SUPPORTED
-#define PSA_ITS_ERROR_WRITE_ONCE            PSA_ERROR_ALREADY_EXISTS
-
+#define PSA_ITS_ERROR_WRITE_ONCE            PSA_ERROR_NOT_PERMITTED
+#define PSA_ITS_FLAG_WRITE_ONCE             PSA_STORAGE_FLAG_WRITE_ONCE
+
+MBED_DEPRECATED("PS specific types should not be used")
+typedef psa_status_t psa_ps_status_t;
+MBED_DEPRECATED("PS specific types should not be used")
+typedef psa_storage_uid_t psa_ps_uid_t;
+MBED_DEPRECATED("PS specific types should not be used")
+typedef psa_storage_create_flags_t psa_ps_create_flags_t;
+MBED_DEPRECATED("PS specific types should not be used")
+struct psa_ps_info_t {
+    uint32_t size;
+    psa_ps_create_flags_t flags;
+};
+#define PSA_PS_SUCCESS                     PSA_SUCCESS
+#define PSA_PS_ERROR_UID_NOT_FOUND         PSA_ERROR_DOES_NOT_EXIST
+#define PSA_PS_ERROR_STORAGE_FAILURE       PSA_ERROR_STORAGE_FAILURE
+#define PSA_PS_ERROR_INSUFFICIENT_SPACE    PSA_ERROR_INSUFFICIENT_STORAGE
+#define PSA_PS_ERROR_OFFSET_INVALID        PSA_ERROR_INVALID_ARGUMENT
+#define PSA_PS_ERROR_INCORRECT_SIZE        PSA_ERROR_BUFFER_TOO_SMALL
+#define PSA_PS_ERROR_INVALID_ARGUMENT      PSA_ERROR_INVALID_ARGUMENT
+#define PSA_PS_ERROR_FLAGS_NOT_SUPPORTED   PSA_ERROR_NOT_SUPPORTED
+#define PSA_PS_ERROR_WRITE_ONCE            PSA_ERROR_NOT_PERMITTED
+#define PSA_PS_FLAG_WRITE_ONCE             PSA_STORAGE_FLAG_WRITE_ONCE
 
 /**
  * \brief create a new or modify an existing uid/value pair