Hook the new psa_sim_crypto_{client,server} into the build and tests
- smoke test client.c becomes a trivial call to psa_crypto_init()
- server.c now uses psa_sim_crypto_server.c's psa_crypto_call()
- Makefile is updated to build all the modules, and allow a different MAIN
- all.sh's test_psasim now tests the simulation of psa_hash_compute() too
Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
diff --git a/tests/psa-client-server/psasim/src/client.c b/tests/psa-client-server/psasim/src/client.c
index 550a6e8..a8c9e08 100644
--- a/tests/psa-client-server/psasim/src/client.c
+++ b/tests/psa-client-server/psasim/src/client.c
@@ -5,50 +5,17 @@
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
-#include <stdio.h>
-#include <unistd.h>
-
-/* Includes from psasim */
-#include <client.h>
-#include <util.h>
-#include "psa_manifest/sid.h"
-#include "psa_functions_codes.h"
-
/* Includes from mbedtls */
-#include "mbedtls/version.h"
#include "psa/crypto.h"
-#define CLIENT_PRINT(fmt, ...) \
- PRINT("Client: " fmt, ##__VA_ARGS__)
-
int main()
{
- char mbedtls_version[18];
- // psa_invec invecs[1];
- // psa_outvec outvecs[1];
- psa_status_t status;
-
- mbedtls_version_get_string_full(mbedtls_version);
- CLIENT_PRINT("%s", mbedtls_version);
-
- CLIENT_PRINT("My PID: %d", getpid());
-
- CLIENT_PRINT("PSA version: %u", psa_version(PSA_SID_CRYPTO_SID));
- psa_handle_t h = psa_connect(PSA_SID_CRYPTO_SID, 1);
-
- if (h < 0) {
- CLIENT_PRINT("Couldn't connect %d", h);
- return 1;
- }
-
- status = psa_call(h, PSA_CRYPTO_INIT, NULL, 0, NULL, 0);
- CLIENT_PRINT("PSA_CRYPTO_INIT returned: %d", status);
-
- CLIENT_PRINT("Closing handle");
- psa_close(h);
-
+ /* psa_crypto_init() connects to the server */
+ psa_status_t status = psa_crypto_init();
if (status != PSA_SUCCESS) {
return 1;
}
+
+ mbedtls_psa_crypto_free();
return 0;
}