2018-04-04 23:44:29 +02:00
|
|
|
#!/usr/bin/env perl
|
2016-04-03 15:16:08 +02:00
|
|
|
#
|
|
|
|
# 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
|
2016-06-21 11:09:25 +02:00
|
|
|
# sets their value or can get the 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.
|
2016-04-03 15:16:08 +02:00
|
|
|
#
|
|
|
|
# Usage: config.pl [-f <file> | --file <file>] [-o | --force]
|
2016-06-21 11:09:25 +02:00
|
|
|
# [set <symbol> <value> | unset <symbol> | get <symbol> |
|
|
|
|
# full | realfull]
|
2016-04-03 15:16:08 +02:00
|
|
|
#
|
|
|
|
# Full usage description provided below.
|
|
|
|
#
|
2017-09-28 12:49:46 +02:00
|
|
|
# The following options are disabled instead of enabled with "full".
|
2016-04-03 15:16:08 +02:00
|
|
|
#
|
2016-06-11 03:31:21 +02:00
|
|
|
# MBEDTLS_TEST_NULL_ENTROPY
|
2016-04-03 15:16:08 +02:00
|
|
|
# MBEDTLS_DEPRECATED_REMOVED
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
# MBEDTLS_DEPRECATED_WARNING
|
2016-04-03 15:16:08 +02:00
|
|
|
# MBEDTLS_HAVE_SSE2
|
|
|
|
# MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
|
|
|
|
# MBEDTLS_ECP_DP_M221_ENABLED
|
|
|
|
# MBEDTLS_ECP_DP_M383_ENABLED
|
|
|
|
# MBEDTLS_ECP_DP_M511_ENABLED
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
# MBEDTLS_MEMORY_DEBUG
|
2019-02-26 14:51:00 +01:00
|
|
|
# MBEDTLS_MEMORY_BACKTRACE
|
|
|
|
# MBEDTLS_MEMORY_BUFFER_ALLOC_C
|
2016-04-03 15:16:08 +02:00
|
|
|
# MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
|
|
|
|
# MBEDTLS_NO_PLATFORM_ENTROPY
|
|
|
|
# MBEDTLS_REMOVE_ARC4_CIPHERSUITES
|
2018-10-30 19:21:41 +01:00
|
|
|
# MBEDTLS_REMOVE_3DES_CIPHERSUITES
|
2019-07-17 16:58:56 +02:00
|
|
|
# MBEDTLS_SHA256_NO_SHA224
|
2016-04-03 15:16:08 +02:00
|
|
|
# MBEDTLS_SSL_HW_RECORD_ACCEL
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
# MBEDTLS_SSL_PROTO_NO_TLS
|
2019-07-01 10:07:28 +02:00
|
|
|
# MBEDTLS_SSL_NO_SESSION_CACHE
|
|
|
|
# MBEDTLS_SSL_NO_SESSION_RESUMPTION
|
2017-09-28 12:49:46 +02:00
|
|
|
# MBEDTLS_RSA_NO_CRT
|
2019-08-27 16:45:44 +02:00
|
|
|
# MBEDTLS_USE_TINYCRYPT
|
2016-04-03 15:16:08 +02:00
|
|
|
# MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
|
|
|
|
# MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
|
|
|
|
# - this could be enabled if the respective tests were adapted
|
2019-06-12 14:59:14 +02:00
|
|
|
# MBEDTLS_X509_REMOVE_INFO
|
2019-06-25 10:39:21 +02:00
|
|
|
# MBEDTLS_X509_CRT_REMOVE_TIME
|
2019-06-25 11:19:58 +02:00
|
|
|
# MBEDTLS_X509_CRT_REMOVE_SUBJECT_ISSUER_ID
|
2019-08-19 13:48:09 +02:00
|
|
|
# MBEDTLS_X509_REMOVE_HOSTNAME_VERIFICATION
|
2019-07-01 18:36:12 +02:00
|
|
|
# MBEDTLS_X509_REMOVE_VERIFY_CALLBACK
|
2016-04-03 15:16:08 +02:00
|
|
|
# MBEDTLS_ZLIB_SUPPORT
|
|
|
|
# MBEDTLS_PKCS11_C
|
2019-09-09 11:25:05 +02:00
|
|
|
# MBEDTLS_NO_UDBL_DIVISION
|
|
|
|
# MBEDTLS_NO_64BIT_MULTIPLICATION
|
2019-10-16 09:17:48 +02:00
|
|
|
# MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
|
2019-10-16 12:43:59 +02:00
|
|
|
# MBEDTLS_AES_ONLY_ENCRYPT
|
2019-10-14 14:18:27 +02:00
|
|
|
# MBEDTLS_AES_SCA_COUNTERMEASURES
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
# MBEDTLS_CTR_DRBG_USE_128_BIT_KEY
|
2020-09-17 13:12:06 +02:00
|
|
|
# MBEDTLS_SSL_TRANSFORM_OPTIMIZE_CIPHERS
|
2020-09-19 07:56:06 +02:00
|
|
|
# MBEDTLS_VALIDATE_SSL_KEYS_INTEGRITY
|
2020-10-14 12:24:20 +02:00
|
|
|
# MBEDTLS_OPTIMIZE_TINYCRYPT_ASM
|
2016-04-03 15:16:08 +02:00
|
|
|
# and any symbol beginning _ALT
|
|
|
|
#
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
# The baremetal configuration excludes options that require a library or
|
|
|
|
# operating system feature that is typically not present on bare metal
|
|
|
|
# systems. Features that are excluded from "full" won't be in "baremetal"
|
|
|
|
# either.
|
2014-07-12 03:19:18 +02:00
|
|
|
|
|
|
|
use warnings;
|
|
|
|
use strict;
|
|
|
|
|
2016-04-03 15:16:08 +02:00
|
|
|
my $config_file = "include/mbedtls/config.h";
|
2014-07-12 03:19:18 +02:00
|
|
|
my $usage = <<EOU;
|
2016-04-03 15:16:08 +02:00
|
|
|
$0 [-f <file> | --file <file>] [-o | --force]
|
2016-06-21 11:09:25 +02:00
|
|
|
[set <symbol> <value> | unset <symbol> | get <symbol> |
|
2017-12-21 16:19:53 +01:00
|
|
|
full | realfull | baremetal]
|
2016-04-03 15:16:08 +02:00
|
|
|
|
|
|
|
Commands
|
2016-06-21 11:09:25 +02:00
|
|
|
set <symbol> [<value>] - Uncomments or adds a #define for the <symbol> to
|
2016-04-03 15:16:08 +02:00
|
|
|
the configuration file, and optionally making it
|
|
|
|
of <value>.
|
|
|
|
If the symbol isn't present in the file an error
|
|
|
|
is returned.
|
2016-06-21 11:09:25 +02:00
|
|
|
unset <symbol> - Comments out the #define for the given symbol if
|
|
|
|
present in the configuration file.
|
|
|
|
get <symbol> - Finds the #define for the given symbol, returning
|
2017-10-09 16:56:18 +02:00
|
|
|
an exitcode of 0 if the symbol is found, and 1 if
|
2016-06-21 11:09:25 +02:00
|
|
|
not. The value of the symbol is output if one is
|
|
|
|
specified in the configuration file.
|
2016-04-03 15:16:08 +02:00
|
|
|
full - Uncomments all #define's in the configuration file
|
2016-06-21 11:09:25 +02:00
|
|
|
excluding some reserved symbols, until the
|
2016-04-03 15:16:08 +02:00
|
|
|
'Module configuration options' section
|
|
|
|
realfull - Uncomments all #define's with no exclusions
|
2017-12-21 16:19:53 +01:00
|
|
|
baremetal - Sets full configuration suitable for baremetal build.
|
2016-04-03 15:16:08 +02:00
|
|
|
|
|
|
|
Options
|
|
|
|
-f | --file <filename> - 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
|
2016-11-06 13:45:15 +01:00
|
|
|
file when setting its value, a #define is
|
2016-04-03 15:16:08 +02:00
|
|
|
appended to the end of the file.
|
|
|
|
|
2014-07-12 03:19:18 +02:00
|
|
|
EOU
|
|
|
|
|
|
|
|
my @excluded = qw(
|
2016-06-11 03:31:21 +02:00
|
|
|
MBEDTLS_TEST_NULL_ENTROPY
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_DEPRECATED_REMOVED
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
MBEDTLS_DEPRECATED_WARNING
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_HAVE_SSE2
|
|
|
|
MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
|
|
|
|
MBEDTLS_ECP_DP_M221_ENABLED
|
|
|
|
MBEDTLS_ECP_DP_M383_ENABLED
|
|
|
|
MBEDTLS_ECP_DP_M511_ENABLED
|
2019-06-03 17:33:18 +02:00
|
|
|
MBEDTLS_MEMORY_DEBUG
|
2019-02-26 14:51:00 +01:00
|
|
|
MBEDTLS_MEMORY_BACKTRACE
|
|
|
|
MBEDTLS_MEMORY_BUFFER_ALLOC_C
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
|
|
|
|
MBEDTLS_NO_PLATFORM_ENTROPY
|
|
|
|
MBEDTLS_REMOVE_ARC4_CIPHERSUITES
|
2018-10-30 19:21:41 +01:00
|
|
|
MBEDTLS_REMOVE_3DES_CIPHERSUITES
|
2019-07-17 16:58:56 +02:00
|
|
|
MBEDTLS_SHA256_NO_SHA224
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_SSL_HW_RECORD_ACCEL
|
2019-06-17 15:21:07 +02:00
|
|
|
MBEDTLS_SSL_PROTO_NO_TLS
|
2019-07-01 10:07:28 +02:00
|
|
|
MBEDTLS_SSL_NO_SESSION_CACHE
|
|
|
|
MBEDTLS_SSL_NO_SESSION_RESUMPTION
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
MBEDTLS_RSA_NO_CRT
|
2019-08-27 16:45:44 +02:00
|
|
|
MBEDTLS_USE_TINYCRYPT
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
|
|
|
|
MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
|
2019-06-12 14:59:14 +02:00
|
|
|
MBEDTLS_X509_REMOVE_INFO
|
2019-06-25 10:39:21 +02:00
|
|
|
MBEDTLS_X509_CRT_REMOVE_TIME
|
2019-06-25 11:19:58 +02:00
|
|
|
MBEDTLS_X509_CRT_REMOVE_SUBJECT_ISSUER_ID
|
2019-08-19 13:48:09 +02:00
|
|
|
MBEDTLS_X509_REMOVE_HOSTNAME_VERIFICATION
|
2019-07-01 18:36:12 +02:00
|
|
|
MBEDTLS_X509_REMOVE_VERIFY_CALLBACK
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_ZLIB_SUPPORT
|
|
|
|
MBEDTLS_PKCS11_C
|
2017-12-21 16:22:37 +01:00
|
|
|
MBEDTLS_NO_UDBL_DIVISION
|
2018-06-07 10:51:44 +02:00
|
|
|
MBEDTLS_NO_64BIT_MULTIPLICATION
|
2019-10-16 09:17:48 +02:00
|
|
|
MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
|
2019-10-16 12:43:59 +02:00
|
|
|
MBEDTLS_AES_ONLY_ENCRYPT
|
2019-10-14 14:18:27 +02:00
|
|
|
MBEDTLS_AES_SCA_COUNTERMEASURES
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
MBEDTLS_CTR_DRBG_USE_128_BIT_KEY
|
2020-09-17 13:12:06 +02:00
|
|
|
MBEDTLS_SSL_TRANSFORM_OPTIMIZE_CIPHERS
|
2020-09-19 07:56:06 +02:00
|
|
|
MBEDTLS_VALIDATE_SSL_KEYS_INTEGRITY
|
2020-10-14 12:24:20 +02:00
|
|
|
MBEDTLS_OPTIMIZE_TINYCRYPT_ASM
|
2014-07-12 03:19:18 +02:00
|
|
|
_ALT\s*$
|
|
|
|
);
|
|
|
|
|
2017-12-21 10:28:39 +01:00
|
|
|
# Things that should be disabled in "baremetal"
|
|
|
|
my @excluded_baremetal = qw(
|
|
|
|
MBEDTLS_ENTROPY_NV_SEED
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
MBEDTLS_FS_IO
|
|
|
|
MBEDTLS_HAVEGE_C
|
2017-12-21 10:28:39 +01:00
|
|
|
MBEDTLS_HAVE_TIME
|
|
|
|
MBEDTLS_HAVE_TIME_DATE
|
|
|
|
MBEDTLS_MEMORY_BACKTRACE
|
|
|
|
MBEDTLS_MEMORY_BUFFER_ALLOC_C
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
MBEDTLS_NET_C
|
2017-12-21 10:28:39 +01:00
|
|
|
MBEDTLS_PLATFORM_FPRINTF_ALT
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
MBEDTLS_PLATFORM_NV_SEED_ALT
|
|
|
|
MBEDTLS_PLATFORM_TIME_ALT
|
|
|
|
MBEDTLS_THREADING_C
|
|
|
|
MBEDTLS_THREADING_PTHREAD
|
|
|
|
MBEDTLS_TIMING_C
|
2017-12-21 10:28:39 +01:00
|
|
|
);
|
|
|
|
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
# Things that should be enabled in "full" even if they match @excluded.
|
|
|
|
# Platform ALTs enable global variables that allow configuring the behavior
|
|
|
|
# but default to the default behavior, except for PLATFORM_SETUP_TEARDOWN_ALT
|
|
|
|
# which requires the application to provide relevant functions like
|
|
|
|
# non-platform ALTs.
|
2015-06-03 10:59:06 +02:00
|
|
|
my @non_excluded = qw(
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
PLATFORM_(?!SETUP_TEARDOWN_)[A-Z_0-9]+_ALT
|
2015-06-03 10:59:06 +02:00
|
|
|
);
|
|
|
|
|
2017-12-21 10:28:39 +01:00
|
|
|
# Things that should be enabled in "baremetal"
|
|
|
|
my @non_excluded_baremetal = qw(
|
|
|
|
MBEDTLS_NO_PLATFORM_ENTROPY
|
|
|
|
);
|
|
|
|
|
2016-04-03 15:16:08 +02:00
|
|
|
# Process the command line arguments
|
2014-07-12 03:19:18 +02:00
|
|
|
|
2016-04-03 15:16:08 +02:00
|
|
|
my $force_option = 0;
|
|
|
|
|
|
|
|
my ($arg, $name, $value, $action);
|
|
|
|
|
2016-04-04 14:49:10 +02:00
|
|
|
while ($arg = shift) {
|
2016-04-03 15:16:08 +02:00
|
|
|
|
|
|
|
# Check if the argument is an option
|
2016-04-04 14:49:10 +02:00
|
|
|
if ($arg eq "-f" || $arg eq "--file") {
|
2016-04-03 15:16:08 +02:00
|
|
|
$config_file = shift;
|
|
|
|
|
|
|
|
-f $config_file or die "No such file: $config_file\n";
|
|
|
|
|
|
|
|
}
|
2016-04-04 14:49:10 +02:00
|
|
|
elsif ($arg eq "-o" || $arg eq "--force") {
|
2016-04-03 15:16:08 +02:00
|
|
|
$force_option = 1;
|
2014-07-12 03:19:18 +02:00
|
|
|
|
2016-04-03 15:16:08 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
# ...else assume it's a command
|
|
|
|
$action = $arg;
|
|
|
|
|
2017-12-21 10:28:39 +01:00
|
|
|
if ($action eq "full" || $action eq "realfull" || $action eq "baremetal" ) {
|
2016-04-03 15:16:08 +02:00
|
|
|
# No additional parameters
|
|
|
|
die $usage if @ARGV;
|
|
|
|
|
|
|
|
}
|
2016-06-21 11:09:25 +02:00
|
|
|
elsif ($action eq "unset" || $action eq "get") {
|
2016-04-03 15:16:08 +02:00
|
|
|
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;
|
|
|
|
}
|
2014-07-12 03:19:18 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-23 22:57:06 +02:00
|
|
|
# If no command was specified, exit...
|
|
|
|
if ( not defined($action) ){ die $usage; }
|
|
|
|
|
2016-04-03 15:16:08 +02:00
|
|
|
# Check the config file is present
|
|
|
|
if (! -f $config_file) {
|
|
|
|
|
2019-11-25 14:22:42 +01:00
|
|
|
if ( -d 'importer' && -d 'inc' && -d 'src') {
|
|
|
|
$config_file = "inc/mbedtls/config.h";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
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";
|
|
|
|
}
|
2016-04-03 15:16:08 +02:00
|
|
|
}
|
2014-07-12 03:19:18 +02:00
|
|
|
}
|
2016-04-03 15:16:08 +02:00
|
|
|
|
|
|
|
|
|
|
|
# Now read the file and process the contents
|
2014-07-12 03:19:18 +02:00
|
|
|
|
|
|
|
open my $config_read, '<', $config_file or die "read $config_file: $!\n";
|
|
|
|
my @config_lines = <$config_read>;
|
|
|
|
close $config_read;
|
|
|
|
|
2017-12-21 10:28:39 +01:00
|
|
|
# Add required baremetal symbols to the list that is included.
|
|
|
|
if ( $action eq "baremetal" ) {
|
|
|
|
@non_excluded = ( @non_excluded, @non_excluded_baremetal );
|
|
|
|
}
|
|
|
|
|
|
|
|
my ($exclude_re, $no_exclude_re, $exclude_baremetal_re);
|
2016-01-04 12:57:32 +01:00
|
|
|
if ($action eq "realfull") {
|
|
|
|
$exclude_re = qr/^$/;
|
|
|
|
$no_exclude_re = qr/./;
|
|
|
|
} else {
|
|
|
|
$exclude_re = join '|', @excluded;
|
|
|
|
$no_exclude_re = join '|', @non_excluded;
|
|
|
|
}
|
2017-12-21 10:28:39 +01:00
|
|
|
if ( $action eq "baremetal" ) {
|
|
|
|
$exclude_baremetal_re = join '|', @excluded_baremetal;
|
|
|
|
}
|
2014-07-12 03:19:18 +02:00
|
|
|
|
2017-10-09 16:54:28 +02:00
|
|
|
my $config_write = undef;
|
|
|
|
if ($action ne "get") {
|
|
|
|
open $config_write, '>', $config_file or die "write $config_file: $!\n";
|
|
|
|
}
|
2014-07-12 03:19:18 +02:00
|
|
|
|
|
|
|
my $done;
|
|
|
|
for my $line (@config_lines) {
|
2017-12-21 10:28:39 +01:00
|
|
|
if ($action eq "full" || $action eq "realfull" || $action eq "baremetal" ) {
|
2014-07-12 03:19:18 +02:00
|
|
|
if ($line =~ /name SECTION: Module configuration options/) {
|
|
|
|
$done = 1;
|
|
|
|
}
|
|
|
|
|
2015-06-03 10:59:06 +02:00
|
|
|
if (!$done && $line =~ m!^//\s?#define! &&
|
2017-12-21 10:28:39 +01:00
|
|
|
( $line !~ /$exclude_re/ || $line =~ /$no_exclude_re/ ) &&
|
|
|
|
( $action ne "baremetal" || ( $line !~ /$exclude_baremetal_re/ ) ) ) {
|
2015-03-24 09:50:15 +01:00
|
|
|
$line =~ s!^//\s?!!;
|
|
|
|
}
|
2015-06-03 11:33:55 +02:00
|
|
|
if (!$done && $line =~ m!^\s?#define! &&
|
2017-12-21 10:28:39 +01:00
|
|
|
! ( ( $line !~ /$exclude_re/ || $line =~ /$no_exclude_re/ ) &&
|
|
|
|
( $action ne "baremetal" || ( $line !~ /$exclude_baremetal_re/ ) ) ) ) {
|
2015-03-24 09:50:15 +01:00
|
|
|
$line =~ s!^!//!;
|
2014-07-12 03:19:18 +02:00
|
|
|
}
|
|
|
|
} elsif ($action eq "unset") {
|
2015-06-23 17:42:51 +02:00
|
|
|
if (!$done && $line =~ /^\s*#define\s*$name\b/) {
|
2014-07-12 03:19:18 +02:00
|
|
|
$line = '//' . $line;
|
|
|
|
$done = 1;
|
|
|
|
}
|
|
|
|
} elsif (!$done && $action eq "set") {
|
2015-06-23 17:42:51 +02:00
|
|
|
if ($line =~ m!^(?://)?\s*#define\s*$name\b!) {
|
2014-07-12 03:19:18 +02:00
|
|
|
$line = "#define $name";
|
|
|
|
$line .= " $value" if defined $value && $value ne "";
|
|
|
|
$line .= "\n";
|
|
|
|
$done = 1;
|
|
|
|
}
|
2016-06-21 11:09:25 +02:00
|
|
|
} elsif (!$done && $action eq "get") {
|
2017-10-09 16:51:24 +02:00
|
|
|
if ($line =~ /^\s*#define\s*$name(?:\s+(.*?))\s*(?:$|\/\*|\/\/)/) {
|
2016-06-21 11:09:25 +02:00
|
|
|
$value = $1;
|
|
|
|
$done = 1;
|
|
|
|
}
|
2014-07-12 03:19:18 +02:00
|
|
|
}
|
|
|
|
|
2017-10-09 16:54:28 +02:00
|
|
|
if (defined $config_write) {
|
2017-10-10 11:26:45 +02:00
|
|
|
print $config_write $line or die "write $config_file: $!\n";
|
2017-10-09 16:54:28 +02:00
|
|
|
}
|
2014-07-12 03:19:18 +02:00
|
|
|
}
|
|
|
|
|
2016-04-03 15:16:08 +02:00
|
|
|
# Did the set command work?
|
2017-10-09 16:56:18 +02:00
|
|
|
if ($action eq "set" && $force_option && !$done) {
|
2016-04-03 15:16:08 +02:00
|
|
|
|
|
|
|
# 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;
|
|
|
|
|
2017-10-09 16:54:28 +02:00
|
|
|
print $config_write $line or die "write $config_file: $!\n";
|
2016-04-03 15:16:08 +02:00
|
|
|
}
|
|
|
|
|
2017-10-09 16:54:28 +02:00
|
|
|
if (defined $config_write) {
|
|
|
|
close $config_write or die "close $config_file: $!\n";
|
|
|
|
}
|
2014-07-12 03:19:18 +02:00
|
|
|
|
2016-06-21 16:12:00 +02:00
|
|
|
if ($action eq "get") {
|
2017-10-09 16:56:18 +02:00
|
|
|
if ($done) {
|
2016-06-21 16:12:00 +02:00
|
|
|
if ($value ne '') {
|
2017-10-09 16:56:18 +02:00
|
|
|
print "$value\n";
|
2016-06-21 16:12:00 +02:00
|
|
|
}
|
|
|
|
exit 0;
|
|
|
|
} else {
|
|
|
|
# If the symbol was not found, return an error
|
2017-10-09 16:56:18 +02:00
|
|
|
exit 1;
|
2016-06-21 11:09:25 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-03 15:16:08 +02:00
|
|
|
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";
|
|
|
|
}
|
2014-07-12 03:19:18 +02:00
|
|
|
|
|
|
|
__END__
|