Rename include directory to mbedtls
diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index 64af2dc..a487982 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh
@@ -60,10 +60,10 @@ mv tmp library/Makefile fi -[ $VERBOSE ] && echo "Bumping VERSION in include/polarssl/version.h" +[ $VERBOSE ] && echo "Bumping VERSION in include/mbedtls/version.h" read MAJOR MINOR PATCH <<<$(IFS="."; echo $VERSION) VERSION_NR="$( printf "0x%02X%02X%02X00" $MAJOR $MINOR $PATCH )" -cat include/polarssl/version.h | \ +cat include/mbedtls/version.h | \ sed -e "s/_VERSION_MAJOR .\+/_VERSION_MAJOR $MAJOR/" | \ sed -e "s/_VERSION_MINOR .\+/_VERSION_MINOR $MINOR/" | \ sed -e "s/_VERSION_PATCH .\+/_VERSION_PATCH $PATCH/" | \ @@ -71,7 +71,7 @@ sed -e "s/_VERSION_STRING .\+/_VERSION_STRING \"$VERSION\"/" | \ sed -e "s/_VERSION_STRING_FULL .\+/_VERSION_STRING_FULL \"mbed TLS $VERSION\"/" \ > tmp -mv tmp include/polarssl/version.h +mv tmp include/mbedtls/version.h [ $VERBOSE ] && echo "Bumping version in tests/suites/test_suite_version.data" sed -e "s/version:\".\+/version:\"$VERSION\"/g" < tests/suites/test_suite_version.data > tmp
diff --git a/scripts/check_doxy_blocks.pl b/scripts/check_doxy_blocks.pl index 2601d88..e62d4da 100755 --- a/scripts/check_doxy_blocks.pl +++ b/scripts/check_doxy_blocks.pl
@@ -13,7 +13,7 @@ use File::Basename; # header files in the following directories will be checked -my @directories = qw(include/polarssl library doxygen/input); +my @directories = qw(include/mbedtls library doxygen/input); # very naive pattern to find directives: # everything with a backslach except '\0' and backslash at EOL
diff --git a/scripts/config.pl b/scripts/config.pl index c105a23..ace5459 100755 --- a/scripts/config.pl +++ b/scripts/config.pl
@@ -36,7 +36,7 @@ _ALT\s*$ ); -my $config_file = "include/polarssl/config.h"; +my $config_file = "include/mbedtls/config.h"; # get -f option if (@ARGV >= 2 && $ARGV[0] eq "-f") {
diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt index 7449d85..98799a1 100644 --- a/scripts/data_files/error.fmt +++ b/scripts/data_files/error.fmt
@@ -21,18 +21,18 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ERROR_C) || defined(POLARSSL_ERROR_STRERROR_DUMMY) -#include "polarssl/error.h" +#include "mbedtls/error.h" #include <string.h> #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_snprintf snprintf #endif
diff --git a/scripts/data_files/version_features.fmt b/scripts/data_files/version_features.fmt index 500e026..59b70a1 100644 --- a/scripts/data_files/version_features.fmt +++ b/scripts/data_files/version_features.fmt
@@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_VERSION_C) -#include "polarssl/version.h" +#include "mbedtls/version.h" #include <string.h>
diff --git a/scripts/ecc-heap.sh b/scripts/ecc-heap.sh index 4f88a44..dcec84b 100755 --- a/scripts/ecc-heap.sh +++ b/scripts/ecc-heap.sh
@@ -9,7 +9,7 @@ set -eu -CONFIG_H='include/polarssl/config.h' +CONFIG_H='include/mbedtls/config.h' if [ -r $CONFIG_H ]; then :; else echo "$CONFIG_H not found" >&2
diff --git a/scripts/generate_errors.pl b/scripts/generate_errors.pl index c0d9685..02b2aaf 100755 --- a/scripts/generate_errors.pl +++ b/scripts/generate_errors.pl
@@ -16,7 +16,7 @@ -d $include_dir or die "No such directory: $include_dir\n"; -d $data_dir or die "No such directory: $data_dir\n"; } else { - $include_dir = 'include/polarssl'; + $include_dir = 'include/mbedtls'; $data_dir = 'scripts/data_files'; $error_file = 'library/error.c'; @@ -143,7 +143,7 @@ ($include_name ne ""); } ${$code_check} .= "\n"; - $headers .= "\n#include \"polarssl/${include_name}.h\"\n". + $headers .= "\n#include \"mbedtls/${include_name}.h\"\n". "#endif\n\n" if ($include_name ne ""); ${$old_define} = $define_name; }
diff --git a/scripts/generate_features.pl b/scripts/generate_features.pl index ee94e35..2aa695c 100755 --- a/scripts/generate_features.pl +++ b/scripts/generate_features.pl
@@ -12,7 +12,7 @@ -d $include_dir or die "No such directory: $include_dir\n"; -d $data_dir or die "No such directory: $data_dir\n"; } else { - $include_dir = 'include/polarssl'; + $include_dir = 'include/mbedtls'; $data_dir = 'scripts/data_files'; $feature_file = 'library/version_features.c';
diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index d6f7104..fd69237 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl
@@ -28,7 +28,7 @@ my $vsx_sln_file = "$vsx_dir/mbedTLS.sln"; my $programs_dir = 'programs'; -my $header_dir = 'include/polarssl'; +my $header_dir = 'include/mbedtls'; my $source_dir = 'library'; # Need windows line endings!
diff --git a/scripts/memory.sh b/scripts/memory.sh index 710ee96..2e56215 100755 --- a/scripts/memory.sh +++ b/scripts/memory.sh
@@ -8,7 +8,7 @@ set -eu -CONFIG_H='include/polarssl/config.h' +CONFIG_H='include/mbedtls/config.h' CLIENT='mini_client'