Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework
Submodule framework updated 38 files
+75 −58 psasim/Makefile
+29 −47 psasim/README.md
+75 −0 psasim/include/client.h
+52 −0 psasim/include/common.h
+19 −0 psasim/include/error_ext.h
+15 −0 psasim/include/init.h
+17 −0 psasim/include/lifecycle.h
+253 −0 psasim/include/service.h
+33 −0 psasim/include/util.h
+71 −0 psasim/src/aut_main.c
+227 −0 psasim/src/aut_psa_aead_encrypt.c
+126 −0 psasim/src/aut_psa_aead_encrypt_decrypt.c
+81 −0 psasim/src/aut_psa_asymmetric_encrypt_decrypt.c
+84 −0 psasim/src/aut_psa_cipher_encrypt_decrypt.c
+167 −0 psasim/src/aut_psa_hash.c
+81 −0 psasim/src/aut_psa_hash_compute.c
+121 −0 psasim/src/aut_psa_hkdf.c
+146 −0 psasim/src/aut_psa_key_agreement.c
+162 −0 psasim/src/aut_psa_mac.c
+47 −0 psasim/src/aut_psa_random.c
+93 −0 psasim/src/aut_psa_sign_verify.c
+11 −368 psasim/src/client.c
+29 −0 psasim/src/manifest.json
+385 −0 psasim/src/psa_ff_client.c
+655 −0 psasim/src/psa_ff_server.c
+107 −0 psasim/src/psa_functions_codes.h
+7,906 −0 psasim/src/psa_sim_crypto_client.c
+9,226 −0 psasim/src/psa_sim_crypto_server.c
+1,208 −0 psasim/src/psa_sim_generate.pl
+1,765 −0 psasim/src/psa_sim_serialise.c
+1,432 −0 psasim/src/psa_sim_serialise.h
+1,048 −0 psasim/src/psa_sim_serialise.pl
+117 −0 psasim/src/server.c
+17 −0 psasim/test/kill_servers.sh
+24 −0 psasim/test/run_test.sh
+24 −0 psasim/test/start_server.sh
+12 −0 psasim/tests/psa-client-server/psasim/.gitignore
+65 −54 psasim/tools/psa_autogen.py
2 changes: 1 addition & 1 deletion scripts/common.make
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ifndef MBEDTLS_PATH
MBEDTLS_PATH := ..
endif

PSASIM_PATH=$(MBEDTLS_PATH)/tests/psa-client-server/psasim
PSASIM_PATH=$(MBEDTLS_PATH)/framework/psasim

ifeq (,$(wildcard $(MBEDTLS_PATH)/framework/exported.make))
# Use the define keyword to get a multi-line message.
Expand Down
2 changes: 1 addition & 1 deletion tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ $(CRYPTO_BINARIES): %$(EXEXT): %.c $(MBEDLIBS) $(TEST_OBJS_DEPS) $(MBEDTLS_TEST_

clean:
ifndef WINDOWS
$(MAKE) -C psa-client-server/psasim clean
$(MAKE) -C $(PSASIM_PATH) clean
rm -rf $(BINARIES) *.c *.datax
rm -rf $(CRYPTO_BINARIES) ../tf-psa-crypto/tests/*.c ../tf-psa-crypto/tests/*.datax
rm -f src/*.o src/test_helpers/*.o src/libmbed*
Expand Down
6 changes: 0 additions & 6 deletions tests/psa-client-server/README.md

This file was deleted.

12 changes: 0 additions & 12 deletions tests/psa-client-server/psasim/.gitignore

This file was deleted.

81 changes: 0 additions & 81 deletions tests/psa-client-server/psasim/Makefile

This file was deleted.

42 changes: 0 additions & 42 deletions tests/psa-client-server/psasim/README.md

This file was deleted.

75 changes: 0 additions & 75 deletions tests/psa-client-server/psasim/include/client.h

This file was deleted.

52 changes: 0 additions & 52 deletions tests/psa-client-server/psasim/include/common.h

This file was deleted.

19 changes: 0 additions & 19 deletions tests/psa-client-server/psasim/include/error_ext.h

This file was deleted.

15 changes: 0 additions & 15 deletions tests/psa-client-server/psasim/include/init.h

This file was deleted.

17 changes: 0 additions & 17 deletions tests/psa-client-server/psasim/include/lifecycle.h

This file was deleted.

Loading