commit bb225f7914408da63d607280e206d0ad23cad23e
author Jaeden Amero <jaeden@patater.com> Fri Nov 23 17:37:04 2018 +0000
committer Jaeden Amero <jaeden@patater.com> Fri Nov 23 17:37:04 2018 +0000
tree b08128c9445775b25c72e86d7d90e50daf6cf915
parent 720d9a6056dd0046b37c91223c7ad20abf8c712b
parent b1c48d3d83a2282957261b542be27026fa0c4520

Merge remote-tracking branch 'upstream-public/pr/2225' into development-psa-proposed

crypto

diff --git a/crypto b/crypto
index 76cbe27..9edcc3e 160000
--- a/crypto
+++ b/crypto
@@ -1 +1 @@
-Subproject commit 76cbe271b351d9e74efbd11872d6b244b2ed835e
+Subproject commit 9edcc3e8fba31bff4c31b685448f3b47edce6d92

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 6dba7a5..30fe06b 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -655,7 +655,7 @@
 scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
 scripts/config.pl set MBEDTLS_PSA_CRYPTO_C
 scripts/config.pl set MBEDTLS_USE_PSA_CRYPTO
-CC=gcc cmake -D USE_CRYPTO_SUBMODULE -D CMAKE_BUILD_TYPE:String=Asan .
+CC=gcc cmake -D USE_CRYPTO_SUBMODULE=1 -D CMAKE_BUILD_TYPE:String=Asan .
 make
 
 msg "test: main suites (MBEDTLS_USE_PSA_CRYPTO)"