1
0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-28 00:58:05 +08:00
Andrzej Kurek 825ebd483f
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 11:47:25 -04:00
..
2013-11-28 18:07:39 +01:00
2013-11-28 18:07:39 +01:00
2013-11-28 18:07:39 +01:00
2017-06-06 18:44:14 +02:00
2019-06-03 16:19:46 +01:00
2019-06-03 16:19:46 +01:00
2019-07-10 18:35:10 +03:00
2019-08-23 11:33:20 +01:00
2019-08-23 11:33:20 +01:00
2019-08-23 11:33:20 +01:00
2019-08-23 11:33:20 +01:00
2019-08-23 11:33:20 +01:00
2017-06-06 18:44:13 +02:00
2017-06-06 18:44:13 +02:00
2014-03-13 19:25:06 +01:00
2019-07-10 17:26:39 +03:00
2015-06-17 14:27:38 +02:00
2014-04-04 16:42:44 +02:00
2013-10-10 15:11:33 +02:00
2013-10-10 15:11:33 +02:00
2013-10-10 15:11:33 +02:00
2013-10-10 15:11:33 +02:00
2013-10-10 15:11:33 +02:00
2013-10-10 15:11:33 +02:00
2013-07-08 17:32:26 +02:00
2013-07-08 17:32:26 +02:00
2014-03-14 08:41:02 +01:00
2017-06-06 18:44:14 +02:00
2018-11-02 10:52:38 +00:00
2018-11-02 10:52:38 +00:00
2018-11-02 10:52:38 +00:00
2018-11-02 10:52:38 +00:00
2018-11-02 10:52:38 +00:00
2018-11-02 10:52:38 +00:00
2018-11-02 10:52:38 +00:00
2013-08-20 20:46:03 +02:00
2014-03-13 19:25:06 +01:00
2014-06-02 16:10:29 +02:00
2014-06-02 16:10:29 +02:00
2014-06-02 16:10:29 +02:00
2014-06-02 16:10:29 +02:00
2014-06-02 16:10:29 +02:00
2015-09-01 17:24:42 +02:00
2019-08-23 11:33:20 +01:00
2019-08-23 11:33:20 +01:00
2015-09-01 17:24:42 +02:00
2015-09-01 17:24:42 +02:00