Skip to content

Update Mbed Crypto with latest Mbed TLS changes as of 2019-08-15 #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Aug 15, 2019
Merged

Update Mbed Crypto with latest Mbed TLS changes as of 2019-08-15 #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
59c92ed
ECP restart: Don't calculate address of sub ctx if ctx is NULL
Jul 19, 2019
bf84d50
Adapt ChangeLog
Jul 19, 2019
5daa34f
bn_mul.h: require at least ARMv6 to enable the ARM DSP code
aurel32 Nov 2, 2018
a5cb7d4
Add changelog entry for ARM assembly fix
gilles-peskine-arm Aug 5, 2019
93e4e03
Add a build on ARMv5TE in ARM mode
gilles-peskine-arm Aug 5, 2019
8a52af9
Switch armel build to -Os
gilles-peskine-arm Aug 8, 2019
2c897d7
Document the rationale for the armel build
gilles-peskine-arm Aug 9, 2019
6eece5b
Exclude DTLS 1.2 only with older OpenSSL
gilles-peskine-arm Aug 10, 2019
abf9b4d
Add a test of MBEDTLS_CONFIG_FILE
gilles-peskine-arm Jul 3, 2019
cf74050
Test that the shared library build with CMake works
gilles-peskine-arm Jul 3, 2019
56c0161
Test that a shared library build produces a dynamically linked execut…
gilles-peskine-arm Jul 3, 2019
26f3e28
Honor MBEDTLS_CONFIG_FILE in fuzz tests
gilles-peskine-arm Aug 13, 2019
787d151
Merge remote-tracking branch 'upstream-public/pr/2779' into development
gilles-peskine-arm Aug 14, 2019
681edbe
Merge remote-tracking branch 'upstream-public/pr/2777' into development
gilles-peskine-arm Aug 14, 2019
1435767
Merge remote-tracking branch 'upstream-public/pr/2753' into development
gilles-peskine-arm Aug 14, 2019
61fc108
Merge remote-tracking branch 'upstream-public/pr/2728' into development
gilles-peskine-arm Aug 14, 2019
9d20e1f
Merge remote-tracking branch 'tls/development' into development
Patater Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/mbedtls/bn_mul.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion library/ecdsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static void ecdsa_restart_det_free( mbedtls_ecdsa_restart_det_ctx *ctx )
}
#endif /* MBEDTLS_ECDSA_DETERMINISTIC */

#define ECDSA_RS_ECP ( rs_ctx == NULL ? NULL : &rs_ctx->ecp )
#define ECDSA_RS_ECP ( rs_ctx == NULL ? NULL : &rs_ctx->ecp )

/* Utility macro for checking and updating ops budget */
#define ECDSA_BUDGET( ops ) \
Expand Down
31 changes: 31 additions & 0 deletions tests/scripts/all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down Expand Up @@ -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
Expand Down