cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-01 01:16:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enhance existing skip mechanism instead of duplicating it

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2024-08-01 16:40:49 +02:00
parent 2e9a7eef2c
commit 4c3ff16431
1 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/psa-client-server/psasim/src/psa_sim_generate.pl
View File

@ -22,14 +22,25 @@ my %functions = get_functions();
my @functions = sort keys %functions; my @functions = sort keys %functions;
# We don't want these functions (e.g. because they are not implemented, etc) # We don't want these functions (e.g. because they are not implemented, etc)
my @skip_functions = qw( my @skip_functions = (
psa_key_derivation_verify_bytes 'mbedtls_psa_crypto_free', # redefined rather than wrapped
psa_key_derivation_verify_key 'mbedtls_psa_external_get_random', # not in the default config, uses unsupported type
'mbedtls_psa_get_stats', # uses unsupported type
'mbedtls_psa_inject_entropy', # not in the default config, generally not for client use anyway
'mbedtls_psa_platform_get_builtin_key', # not in the default config, uses unsupported type
'mbedtls_psa_register_se_key', # not in the default config, generally not for client use anyway
'psa_get_key_slot_number', # not in the default config, uses unsupported type
'psa_key_derivation_verify_bytes', # not implemented yet
'psa_key_derivation_verify_key', # not implemented yet
); );
# Remove @skip_functions from @functions my $skip_functions_re = '\A(' . join('|', @skip_functions). ')\Z';
my %skip_functions = map { $_ => 1 } @skip_functions; @functions = grep(!/$skip_functions_re
@functions = grep(!exists($skip_functions{$_}), @functions); |_pake_ # Skip everything PAKE
|_init\Z # constructors
/x, @functions);
# Restore psa_crypto_init() and put it first.
unshift @functions, 'psa_crypto_init';
# get_functions(), called above, returns a data structure for each function # get_functions(), called above, returns a data structure for each function
# that we need to create client and server stubs for. In this example Perl script, # that we need to create client and server stubs for. In this example Perl script,
@ -84,9 +95,6 @@ my %skip_functions = map { $_ => 1 } @skip_functions;
# It's possible that a production version might not need both type and ctypename; # It's possible that a production version might not need both type and ctypename;
# that was done for convenience and future-proofing during development. # that was done for convenience and future-proofing during development.
# We'll do psa_crypto_init() first
put_crypto_init_first(\@functions);
write_function_codes("$output_dir/psa_functions_codes.h"); write_function_codes("$output_dir/psa_functions_codes.h");
write_client_calls("$output_dir/psa_sim_crypto_client.c"); write_client_calls("$output_dir/psa_sim_crypto_client.c");
@ -1120,31 +1128,6 @@ sub get_functions
if ($line =~ /(\w+)\s+\b(\w+)\s*\(\s*(.*\S)\s*\)\s*[;{]/s) { if ($line =~ /(\w+)\s+\b(\w+)\s*\(\s*(.*\S)\s*\)\s*[;{]/s) {
my ($ret_type, $func, $args) = ($1, $2, $3); my ($ret_type, $func, $args) = ($1, $2, $3);
if ($func =~ /_init$/ and $func ne 'psa_crypto_init' and
$args eq 'void') {
# IGNORE constructors
next;
}
if ($func =~ /_pake_/ or
$func eq 'mbedtls_psa_external_get_random' or
$func eq 'mbedtls_psa_get_stats' or
$func eq 'mbedtls_psa_platform_get_builtin_key' or
$func eq 'psa_get_key_slot_number') {
# IGNORE functions using unsupported types
next;
}
if ($func eq 'mbedtls_psa_register_se_key' or
$func eq 'mbedtls_psa_inject_entropy') {
# IGNORE functions that are not supported, not used in
# the default build, and not supposed to be invoked
# by (unprivileged) clients anyway.
next;
}
if ($func eq 'mbedtls_psa_crypto_free') {
# IGNORE function that we redefine instead of wrapping
next;
}
my $copy = $line; my $copy = $line;
$copy =~ s/{$//; $copy =~ s/{$//;
my $f = { my $f = {