Last update

Author: Oren Cohen

components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.cpp

@@ -210,7 +210,7 @@ psa_its_status_t psa_its_set_impl(int32_t pid, psa_its_uid_t uid, uint32_t data_
         its_init();
     }
 
-    if ((create_flags & (~PSA_ITS_FLAGS_BIT_MASK)) != 0) {
+    if ((create_flags & (~PSA_ITS_FLAGS_MSK)) != 0) {
         return PSA_ITS_ERROR_FLAGS_NOT_SUPPORTED;
     }
 
@@ -243,7 +243,7 @@ psa_its_status_t psa_its_get_impl(int32_t pid, psa_its_uid_t uid, uint32_t data_
 
     if (status == MBED_SUCCESS) {
         if (data_offset > kv_info.size) {
-            return PSA_PS_ERROR_OFFSET_INVALID;
+            return PSA_ITS_ERROR_OFFSET_INVALID;
         }
 
         // Verify (size + offset) does not wrap around

components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.h

@@ -27,7 +27,6 @@ extern "C"
 
 #define PITS_DATA_PTR_AT_OFFSET(ptr, offset) ((void *)(((uintptr_t)ptr) + ((uintptr_t)offset)))
 #define STR_EXPAND(tok)                 #tok
-#define PSA_ITS_FLAGS_BIT_MASK (PSA_ITS_FLAG_NONE | PSA_ITS_FLAG_WRITE_ONCE)
 
 psa_its_status_t psa_its_set_impl(int32_t pid, psa_its_uid_t uid, uint32_t data_length, const void *p_data, psa_its_create_flags_t create_flags);
 psa_its_status_t psa_its_get_impl(int32_t pid, psa_its_uid_t uid, uint32_t data_offset, uint32_t data_length, void *p_data);

components/TARGET_PSA/services/psa_prot_internal_storage/psa_prot_internal_storage.h

@@ -1,23 +1,20 @@
-/* Copyright (c) 2018 ARM Limited
- *
- * SPDX-License-Identifier: Apache-2.0
+#ifndef __INTERNAL_TRUSTED_STORAGE_H__
+#define __INTERNAL_TRUSTED_STORAGE_H__
+/*  Copyright (C) 2019, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
-
-#ifndef __INTERNAL_TRUSTED_STORAGE_H__
-#define __INTERNAL_TRUSTED_STORAGE_H__
-
 /** @file
 @brief This file describes the PSA Internal Trusted Storage API
 */
@@ -41,6 +38,12 @@ typedef uint64_t psa_its_uid_t;
 
 #define PSA_ITS_FLAG_NONE        0         /**< No flags to pass */
 #define PSA_ITS_FLAG_WRITE_ONCE ( 1 << 0 ) /**< The data associated with the key will not be able to be modified or deleted. Intended to be used to set bits in `psa_its_create_flags_t` */
+/** Mask for all of the ITS Flags
+ */
+#define PSA_ITS_FLAGS_MSK ( \
+    PSA_ITS_FLAG_NONE | \
+    PSA_ITS_FLAG_WRITE_ONCE \
+    )
 
 /**
  * \brief A container for metadata associated with a specific key
@@ -59,10 +62,10 @@ typedef uint32_t psa_its_status_t;
 #define PSA_ITS_ERROR_FLAGS_NOT_SUPPORTED       2   /**<    The operation failed because one or more of the flags provided in `create_flags` is not supported or is not valid */
 #define PSA_ITS_ERROR_INSUFFICIENT_SPACE        3   /**<    The operation failed because there was insufficient space on the storage medium */
 #define PSA_ITS_ERROR_STORAGE_FAILURE           4   /**<    The operation failed because the physical storage has failed (Fatal error) */
-#define PSA_ITS_ERROR_INVALID_ARGUMENTS          5   /**<    The operation failed because one of the provided pointers is invalid, for example is `NULL` or references memory the caller cannot access */
+#define PSA_ITS_ERROR_INVALID_ARGUMENTS         5   /**<    The operation failed because one of the provided pointers is invalid, for example is `NULL` or references memory the caller cannot access */
 #define PSA_ITS_ERROR_UID_NOT_FOUND             6   /**<    The operation failed because the provided key value was not found in the storage */
 #define PSA_ITS_ERROR_INCORRECT_SIZE            7   /**<    The operation failed because the data associated with provided key is not the same size as `data_size`, or `offset+data_size` is too large for the data, but `offset` is less than the size */
-#define PSA_PS_ERROR_OFFSET_INVALID            8   /**<    The operation failed because an offset was supplied that is invalid for the existing data associated with the uid. For example, offset  is greater that the size of the data */
+#define PSA_ITS_ERROR_OFFSET_INVALID            8   /**<    The operation failed because an offset was supplied that is invalid for the existing data associated with the uid. For example, offset  is greater that the size of the data */
 
 /**
  * \brief create a new or modify an existing uid/value pair
@@ -104,7 +107,7 @@ psa_its_status_t psa_its_set(psa_its_uid_t uid,
  * \retval      PSA_ITS_ERROR_STORAGE_FAILURE    The operation failed because the physical storage has failed (Fatal error)
  * \retval      PSA_ITS_ERROR_INVALID_ARGUMENTS  The operation failed because one of the provided pointers(`p_data`, `p_data_length`)
  *                                               is invalid. For example is `NULL` or references memory the caller cannot access
- * \retval      PSA_PS_ERROR_OFFSET_INVALID      The operation failed because an offset was supplied that is invalid for the existing data associated with the
+ * \retval      PSA_ITS_ERROR_OFFSET_INVALID      The operation failed because an offset was supplied that is invalid for the existing data associated with the
  *                                               uid. For example, offset + size is invalid
  */
 psa_its_status_t psa_its_get(psa_its_uid_t uid,