Skip to content

Prerequisite for adding support for Blake2 in TF-PSA-Crypto #10921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
valeriosetti wants to merge 3 commits into
base: development
Choose a base branch
from
+30 −10
Open

Prerequisite for adding support for Blake2 in TF-PSA-Crypto #10921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
253627b
scripts: libtestdriver1_rewrite.pl: fix tf-psa-crypto private headers…
valeriosetti Aug 12, 2026
147bc56
tests: configuration-crypto: accelerate Blake2 on tests accelerating EC
valeriosetti Aug 13, 2026
9fed715
framework: update reference
valeriosetti Aug 12, 2026
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
Open in desktop
Submodule framework updated 7 files
+11 −0 scripts/generate_psa_tests.py
+12 −8 scripts/mbedtls_framework/code_wrapper/psa_wrapper.py
+2 −0 scripts/mbedtls_framework/crypto_data_tests.py
+2 −0 scripts/mbedtls_framework/crypto_knowledge.py
+93 −0 scripts/mbedtls_framework/ssl_log_parser.py
+153 −0 scripts/validate_ssl_logs.py
+87 −26 util/mbedtls_maintainer/mldsa_test_generator.py
27 changes: 18 additions & 9 deletions tests/scripts/components-configuration-crypto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,8 @@ component_test_psa_crypto_config_accel_ecdsa () {

# These hashes are needed for some ECDSA signature tests.
loc_extra_list="ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"

helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"

Expand Down Expand Up @@ -745,7 +746,8 @@ component_test_psa_crypto_config_accel_ecc_some_key_types () {

# These hashes are needed for some ECDSA signature tests.
loc_extra_list="ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"

helper_libtestdriver1_make_main "$loc_accel_list"
Expand Down Expand Up @@ -833,7 +835,8 @@ common_test_psa_crypto_config_accel_ecc_some_curves () {

# These hashes are needed for some ECDSA signature tests.
loc_extra_list="ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"

# For grep to work below we need less inlining in ecp.c
Expand Down Expand Up @@ -908,7 +911,8 @@ component_test_psa_crypto_config_accel_ecc_ecp_light_only () {

# These hashes are needed for some ECDSA signature tests.
loc_extra_list="ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"

helper_libtestdriver1_make_main "$loc_accel_list"
Expand Down Expand Up @@ -964,7 +968,8 @@ component_test_psa_crypto_config_accel_ecc_no_ecp_at_all () {
# Things we wanted supported in libtestdriver1, but not accelerated in the main library:
# SHA-1 and all SHA-2/3 variants, as they are used by ECDSA deterministic.
loc_extra_list="ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"

helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"

Expand Down Expand Up @@ -1060,7 +1065,8 @@ common_test_psa_crypto_config_accel_ecc_ffdh_no_bignum () {
# Things we wanted supported in libtestdriver1, but not accelerated in the main library:
# SHA-1 and all SHA-2/3 variants, as they are used by ECDSA deterministic.
loc_extra_list="ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"

helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"

Expand Down Expand Up @@ -1247,7 +1253,8 @@ component_test_psa_crypto_config_accel_rsa_crypto () {

# These hashes are needed for unit tests.
loc_extra_list="ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 ALG_MD5"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 ALG_MD5 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"

helper_libtestdriver1_make_main "$loc_accel_list"
Expand Down Expand Up @@ -1310,7 +1317,8 @@ component_test_psa_crypto_config_accel_hash () {

loc_accel_list="ALG_MD5 ALG_RIPEMD160 ALG_SHA_1 \
ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"

# Configure
# ---------
Expand Down Expand Up @@ -1373,7 +1381,8 @@ component_test_psa_crypto_config_accel_hmac () {
loc_accel_list="ALG_HMAC KEY_TYPE_HMAC \
ALG_MD5 ALG_RIPEMD160 ALG_SHA_1 \
ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512 \
ALG_BLAKE2S_HASH256 ALG_BLAKE2B_HASH512"

# Configure
# ---------
Expand Down
11 changes: 11 additions & 0 deletions tests/scripts/libtestdriver1_rewrite.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

my $private_files_regex = join('|', map { quotemeta($_) } @private_files);

my @private_builtin_tf_psa_crypto_files = map { basename($_) } glob("../tf-psa-crypto/drivers/builtin/include/tf-psa-crypto/private/*.h");

my $private_builtin_tf_psa_crypto_files_regex = join('|', map { quotemeta($_) } @private_builtin_tf_psa_crypto_files);

while (<>) {
s!^(\s*#\s*include\s*[\"<])mbedtls/build_info.h!${1}libtestdriver1/include/mbedtls/build_info.h!;
s!^(\s*#\s*include\s*[\"<])mbedtls/mbedtls_config.h!${1}libtestdriver1/include/mbedtls/mbedtls_config.h!;
Expand All @@ -37,6 +41,13 @@
}
s!^(\s*#\s*include\s*[\"<])mbedtls/!${1}libtestdriver1/tf-psa-crypto/drivers/builtin/include/mbedtls/!;
s!^(\s*#\s*include\s*[\"<])psa/!${1}libtestdriver1/tf-psa-crypto/include/psa/!;
# Files in tf-psa-crypto/include/tf-psa-crypto/private and
# drivers/builtin/include/tf-psa-crypto/private are both included via
# #include tf-psa-crypto/private/<file>.h, so make sure builtin driver
# headers (e.g. blake2.h) are not expanded to the public include path.
if ( $private_builtin_tf_psa_crypto_files_regex ) {
s!^(\s*#\s*include\s*[\"<])tf-psa-crypto/private/($private_builtin_tf_psa_crypto_files_regex)!${1}libtestdriver1/tf-psa-crypto/drivers/builtin/include/tf-psa-crypto/private/${2}!;
}
s!^(\s*#\s*include\s*[\"<])tf-psa-crypto/!${1}libtestdriver1/tf-psa-crypto/include/tf-psa-crypto/!;
if (/^\s*#\s*include/) {
print;
Expand Down