mirror of
				https://github.com/Mbed-TLS/mbedtls.git
				synced 2025-11-03 20:33:16 +03:00 
			
		
		
		
	Merge pull request #223 from Patater/tls-development-20190815
Update Mbed Crypto with latest Mbed TLS changes as of 2018-08-15
This commit is contained in:
		@@ -642,7 +642,8 @@
 | 
			
		||||
           "r6", "r7", "r8", "r9", "cc"         \
 | 
			
		||||
         );
 | 
			
		||||
 | 
			
		||||
#elif defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
 | 
			
		||||
#elif (__ARM_ARCH >= 6) && \
 | 
			
		||||
    defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
 | 
			
		||||
 | 
			
		||||
#define MULADDC_INIT                            \
 | 
			
		||||
    asm(
 | 
			
		||||
 
 | 
			
		||||
@@ -831,6 +831,26 @@ component_test_aes_fewer_tables_and_rom_tables () {
 | 
			
		||||
component_test_make_shared () {
 | 
			
		||||
    msg "build/test: make shared" # ~ 40s
 | 
			
		||||
    make SHARED=1 all check -j1
 | 
			
		||||
    ldd programs/util/strerror | grep libmbedcrypto
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_test_cmake_shared () {
 | 
			
		||||
    msg "build/test: cmake shared" # ~ 2min
 | 
			
		||||
    cmake -DUSE_SHARED_MBEDTLS_LIBRARY=On .
 | 
			
		||||
    make
 | 
			
		||||
    ldd programs/util/strerror | grep libmbedcrypto
 | 
			
		||||
    make test
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_build_mbedtls_config_file () {
 | 
			
		||||
    msg "build: make with MBEDTLS_CONFIG_FILE" # ~40s
 | 
			
		||||
    # Use the full config so as to catch a maximum of places where
 | 
			
		||||
    # the check of MBEDTLS_CONFIG_FILE might be missing.
 | 
			
		||||
    scripts/config.pl full
 | 
			
		||||
    sed 's!"check_config.h"!"mbedtls/check_config.h"!' <"$CONFIG_H" >full_config.h
 | 
			
		||||
    echo '#error "MBEDTLS_CONFIG_FILE is not working"' >"$CONFIG_H"
 | 
			
		||||
    make CFLAGS="-I '$PWD' -DMBEDTLS_CONFIG_FILE='\"full_config.h\"'"
 | 
			
		||||
    rm -f full_config.h
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_test_m32_o0 () {
 | 
			
		||||
@@ -940,6 +960,17 @@ component_build_arm_none_eabi_gcc () {
 | 
			
		||||
    make CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld CFLAGS='-Werror -Wall -Wextra' lib
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_build_arm_none_eabi_gcc_arm5vte () {
 | 
			
		||||
    msg "build: arm-none-eabi-gcc -march=arm5vte, make" # ~ 10s
 | 
			
		||||
    scripts/config.pl baremetal
 | 
			
		||||
    # Build for a target platform that's close to what Debian uses
 | 
			
		||||
    # for its "armel" distribution (https://wiki.debian.org/ArmEabiPort).
 | 
			
		||||
    # See https://github.com/ARMmbed/mbedtls/pull/2169 and comments.
 | 
			
		||||
    # It would be better to build with arm-linux-gnueabi-gcc but
 | 
			
		||||
    # we don't have that on our CI at this time.
 | 
			
		||||
    make CC=arm-none-eabi-gcc AR=arm-none-eabi-ar CFLAGS='-Werror -Wall -Wextra -march=armv5te -O1' LDFLAGS='-march=armv5te' SHELL='sh -x' lib
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
component_build_arm_none_eabi_gcc_no_udbl_division () {
 | 
			
		||||
    msg "build: arm-none-eabi-gcc -DMBEDTLS_NO_UDBL_DIVISION, make" # ~ 10s
 | 
			
		||||
    scripts/config.pl baremetal
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user