SST: Renumber NS client IDs

The patch aligns the ID of client 0 to be equal to the ID returned by
the TF-M Core when the NS client identification is not supported.
It also renumbers the other client IDs to be aligned with the client
ID 0 value.

Change-Id: Ib6757a1c02f5224d725a22e2e598cc3d39d383d7
Signed-off-by: Marc Moreno <marc.morenoberengue@arm.com>
diff --git a/interface/src/tfm_nspm_svc_handler.c b/interface/src/tfm_nspm_svc_handler.c
index 7578308..5361df4 100644
--- a/interface/src/tfm_nspm_svc_handler.c
+++ b/interface/src/tfm_nspm_svc_handler.c
@@ -30,13 +30,13 @@
 
 static struct thread_sst_clientid_pair sst_ns_policy_table[] =
 {
-    {"Thread_A", -9},
-    {"Thread_B", -10},
-    {"Thread_C", -11},
-    {"Thread_D", -12},
-    {"seq_task", -13},
-    {"mid_task", -14},
-    {"pri_task", -15},
+    {"Thread_A", -1},
+    {"Thread_B", -2},
+    {"Thread_C", -3},
+    {"Thread_D", -4},
+    {"seq_task", -5},
+    {"mid_task", -6},
+    {"pri_task", -7},
 };
 
 static const char* get_active_task_name(void)
diff --git a/secure_fw/services/secure_storage/assets/sst_asset_defs.h b/secure_fw/services/secure_storage/assets/sst_asset_defs.h
index 63f836b..cf63b42 100644
--- a/secure_fw/services/secure_storage/assets/sst_asset_defs.h
+++ b/secure_fw/services/secure_storage/assets/sst_asset_defs.h
@@ -50,10 +50,10 @@
 #define SST_ASSET_PERMS_COUNT_SHA224_HASH 1
 #define SST_ASSET_PERMS_COUNT_SHA384_HASH 1
 
-#define SST_CLIENT_ID_0 -9
-#define SST_CLIENT_ID_1 -10
-#define SST_CLIENT_ID_2 -11
-#define SST_CLIENT_ID_3 -12
+#define SST_CLIENT_ID_0 -1
+#define SST_CLIENT_ID_1 -2
+#define SST_CLIENT_ID_2 -3
+#define SST_CLIENT_ID_3 -4
 
 /* Maximum number of assets that can be stored in the cache */
 #define SST_NUM_ASSETS 10