Merge #160

160: Reduce level of -Wformat-truncation r=zugzwang a=jethrogb

Partially backport Mbed-TLS/mbedtls#4237 to deal with Mbed-TLS/mbedtls#4233

Also fixes #159

Co-authored-by: Paul Elliott <paul.elliott@arm.com>
Co-authored-by: Jethro Beekman <jethro@fortanix.com>

Author: 3 people

Cargo.lock

@@ -21,9 +21,6 @@ export CC_aarch64_unknown_linux_musl=/tmp/aarch64-linux-musl-cross/bin/aarch64-l
 export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=/tmp/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
 export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER=qemu-aarch64
 
-# Temporary workaround for MbedTLS 2.26.0 https://github.com/ARMmbed/mbedtls/pull/4237
-export CFLAGS_aarch64_unknown_linux_musl="-Wformat-truncation"
-
 if [ "$TRAVIS_RUST_VERSION" == "stable" ] || [ "$TRAVIS_RUST_VERSION" == "beta" ] || [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then
     # Install the rust toolchain
     rustup default $TRAVIS_RUST_VERSION
@@ -32,7 +29,7 @@ if [ "$TRAVIS_RUST_VERSION" == "stable" ] || [ "$TRAVIS_RUST_VERSION" == "beta"
     # The SGX target cannot be run under test like a ELF binary
     if [ "$TARGET" != "x86_64-fortanix-unknown-sgx" ]; then 
         # make sure that explicitly providing the default target works
-        cargo test --target $TARGET
+        cargo test --target $TARGET --release
         cargo test --features pkcs12 --target $TARGET
         cargo test --features pkcs12_rc2 --target $TARGET
         cargo test --features dsa --target $TARGET

ct.sh

@@ -1,6 +1,6 @@
 [package]
 name = "mbedtls-sys-auto"
-version = "2.26.0"
+version = "2.26.1"
 authors = ["Jethro Beekman <jethro@fortanix.com>"]
 build = "build/build.rs"
 license = "Apache-2.0/GPL-2.0+"

mbedtls-sys/Cargo.toml

@@ -198,7 +198,7 @@ if(CMAKE_COMPILER_IS_GNU)
         endif()
     endif()
     if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation=2")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
     endif()
     set(CMAKE_C_FLAGS_RELEASE     "-O2")
     set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")

mbedtls-sys/vendor/CMakeLists.txt

@@ -32,7 +32,7 @@ rc2 = { version = "0.3", optional = true }
 cfg-if = "1.0.0"
 
 [target.x86_64-fortanix-unknown-sgx.dependencies]
-rs-libc = "0.1.0"
+rs-libc = "0.2.0"
 chrono = "0.4"
 
 [dependencies.mbedtls-sys-auto]