diff --git a/.travis.yml b/.travis.yml index dbc23476a..fa01e5a24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,8 @@ script: - tests/scripts/test-ref-configs.pl - tests/scripts/curves.pl - tests/scripts/key-exchanges.pl +after_failure: +- tests/scripts/travis-log-failure.sh env: global: secure: "barHldniAfXyoWOD/vcO+E6/Xm4fmcaUoC9BeKW+LwsHqlDMLvugaJnmLXkSpkbYhVL61Hzf3bo0KPJn88AFc5Rkf8oYHPjH4adMnVXkf3B9ghHCgznqHsAH3choo6tnPxaFgOwOYmLGb382nQxfE5lUdvnM/W/psQjWt66A1+k=" diff --git a/scripts/config.pl b/scripts/config.pl index d4c32fd1b..a6dcfe7d7 100755 --- a/scripts/config.pl +++ b/scripts/config.pl @@ -1,22 +1,73 @@ #!/usr/bin/perl - -# Tune the configuration file +# +# This file is part of mbed TLS (https://tls.mbed.org) +# +# Copyright (c) 2014-2016, ARM Limited, All Rights Reserved +# +# Purpose +# +# Comments and uncomments #define lines in the given header file and optionally +# sets their value. This is to provide scripting control of what preprocessor +# symbols, and therefore what build time configuration flags are set in the +# 'config.h' file. +# +# Usage: config.pl [-f | --file ] [-o | --force] +# [set | unset | full | realfull] +# +# Full usage description provided below. +# +# Things that shouldn't be enabled with "full". +# +# MBEDTLS_DEPRECATED_REMOVED +# MBEDTLS_HAVE_SSE2 +# MBEDTLS_PLATFORM_NO_STD_FUNCTIONS +# MBEDTLS_ECP_DP_M221_ENABLED +# MBEDTLS_ECP_DP_M383_ENABLED +# MBEDTLS_ECP_DP_M511_ENABLED +# MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES +# MBEDTLS_NO_PLATFORM_ENTROPY +# MBEDTLS_REMOVE_ARC4_CIPHERSUITES +# MBEDTLS_SSL_HW_RECORD_ACCEL +# MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3 +# MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION +# - this could be enabled if the respective tests were adapted +# MBEDTLS_ZLIB_SUPPORT +# MBEDTLS_PKCS11_C +# and any symbol beginning _ALT +# use warnings; use strict; +my $config_file = "include/mbedtls/config.h"; my $usage = <] unset -$0 [-f ] set [] -EOU -# for our eyes only: -# $0 [-f ] full|realfull +$0 [-f | --file ] [-o | --force] + [set | unset | full | realfull] + +Commands + set [ to + the configuration file, and optionally making it + of . + If the symbol isn't present in the file an error + is returned. + unset - Comments out any #define present in the + configuration file. + full - Uncomments all #define's in the configuration file + excluding some reserved symbols, until the + 'Module configuration options' section + realfull - Uncomments all #define's with no exclusions + +Options + -f | --file - The file or file path for the configuration file + to edit. When omitted, the following default is + used: + $config_file + -o | --force - If the symbol isn't present in the configuration + file when setting it's value, a #define is + appended to the end of the file. + +EOU -# Things that shouldn't be enabled with "full". -# Notes: -# - MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3 and -# MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION could be enabled if the -# respective tests were adapted my @excluded = qw( MBEDTLS_DEPRECATED_REMOVED MBEDTLS_HAVE_SSE2 @@ -40,40 +91,65 @@ my @non_excluded = qw( PLATFORM_[A-Z0-9]+_ALT ); -my $config_file = "include/mbedtls/config.h"; +# Process the command line arguments -# get -f option -if (@ARGV >= 2 && $ARGV[0] eq "-f") { - shift; # -f - $config_file = shift; +my $force_option = 0; - -f $config_file or die "No such file: $config_file\n"; -} else { - if (! -f $config_file) { - chdir '..' or die; - -f $config_file - or die "Without -f, must be run from root or scripts\n" +my ($arg, $name, $value, $action); + +while ($arg = shift) { + + # Check if the argument is an option + if ($arg eq "-f" || $arg eq "--file") { + $config_file = shift; + + -f $config_file or die "No such file: $config_file\n"; + + } + elsif ($arg eq "-o" || $arg eq "--force") { + $force_option = 1; + + } + else + { + # ...else assume it's a command + $action = $arg; + + if ($action eq "full" || $action eq "realfull") { + # No additional parameters + die $usage if @ARGV; + + } + elsif ($action eq "unset") { + die $usage unless @ARGV; + $name = shift; + + } + elsif ($action eq "set") { + die $usage unless @ARGV; + $name = shift; + $value = shift if @ARGV; + + } + else { + die "Command '$action' not recognised.\n\n".$usage; + } } } -# get action -die $usage unless @ARGV; -my $action = shift; +# Check the config file is present +if (! -f $config_file) { -my ($name, $value); -if ($action eq "full" || $action eq "realfull") { - # nothing to do -} elsif ($action eq "unset") { - die $usage unless @ARGV; - $name = shift; -} elsif ($action eq "set") { - die $usage unless @ARGV; - $name = shift; - $value = shift if @ARGV; -} else { - die $usage; + chdir '..' or die; + + # Confirm this is the project root directory and try again + if ( !(-d 'scripts' && -d 'include' && -d 'library' && -f $config_file) ) { + die "If no file specified, must be run from the project root or scripts directory.\n"; + } } -die $usage if @ARGV; + + +# Now read the file and process the contents open my $config_read, '<', $config_file or die "read $config_file: $!\n"; my @config_lines = <$config_read>; @@ -122,9 +198,27 @@ for my $line (@config_lines) { print $config_write $line; } +# Did the set command work? +if ($action eq "set"&& $force_option && !$done) { + + # If the force option was set, append the symbol to the end of the file + my $line = "#define $name"; + $line .= " $value" if defined $value && $value ne ""; + $line .= "\n"; + $done = 1; + + print $config_write $line; +} + close $config_write; -die "configuration section not found" if ($action eq "full" && !$done); -die "$name not found" if ($action ne "full" && !$done); +if ($action eq "full" && !$done) { + die "Configuration section was not found in $config_file\n"; + +} + +if ($action ne "full" && $action ne "unset" && !$done) { + die "A #define for the symbol $name was not found in $config_file\n"; +} __END__ diff --git a/scripts/footprint.sh b/scripts/footprint.sh index 87d62dfc4..026e7a841 100755 --- a/scripts/footprint.sh +++ b/scripts/footprint.sh @@ -1,5 +1,23 @@ #!/bin/sh - +# +# This file is part of mbed TLS (https://tls.mbed.org) +# +# Copyright (c) 2015-2016, ARM Limited, All Rights Reserved +# +# Purpose +# +# This script determines ROM size (or code size) for the standard mbed TLS +# configurations, when built for a Cortex M3/M4 target. +# +# Configurations included: +# default include/mbedtls/config.h +# yotta yotta/module/mbedtls/config.h +# thread configs/config-thread.h +# suite-b configs/config-suite-b.h +# psk configs/config-ccm-psk-tls1_2.h +# +# Usage: footprint.sh +# set -eu CONFIG_H='include/mbedtls/config.h' @@ -48,6 +66,7 @@ doit() scripts/config.pl unset MBEDTLS_NET_C || true scripts/config.pl unset MBEDTLS_TIMING_C || true scripts/config.pl unset MBEDTLS_FS_IO || true + scripts/config.pl --force set MBEDTLS_NO_PLATFORM_ENTROPY || true } >/dev/null 2>&1 CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld \ diff --git a/tests/scripts/travis-log-failure.sh b/tests/scripts/travis-log-failure.sh new file mode 100755 index 000000000..9866ca7da --- /dev/null +++ b/tests/scripts/travis-log-failure.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# travis-log-failure.sh +# +# This file is part of mbed TLS (https://tls.mbed.org) +# +# Copyright (c) 2016, ARM Limited, All Rights Reserved +# +# Purpose +# +# List the server and client logs on failed ssl-opt.sh and compat.sh tests. +# This script is used to make the logs show up in the Travis test results. +# +# Some of the logs can be very long: this means usually a couple of megabytes +# but it can be much more. For example, the client log of test 273 in ssl-opt.sh +# is more than 630 Megabytes long. + +if [ -d include/mbedtls ]; then :; else + echo "$0: must be run from root" >&2 + exit 1 +fi + +FILES="o-srv-*.log o-cli-*.log c-srv-*.log c-cli-*.log o-pxy-*.log" +MAX_LOG_SIZE=1048576 + +for PATTERN in $FILES; do + for LOG in $( ls tests/$PATTERN 2>/dev/null ); do + echo + echo "****** BEGIN file: $LOG ******" + echo + tail -c $MAX_LOG_SIZE $LOG + echo "****** END file: $LOG ******" + echo + rm $LOG + done +done