diff --git a/Qt-5.12.4_5.13.0/arm/libcrypto.so b/Qt-5.12.4_5.13.0/arm/libcrypto.so index f3354dd..26766d0 100755 Binary files a/Qt-5.12.4_5.13.0/arm/libcrypto.so and b/Qt-5.12.4_5.13.0/arm/libcrypto.so differ diff --git a/Qt-5.12.4_5.13.0/arm/libssl.so b/Qt-5.12.4_5.13.0/arm/libssl.so index 0298b27..ff9cf71 100755 Binary files a/Qt-5.12.4_5.13.0/arm/libssl.so and b/Qt-5.12.4_5.13.0/arm/libssl.so differ diff --git a/Qt-5.12.4_5.13.0/arm64/libcrypto.so b/Qt-5.12.4_5.13.0/arm64/libcrypto.so index 1fb31c2..7860296 100755 Binary files a/Qt-5.12.4_5.13.0/arm64/libcrypto.so and b/Qt-5.12.4_5.13.0/arm64/libcrypto.so differ diff --git a/Qt-5.12.4_5.13.0/arm64/libssl.so b/Qt-5.12.4_5.13.0/arm64/libssl.so index fc8d3b1..da043da 100755 Binary files a/Qt-5.12.4_5.13.0/arm64/libssl.so and b/Qt-5.12.4_5.13.0/arm64/libssl.so differ diff --git a/Qt-5.12.4_5.13.0/x86/libcrypto.so b/Qt-5.12.4_5.13.0/x86/libcrypto.so index 52b6ade..b03d6c7 100755 Binary files a/Qt-5.12.4_5.13.0/x86/libcrypto.so and b/Qt-5.12.4_5.13.0/x86/libcrypto.so differ diff --git a/Qt-5.12.4_5.13.0/x86/libssl.so b/Qt-5.12.4_5.13.0/x86/libssl.so index ae5deb5..b3a7659 100755 Binary files a/Qt-5.12.4_5.13.0/x86/libssl.so and b/Qt-5.12.4_5.13.0/x86/libssl.so differ diff --git a/Qt-5.12.4_5.13.0/x86_64/libcrypto.so b/Qt-5.12.4_5.13.0/x86_64/libcrypto.so index 013867c..280b733 100755 Binary files a/Qt-5.12.4_5.13.0/x86_64/libcrypto.so and b/Qt-5.12.4_5.13.0/x86_64/libcrypto.so differ diff --git a/Qt-5.12.4_5.13.0/x86_64/libssl.so b/Qt-5.12.4_5.13.0/x86_64/libssl.so index ed75822..25f08e7 100755 Binary files a/Qt-5.12.4_5.13.0/x86_64/libssl.so and b/Qt-5.12.4_5.13.0/x86_64/libssl.so differ diff --git a/build_ssl.sh b/build_ssl.sh index 98bb894..507e37c 100755 --- a/build_ssl.sh +++ b/build_ssl.sh @@ -6,7 +6,7 @@ mkdir -p static/include BUILD_DIR=$(pwd) DEFAULT_PATH=$PATH -declare -A ssl_versions=( ["1.1.1e"]=~/android/ndk-bundle ["1.0.2u"]=~/android/android-ndk-r10e ) +declare -A ssl_versions=( ["1.1.1f"]=~/android/ndk-bundle ["1.0.2u"]=~/android/android-ndk-r10e ) # Qt up to Qt-5.12.3 are using openssl 1.0.x # Qt 5.12.4 and 5.13.0 are using 1.1.x without any suffix, this will make he andorid linker to load system libs on Andorid 5 which will make Qt SSL support unusable in this combination diff --git a/latest/arm/libcrypto_1_1.so b/latest/arm/libcrypto_1_1.so index d33770f..1bf63e5 100755 Binary files a/latest/arm/libcrypto_1_1.so and b/latest/arm/libcrypto_1_1.so differ diff --git a/latest/arm/libssl_1_1.so b/latest/arm/libssl_1_1.so index cd8201a..5aac52f 100755 Binary files a/latest/arm/libssl_1_1.so and b/latest/arm/libssl_1_1.so differ diff --git a/latest/arm64/libcrypto_1_1.so b/latest/arm64/libcrypto_1_1.so index d1a5199..35a43f9 100755 Binary files a/latest/arm64/libcrypto_1_1.so and b/latest/arm64/libcrypto_1_1.so differ diff --git a/latest/arm64/libssl_1_1.so b/latest/arm64/libssl_1_1.so index 18f5abb..5590c78 100755 Binary files a/latest/arm64/libssl_1_1.so and b/latest/arm64/libssl_1_1.so differ diff --git a/latest/x86/libcrypto_1_1.so b/latest/x86/libcrypto_1_1.so index 4cbc169..34552e1 100755 Binary files a/latest/x86/libcrypto_1_1.so and b/latest/x86/libcrypto_1_1.so differ diff --git a/latest/x86/libssl_1_1.so b/latest/x86/libssl_1_1.so index 2b04adc..2220bde 100755 Binary files a/latest/x86/libssl_1_1.so and b/latest/x86/libssl_1_1.so differ diff --git a/latest/x86_64/libcrypto_1_1.so b/latest/x86_64/libcrypto_1_1.so index a7f8df2..62f44d8 100755 Binary files a/latest/x86_64/libcrypto_1_1.so and b/latest/x86_64/libcrypto_1_1.so differ diff --git a/latest/x86_64/libssl_1_1.so b/latest/x86_64/libssl_1_1.so index c2ff3de..a8b9fa9 100755 Binary files a/latest/x86_64/libssl_1_1.so and b/latest/x86_64/libssl_1_1.so differ diff --git a/static/include/openssl/opensslv.h b/static/include/openssl/opensslv.h index dd8ef3d..8c697f5 100644 --- a/static/include/openssl/opensslv.h +++ b/static/include/openssl/opensslv.h @@ -1,5 +1,5 @@ /* - * Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -39,8 +39,8 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1010105fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1e 17 Mar 2020" +# define OPENSSL_VERSION_NUMBER 0x1010106fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1f 31 Mar 2020" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/static/include/openssl/sslerr.h b/static/include/openssl/sslerr.h index 0ef684f..82983d3 100644 --- a/static/include/openssl/sslerr.h +++ b/static/include/openssl/sslerr.h @@ -734,7 +734,6 @@ int ERR_load_SSL_strings(void); # define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES 243 # define SSL_R_UNEXPECTED_CCS_MESSAGE 262 # define SSL_R_UNEXPECTED_END_OF_EARLY_DATA 178 -# define SSL_R_UNEXPECTED_EOF_WHILE_READING 294 # define SSL_R_UNEXPECTED_MESSAGE 244 # define SSL_R_UNEXPECTED_RECORD 245 # define SSL_R_UNINITIALIZED 276 diff --git a/static/lib/arm/libcrypto.a b/static/lib/arm/libcrypto.a index 2421f3c..00729a9 100644 Binary files a/static/lib/arm/libcrypto.a and b/static/lib/arm/libcrypto.a differ diff --git a/static/lib/arm/libssl.a b/static/lib/arm/libssl.a index ffbd71c..dee0cbc 100644 Binary files a/static/lib/arm/libssl.a and b/static/lib/arm/libssl.a differ diff --git a/static/lib/arm64/libcrypto.a b/static/lib/arm64/libcrypto.a index e1ae505..bd0d731 100644 Binary files a/static/lib/arm64/libcrypto.a and b/static/lib/arm64/libcrypto.a differ diff --git a/static/lib/arm64/libssl.a b/static/lib/arm64/libssl.a index d88d554..8ec9496 100644 Binary files a/static/lib/arm64/libssl.a and b/static/lib/arm64/libssl.a differ diff --git a/static/lib/multiabi/libcrypto_arm64-v8a.a b/static/lib/multiabi/libcrypto_arm64-v8a.a index e1ae505..bd0d731 100644 Binary files a/static/lib/multiabi/libcrypto_arm64-v8a.a and b/static/lib/multiabi/libcrypto_arm64-v8a.a differ diff --git a/static/lib/multiabi/libcrypto_armeabi-v7a.a b/static/lib/multiabi/libcrypto_armeabi-v7a.a index 2421f3c..00729a9 100644 Binary files a/static/lib/multiabi/libcrypto_armeabi-v7a.a and b/static/lib/multiabi/libcrypto_armeabi-v7a.a differ diff --git a/static/lib/multiabi/libcrypto_x86.a b/static/lib/multiabi/libcrypto_x86.a index af380ee..2ca03a7 100644 Binary files a/static/lib/multiabi/libcrypto_x86.a and b/static/lib/multiabi/libcrypto_x86.a differ diff --git a/static/lib/multiabi/libcrypto_x86_64.a b/static/lib/multiabi/libcrypto_x86_64.a index 515ffc1..ac64a4f 100644 Binary files a/static/lib/multiabi/libcrypto_x86_64.a and b/static/lib/multiabi/libcrypto_x86_64.a differ diff --git a/static/lib/multiabi/libssl_arm64-v8a.a b/static/lib/multiabi/libssl_arm64-v8a.a index d88d554..8ec9496 100644 Binary files a/static/lib/multiabi/libssl_arm64-v8a.a and b/static/lib/multiabi/libssl_arm64-v8a.a differ diff --git a/static/lib/multiabi/libssl_armeabi-v7a.a b/static/lib/multiabi/libssl_armeabi-v7a.a index ffbd71c..dee0cbc 100644 Binary files a/static/lib/multiabi/libssl_armeabi-v7a.a and b/static/lib/multiabi/libssl_armeabi-v7a.a differ diff --git a/static/lib/multiabi/libssl_x86.a b/static/lib/multiabi/libssl_x86.a index 54c9f78..cb3edf5 100644 Binary files a/static/lib/multiabi/libssl_x86.a and b/static/lib/multiabi/libssl_x86.a differ diff --git a/static/lib/multiabi/libssl_x86_64.a b/static/lib/multiabi/libssl_x86_64.a index b6ef388..03f3a5b 100644 Binary files a/static/lib/multiabi/libssl_x86_64.a and b/static/lib/multiabi/libssl_x86_64.a differ diff --git a/static/lib/x86/libcrypto.a b/static/lib/x86/libcrypto.a index af380ee..2ca03a7 100644 Binary files a/static/lib/x86/libcrypto.a and b/static/lib/x86/libcrypto.a differ diff --git a/static/lib/x86/libssl.a b/static/lib/x86/libssl.a index 54c9f78..cb3edf5 100644 Binary files a/static/lib/x86/libssl.a and b/static/lib/x86/libssl.a differ diff --git a/static/lib/x86_64/libcrypto.a b/static/lib/x86_64/libcrypto.a index 515ffc1..ac64a4f 100644 Binary files a/static/lib/x86_64/libcrypto.a and b/static/lib/x86_64/libcrypto.a differ diff --git a/static/lib/x86_64/libssl.a b/static/lib/x86_64/libssl.a index b6ef388..03f3a5b 100644 Binary files a/static/lib/x86_64/libssl.a and b/static/lib/x86_64/libssl.a differ