lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00
Code Activity

Merge branch 'mbedtls-1.3' into development

Browse Source 
* mbedtls-1.3:
  Fix compile errors with NO_STD_FUNCTIONS
  Expand config.pl's notion of "full"
  Ack external bugfix in Changelog
  FIx misplaced Changelog entry (oops)
  Fix compile bug: incompatible declaration of polarssl_exit in platform.c
  Fix contributor's name in Changelog
This commit is contained in:
Manuel Pégourié-Gonnard
2015-06-03 10:33:55 +01:00
parent 718593681e dccb80b7e5
commit 7ee5ddd798
5 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/config.pl
View File

@ -35,6 +35,11 @@ MBEDTLS_PKCS11_C
_ALT\s*$
);
# Things that should be enabled in "full" even if they match @excluded
my @non_excluded = qw(
PLATFORM_[A-Z0-9]+_ALT
);
my $config_file = "include/mbedtls/config.h";
# get -f option
@ -75,6 +80,7 @@ my @config_lines = <$config_read>;
close $config_read;
my $exclude_re = join '|', @excluded;
my $no_exclude_re = join '|', @non_excluded;
open my $config_write, '>', $config_file or die "write $config_file: $!\n";
@ -85,10 +91,12 @@ for my $line (@config_lines) {
$done = 1;
}
if (!$done && $line =~ m!^//\s?#define! && $line !~ /$exclude_re/) {
if (!$done && $line =~ m!^//\s?#define! &&
( $line !~ /$exclude_re/ || $line =~ /$no_exclude_re/ ) ) {
$line =~ s!^//\s?!!;
}
if (!$done && $line =~ m!^\s?#define! && $line =~ /$exclude_re/) {
if (!$done && $line =~ m!^\s?#define! &&
! ( $line !~ /$exclude_re/ || $line =~ /$no_exclude_re/ ) ) {
$line =~ s!^!//!;
}
} elsif ($action eq "unset") {