Skip to content

Commit 12bd57b

Browse files
author
Hanno Becker
committed
Refer to PSA through MBEDTLS_USE_PSA_CRYPTO, not USE_PSA, in all.sh
1 parent fc359fd commit 12bd57b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

tests/scripts/all.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ if_build_succeeded env OPENSSL_CMD="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_LEGACY_
573573
msg "test: compat.sh ARIA + ChachaPoly"
574574
if_build_succeeded env OPENSSL_CMD="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA'
575575

576-
# USE_PSA: run the same set of tests as basic-build-test.sh
577-
msg "build: cmake, full config + USE_PSA, ASan"
576+
# MBEDTLS_USE_PSA_CRYPTO: run the same set of tests as basic-build-test.sh
577+
msg "build: cmake, full config + MBEDTLS_USE_PSA_CRYPTO, ASan"
578578
cleanup
579579
cp "$CONFIG_H" "$CONFIG_BAK"
580580
scripts/config.pl full
@@ -584,22 +584,22 @@ scripts/config.pl set MBEDTLS_USE_PSA_CRYPTO
584584
CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
585585
make
586586

587-
msg "test: main suites (USE_PSA)"
587+
msg "test: main suites (MBEDTLS_USE_PSA_CRYPTO)"
588588
make test
589589

590-
msg "test: ssl-opt.sh (USE_PSA)"
590+
msg "test: ssl-opt.sh (MBEDTLS_USE_PSA_CRYPTO)"
591591
if_build_succeeded tests/ssl-opt.sh
592592

593-
msg "test: compat.sh default (USE_PSA)"
593+
msg "test: compat.sh default (MBEDTLS_USE_PSA_CRYPTO)"
594594
if_build_succeeded tests/compat.sh
595595

596-
msg "test: compat.sh ssl3 (USE_PSA)"
596+
msg "test: compat.sh ssl3 (MBEDTLS_USE_PSA_CRYPTO)"
597597
if_build_succeeded env OPENSSL_CMD="$OPENSSL_LEGACY" tests/compat.sh -m 'ssl3'
598598

599-
msg "test: compat.sh RC4, DES & NULL (USE_PSA)"
599+
msg "test: compat.sh RC4, DES & NULL (MBEDTLS_USE_PSA_CRYPTO)"
600600
if_build_succeeded env OPENSSL_CMD="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_LEGACY_CLI" GNUTLS_SERV="$GNUTLS_LEGACY_SERV" tests/compat.sh -e '3DES\|DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR'
601601

602-
msg "test: compat.sh ARIA + ChachaPoly (USE_PSA)"
602+
msg "test: compat.sh ARIA + ChachaPoly (MBEDTLS_USE_PSA_CRYPTO)"
603603
if_build_succeeded env OPENSSL_CMD="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA'
604604

605605
msg "build: make, full config + DEPRECATED_WARNING, gcc -O" # ~ 30s

0 commit comments

Comments
 (0)