commit a60d9223d602ef4fc29ef2917691c8abfa695b77
author Tom Cosgrove <tom.cosgrove@arm.com> Tue Jun 18 13:22:21 2024 +0100
committer Tom Cosgrove <tom.cosgrove@arm.com> Tue Jun 18 13:22:21 2024 +0100
tree 3752928c7b989e48d89f7643dadbb8c1a932d79e
parent 37610024e9b46f6da86bd0665e72b6fd9bf4000f

Update psa_sim_serialise.pl to create the psa_sim_serialise.c we want

Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>

tests/psa-client-server/psasim/src/psa_sim_serialise.c

diff --git a/tests/psa-client-server/psasim/src/psa_sim_serialise.c b/tests/psa-client-server/psasim/src/psa_sim_serialise.c
index 703e430..aaf47db 100644
--- a/tests/psa-client-server/psasim/src/psa_sim_serialise.c
+++ b/tests/psa-client-server/psasim/src/psa_sim_serialise.c
@@ -110,8 +110,7 @@
 {
     psasim_client_handle_t handle = next_aead_operation_handle++;
     if (next_aead_operation_handle == 0) {      /* wrapped around */
-        fprintf(stderr, "MAX HASH HANDLES REACHED\n");
-        exit(1);
+        FATAL("Aead operation handle wrapped");
     }
 
     for (ssize_t i = 0; i < MAX_LIVE_HANDLES_PER_CLASS; i++) {
@@ -121,6 +120,8 @@
         }
     }
 
+    ERROR("All slots are currently used. Unable to allocate a new one.");
+
     return -1;  /* all in use */
 }
 
@@ -133,7 +134,9 @@
         }
     }
 
-    return -1;  /* all in use */
+    ERROR("Unable to find slot by handle %u", handle);
+
+    return -1;  /* not found */
 }
 
 size_t psasim_serialise_begin_needs(void)
@@ -710,9 +713,3 @@
 
     return 1;
 }
-
-void psa_sim_serialize_reset(void)
-{
-    memset(hash_operation_handles, 0, sizeof(hash_operation_handles));
-    memset(hash_operations, 0, sizeof(hash_operations));
-}

tests/psa-client-server/psasim/src/psa_sim_serialise.pl

diff --git a/tests/psa-client-server/psasim/src/psa_sim_serialise.pl b/tests/psa-client-server/psasim/src/psa_sim_serialise.pl
index e09bb81..c795fd4 100755
--- a/tests/psa-client-server/psasim/src/psa_sim_serialise.pl
+++ b/tests/psa-client-server/psasim/src/psa_sim_serialise.pl
@@ -724,6 +724,7 @@
  */
 
 #include "psa_sim_serialise.h"
+#include "util.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -788,6 +789,8 @@
 {
     my ($type) = @_;    # e.g. 'hash' rather than 'psa_hash_operation_t'
 
+    my $utype = ucfirst($type);
+
     return <<EOF;
 
 static psa_${type}_operation_t ${type}_operations[MAX_LIVE_HANDLES_PER_CLASS];
@@ -799,8 +802,7 @@
 {
     psasim_client_handle_t handle = next_${type}_operation_handle++;
     if (next_${type}_operation_handle == 0) {      /* wrapped around */
-        fprintf(stderr, "MAX HASH HANDLES REACHED\\n");
-        exit(1);
+        FATAL("$utype operation handle wrapped");
     }
 
     for (ssize_t i = 0; i < MAX_LIVE_HANDLES_PER_CLASS; i++) {
@@ -810,6 +812,8 @@
         }
     }
 
+    ERROR("All slots are currently used. Unable to allocate a new one.");
+
     return -1;  /* all in use */
 }
 
@@ -822,7 +826,9 @@
         }
     }
 
-    return -1;  /* all in use */
+    ERROR("Unable to find slot by handle %u", handle);
+
+    return -1;  /* not found */
 }
 EOF
 }