From 316c4fa3ce1e3bb7d615d268e26ea4ccc44b6d96 Mon Sep 17 00:00:00 2001 From: Przemyslaw Stekiel Date: Fri, 15 Oct 2021 08:04:53 +0200 Subject: [PATCH] Address review comments Signed-off-by: Przemyslaw Stekiel --- ChangeLog.d/issue5065.txt | 5 ++--- tests/scripts/all.sh | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog.d/issue5065.txt b/ChangeLog.d/issue5065.txt index f468c63ff2..943ee47d91 100644 --- a/ChangeLog.d/issue5065.txt +++ b/ChangeLog.d/issue5065.txt @@ -1,4 +1,3 @@ Bugfix - * Use switch statement instead if-else in - psa_aead_check_nonce_length() - and psa_aead_set_lengths(). Fixes #5065. + * Fix compile-time or run-time errors in PSA + AEAD functions when ChachaPoly is disabled. Fixes #5065. diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index ed5faf5db9..28387f443f 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1597,15 +1597,15 @@ component_test_psa_crypto_config_no_driver() { } component_test_psa_crypto_config_chachapoly_disabled() { - # full - MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305 - msg "build: full - MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305" + # full minus MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305 + msg "build: full minus MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305" scripts/config.py full scripts/config.py unset MBEDTLS_CHACHAPOLY_C scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_GCM scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_CHACHA20_POLY1305 make CC=gcc CFLAGS="$ASAN_CFLAGS -O2" LDFLAGS="$ASAN_CFLAGS" - msg "test: full - MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305" + msg "test: full minus MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305" make test }