yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-23 04:05:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include crypto config when generating query config

Browse Source 
Adjusted generate_query_config.pl to have a configuration option 
of including the crypto config. Turned on by default.
This commit is contained in:
Andrzej Kurek 2019-04-05 03:33:18 -04:00
parent b0fc484188
commit ef907604f8
2 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/ssl/query_config.c
View File

@ -2586,6 +2586,14 @@ int query_config( const char *config )
} }
#endif /* MBEDTLS_PLATFORM_GMTIME_R_ALT */ #endif /* MBEDTLS_PLATFORM_GMTIME_R_ALT */
#if defined(MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER)
if( strcmp( "MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER );
return( 0 );
}
#endif /* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER */
/* If the symbol is not found, return an error */ /* If the symbol is not found, return an error */
return( 1 ); return( 1 );
} }

55
scripts/generate_query_config.pl
View File

@ -18,7 +18,9 @@
use strict; use strict;
my $include_crypto = 1;
my $config_file = "./include/mbedtls/config.h"; my $config_file = "./include/mbedtls/config.h";
my $crypto_config_file = "./crypto/include/mbedtls/config.h";
my $query_config_format_file = "./scripts/data_files/query_config.fmt"; my $query_config_format_file = "./scripts/data_files/query_config.fmt";
my $query_config_file = "./programs/ssl/query_config.c"; my $query_config_file = "./programs/ssl/query_config.c";
@ -33,31 +35,52 @@ MBEDTLS_PARAM_FAILED
); );
my $excluded_re = join '|', @excluded; my $excluded_re = join '|', @excluded;
open(CONFIG_FILE, "$config_file") or die "Opening config file '$config_file': $!";
# This variable will contain the string to replace in the CHECK_CONFIG of the # This variable will contain the string to replace in the CHECK_CONFIG of the
# format file # format file
my $config_check = ""; my $config_check = "";
my %defines_seen;
my @files = ($config_file);
while (my $line = <CONFIG_FILE>) {
if ($line =~ /^(\/\/)?\s*#\s*define\s+(MBEDTLS_\w+).*/) {
my $name = $2;
# Skip over the macro that prevents multiple inclusion if( @ARGV ) {
next if "MBEDTLS_CONFIG_H" eq $name; die "Invalid number of arguments" if scalar @ARGV != 1;
($include_crypto) = @ARGV;
}
# Skip over the macro if it is in the ecluded list if( $include_crypto ) {
next if $name =~ /$excluded_re/; push(@files, $crypto_config_file);
}
$config_check .= "#if defined($name)\n"; foreach my $file (@files) {
$config_check .= " if( strcmp( \"$name\", config ) == 0 )\n"; open(FILE, "$file") or die "Opening config file failed: '$file': $!";
$config_check .= " {\n"; while (my $line = <FILE>) {
$config_check .= " MACRO_EXPANSION_TO_STR( $name );\n"; if ($line =~ /^(\/\/)?\s*#\s*define\s+(MBEDTLS_\w+).*/) {
$config_check .= " return( 0 );\n"; my $name = $2;
$config_check .= " }\n";
$config_check .= "#endif /* $name */\n"; # Skip over the macro that prevents multiple inclusion
$config_check .= "\n"; next if "MBEDTLS_CONFIG_H" eq $name;
# Skip over the macro if it is in the excluded list
next if $name =~ /$excluded_re/;
# Skip if this define is already added
if( $defines_seen{$name}++ ) {
print "Skipping $name, already added. \n";
next;
}
$config_check .= "#if defined($name)\n";
$config_check .= " if( strcmp( \"$name\", config ) == 0 )\n";
$config_check .= " {\n";
$config_check .= " MACRO_EXPANSION_TO_STR( $name );\n";
$config_check .= " return( 0 );\n";
$config_check .= " }\n";
$config_check .= "#endif /* $name */\n";
$config_check .= "\n";
}
} }
close(FILE);
} }
# Read the full format file into a string # Read the full format file into a string