yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add crypto includes when generating features in generate_features.pl

Browse source 
Adjusted generate_features to have a configuration option of including crypto
config. Turned on by default.
This commit is contained in:
Andrzej Kurek 2019-04-05 04:07:40 -04:00
parent ef907604f8
commit 79369cd8d9
2 changed files with 51 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/version_features.c
View file

@ -780,6 +780,9 @@ static const char *features[] = {
#if defined(MBEDTLS_XTEA_C)
"MBEDTLS_XTEA_C",
#endif /* MBEDTLS_XTEA_C */
#if defined(MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER)
"MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER",
#endif /* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER */
#endif /* MBEDTLS_VERSION_FEATURES */
NULL
};

74
scripts/generate_features.pl
View file

@ -3,18 +3,24 @@
use strict;
my ($include_dir, $data_dir, $feature_file);
my ($include_dir, $data_dir, $feature_file, $include_crypto);
my $crypto_include_dir = "crypto/include/mbedtls";
if( @ARGV ) {
die "Invalid number of arguments" if scalar @ARGV != 3;
($include_dir, $data_dir, $feature_file) = @ARGV;
die "Invalid number of arguments" if scalar @ARGV != 4;
($include_dir, $data_dir, $feature_file, $include_crypto) = @ARGV;
-d $include_dir or die "No such directory: $include_dir\n";
-d $data_dir or die "No such directory: $data_dir\n";
if( $include_crypto ) {
-d $crypto_include_dir or die "Crypto submodule not present\n";
}
} else {
$include_dir = 'include/mbedtls';
$data_dir = 'scripts/data_files';
$feature_file = 'library/version_features.c';
$include_crypto = 1;
-d $crypto_include_dir or die "Crypto submodule not present\n";
unless( -d $include_dir && -d $data_dir ) {
chdir '..' or die;
@ -36,37 +42,53 @@ my $feature_format = <FORMAT_FILE>;
close(FORMAT_FILE);
$/ = $line_separator;
my %defines_seen;
my @files = ("$include_dir/config.h");
open(CONFIG_H, "$include_dir/config.h") || die("Failure when opening config.h: $!");
if( $include_crypto ) {
push(@files, "$crypto_include_dir/config.h");
}
my $feature_defines = "";
my $in_section = 0;
while (my $line = <CONFIG_H>)
{
next if ($in_section && $line !~ /#define/ && $line !~ /SECTION/);
next if (!$in_section && $line !~ /SECTION/);
foreach my $file (@files) {
open(FILE, "$file") or die "Opening config file failed: '$file': $!";
if ($in_section) {
if ($line =~ /SECTION/) {
$in_section = 0;
next;
my $in_section = 0;
while (my $line = <FILE>)
{
next if ($in_section && $line !~ /#define/ && $line !~ /SECTION/);
next if (!$in_section && $line !~ /SECTION/);
if ($in_section) {
if ($line =~ /SECTION/) {
$in_section = 0;
next;
}
my ($define) = $line =~ /#define (\w+)/;
# Skip if this define is already added
if( $defines_seen{$define}++ ) {
print "Skipping $define, already added. \n";
next;
}
$feature_defines .= "#if defined(${define})\n";
$feature_defines .= " \"${define}\",\n";
$feature_defines .= "#endif /* ${define} */\n";
}
my ($define) = $line =~ /#define (\w+)/;
$feature_defines .= "#if defined(${define})\n";
$feature_defines .= " \"${define}\",\n";
$feature_defines .= "#endif /* ${define} */\n";
}
if (!$in_section) {
my ($section_name) = $line =~ /SECTION: ([\w ]+)/;
my $found_section = grep $_ eq $section_name, @sections;
$in_section = 1 if ($found_section);
}
};
if (!$in_section) {
my ($section_name) = $line =~ /SECTION: ([\w ]+)/;
my $found_section = grep $_ eq $section_name, @sections;
$in_section = 1 if ($found_section);
}
};
close(FILE);
}
$feature_format =~ s/FEATURE_DEFINES\n/$feature_defines/g;
open(ERROR_FILE, ">$feature_file") or die "Opening destination file '$feature_file': $!";