Merge branch 'mbedtls-1.3' into development
* 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
diff --git a/scripts/config.pl b/scripts/config.pl
index 7d6c4ea..2685b4e 100755
--- a/scripts/config.pl
+++ b/scripts/config.pl
@@ -35,6 +35,11 @@
_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 @@
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 @@
$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") {
