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 4e592fe..d505809 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 ff9cf71..dd5456b 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 035086b..dd75c5f 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 da043da..717ade4 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 5c84fa2..9298d0f 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 b3a7659..a11f67f 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 0f80dc5..3e9d8ff 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 25f08e7..0f0e83b 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 bd30fa2..9280d2a 100755 --- a/build_ssl.sh +++ b/build_ssl.sh @@ -4,7 +4,7 @@ BUILD_DIR=$(pwd) DEFAULT_PATH=$PATH declare -a params=( 'no-asm' '' ) -declare -A ssl_versions=( ["1.1.1f"]=~/android/ndk-bundle ["1.0.2u"]=~/android/android-ndk-r10e ) +declare -A ssl_versions=( ["1.1.1g"]=~/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 07ec588..46f83df 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 5aac52f..ae9ff52 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 43653f8..664494d 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 5590c78..d603b4e 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 3069472..2a211fc 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 2220bde..3c6933b 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 2cc6a85..44b146a 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 a8b9fa9..1753066 100755 Binary files a/latest/x86_64/libssl_1_1.so and b/latest/x86_64/libssl_1_1.so differ diff --git a/no-asm/Qt-5.12.4_5.13.0/arm/libcrypto.so b/no-asm/Qt-5.12.4_5.13.0/arm/libcrypto.so index 29b563f..30f898f 100755 Binary files a/no-asm/Qt-5.12.4_5.13.0/arm/libcrypto.so and b/no-asm/Qt-5.12.4_5.13.0/arm/libcrypto.so differ diff --git a/no-asm/Qt-5.12.4_5.13.0/arm/libssl.so b/no-asm/Qt-5.12.4_5.13.0/arm/libssl.so index 78fcf19..db06ab9 100755 Binary files a/no-asm/Qt-5.12.4_5.13.0/arm/libssl.so and b/no-asm/Qt-5.12.4_5.13.0/arm/libssl.so differ diff --git a/no-asm/Qt-5.12.4_5.13.0/arm64/libcrypto.so b/no-asm/Qt-5.12.4_5.13.0/arm64/libcrypto.so index 0c73eb8..647d3f7 100755 Binary files a/no-asm/Qt-5.12.4_5.13.0/arm64/libcrypto.so and b/no-asm/Qt-5.12.4_5.13.0/arm64/libcrypto.so differ diff --git a/no-asm/Qt-5.12.4_5.13.0/arm64/libssl.so b/no-asm/Qt-5.12.4_5.13.0/arm64/libssl.so index 5e70c03..7bdc452 100755 Binary files a/no-asm/Qt-5.12.4_5.13.0/arm64/libssl.so and b/no-asm/Qt-5.12.4_5.13.0/arm64/libssl.so differ diff --git a/no-asm/Qt-5.12.4_5.13.0/x86/libcrypto.so b/no-asm/Qt-5.12.4_5.13.0/x86/libcrypto.so index 011ac76..9ef9c2d 100755 Binary files a/no-asm/Qt-5.12.4_5.13.0/x86/libcrypto.so and b/no-asm/Qt-5.12.4_5.13.0/x86/libcrypto.so differ diff --git a/no-asm/Qt-5.12.4_5.13.0/x86/libssl.so b/no-asm/Qt-5.12.4_5.13.0/x86/libssl.so index 970b4c3..c2deaf9 100755 Binary files a/no-asm/Qt-5.12.4_5.13.0/x86/libssl.so and b/no-asm/Qt-5.12.4_5.13.0/x86/libssl.so differ diff --git a/no-asm/Qt-5.12.4_5.13.0/x86_64/libcrypto.so b/no-asm/Qt-5.12.4_5.13.0/x86_64/libcrypto.so index 711ef90..dfba178 100755 Binary files a/no-asm/Qt-5.12.4_5.13.0/x86_64/libcrypto.so and b/no-asm/Qt-5.12.4_5.13.0/x86_64/libcrypto.so differ diff --git a/no-asm/Qt-5.12.4_5.13.0/x86_64/libssl.so b/no-asm/Qt-5.12.4_5.13.0/x86_64/libssl.so index aedabc0..0850d8d 100755 Binary files a/no-asm/Qt-5.12.4_5.13.0/x86_64/libssl.so and b/no-asm/Qt-5.12.4_5.13.0/x86_64/libssl.so differ diff --git a/no-asm/latest/arm/libcrypto_1_1.so b/no-asm/latest/arm/libcrypto_1_1.so index e6e5de3..4e3a21d 100755 Binary files a/no-asm/latest/arm/libcrypto_1_1.so and b/no-asm/latest/arm/libcrypto_1_1.so differ diff --git a/no-asm/latest/arm/libssl_1_1.so b/no-asm/latest/arm/libssl_1_1.so index 684972d..a7cd768 100755 Binary files a/no-asm/latest/arm/libssl_1_1.so and b/no-asm/latest/arm/libssl_1_1.so differ diff --git a/no-asm/latest/arm64/libcrypto_1_1.so b/no-asm/latest/arm64/libcrypto_1_1.so index 208faa6..991edae 100755 Binary files a/no-asm/latest/arm64/libcrypto_1_1.so and b/no-asm/latest/arm64/libcrypto_1_1.so differ diff --git a/no-asm/latest/arm64/libssl_1_1.so b/no-asm/latest/arm64/libssl_1_1.so index b2edabd..5c7765d 100755 Binary files a/no-asm/latest/arm64/libssl_1_1.so and b/no-asm/latest/arm64/libssl_1_1.so differ diff --git a/no-asm/latest/x86/libcrypto_1_1.so b/no-asm/latest/x86/libcrypto_1_1.so index a9e9b3c..8203b64 100755 Binary files a/no-asm/latest/x86/libcrypto_1_1.so and b/no-asm/latest/x86/libcrypto_1_1.so differ diff --git a/no-asm/latest/x86/libssl_1_1.so b/no-asm/latest/x86/libssl_1_1.so index eb3812a..d99a858 100755 Binary files a/no-asm/latest/x86/libssl_1_1.so and b/no-asm/latest/x86/libssl_1_1.so differ diff --git a/no-asm/latest/x86_64/libcrypto_1_1.so b/no-asm/latest/x86_64/libcrypto_1_1.so index 680a391..64fdb58 100755 Binary files a/no-asm/latest/x86_64/libcrypto_1_1.so and b/no-asm/latest/x86_64/libcrypto_1_1.so differ diff --git a/no-asm/latest/x86_64/libssl_1_1.so b/no-asm/latest/x86_64/libssl_1_1.so index 09390e6..ab83698 100755 Binary files a/no-asm/latest/x86_64/libssl_1_1.so and b/no-asm/latest/x86_64/libssl_1_1.so differ diff --git a/no-asm/static/include/openssl/opensslv.h b/no-asm/static/include/openssl/opensslv.h index 8c697f5..17d271f 100644 --- a/no-asm/static/include/openssl/opensslv.h +++ b/no-asm/static/include/openssl/opensslv.h @@ -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 0x1010106fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1f 31 Mar 2020" +# define OPENSSL_VERSION_NUMBER 0x1010107fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1g 21 Apr 2020" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/no-asm/static/lib/arm/libcrypto.a b/no-asm/static/lib/arm/libcrypto.a index 7ba8ddf..16e05a8 100644 Binary files a/no-asm/static/lib/arm/libcrypto.a and b/no-asm/static/lib/arm/libcrypto.a differ diff --git a/no-asm/static/lib/arm/libssl.a b/no-asm/static/lib/arm/libssl.a index b45324d..a645aae 100644 Binary files a/no-asm/static/lib/arm/libssl.a and b/no-asm/static/lib/arm/libssl.a differ diff --git a/no-asm/static/lib/arm64/libcrypto.a b/no-asm/static/lib/arm64/libcrypto.a index ffed7df..0ba74bf 100644 Binary files a/no-asm/static/lib/arm64/libcrypto.a and b/no-asm/static/lib/arm64/libcrypto.a differ diff --git a/no-asm/static/lib/arm64/libssl.a b/no-asm/static/lib/arm64/libssl.a index 405ff0b..2ab2683 100644 Binary files a/no-asm/static/lib/arm64/libssl.a and b/no-asm/static/lib/arm64/libssl.a differ diff --git a/no-asm/static/lib/multiabi/libcrypto_arm64-v8a.a b/no-asm/static/lib/multiabi/libcrypto_arm64-v8a.a index ffed7df..0ba74bf 100644 Binary files a/no-asm/static/lib/multiabi/libcrypto_arm64-v8a.a and b/no-asm/static/lib/multiabi/libcrypto_arm64-v8a.a differ diff --git a/no-asm/static/lib/multiabi/libcrypto_armeabi-v7a.a b/no-asm/static/lib/multiabi/libcrypto_armeabi-v7a.a index 7ba8ddf..16e05a8 100644 Binary files a/no-asm/static/lib/multiabi/libcrypto_armeabi-v7a.a and b/no-asm/static/lib/multiabi/libcrypto_armeabi-v7a.a differ diff --git a/no-asm/static/lib/multiabi/libcrypto_x86.a b/no-asm/static/lib/multiabi/libcrypto_x86.a index ce6e165..4996867 100644 Binary files a/no-asm/static/lib/multiabi/libcrypto_x86.a and b/no-asm/static/lib/multiabi/libcrypto_x86.a differ diff --git a/no-asm/static/lib/multiabi/libcrypto_x86_64.a b/no-asm/static/lib/multiabi/libcrypto_x86_64.a index 0da1345..f58cd74 100644 Binary files a/no-asm/static/lib/multiabi/libcrypto_x86_64.a and b/no-asm/static/lib/multiabi/libcrypto_x86_64.a differ diff --git a/no-asm/static/lib/multiabi/libssl_arm64-v8a.a b/no-asm/static/lib/multiabi/libssl_arm64-v8a.a index 405ff0b..2ab2683 100644 Binary files a/no-asm/static/lib/multiabi/libssl_arm64-v8a.a and b/no-asm/static/lib/multiabi/libssl_arm64-v8a.a differ diff --git a/no-asm/static/lib/multiabi/libssl_armeabi-v7a.a b/no-asm/static/lib/multiabi/libssl_armeabi-v7a.a index b45324d..a645aae 100644 Binary files a/no-asm/static/lib/multiabi/libssl_armeabi-v7a.a and b/no-asm/static/lib/multiabi/libssl_armeabi-v7a.a differ diff --git a/no-asm/static/lib/multiabi/libssl_x86.a b/no-asm/static/lib/multiabi/libssl_x86.a index abf4aa5..29a00dc 100644 Binary files a/no-asm/static/lib/multiabi/libssl_x86.a and b/no-asm/static/lib/multiabi/libssl_x86.a differ diff --git a/no-asm/static/lib/multiabi/libssl_x86_64.a b/no-asm/static/lib/multiabi/libssl_x86_64.a index 72eb55e..e15ab1d 100644 Binary files a/no-asm/static/lib/multiabi/libssl_x86_64.a and b/no-asm/static/lib/multiabi/libssl_x86_64.a differ diff --git a/no-asm/static/lib/x86/libcrypto.a b/no-asm/static/lib/x86/libcrypto.a index ce6e165..4996867 100644 Binary files a/no-asm/static/lib/x86/libcrypto.a and b/no-asm/static/lib/x86/libcrypto.a differ diff --git a/no-asm/static/lib/x86/libssl.a b/no-asm/static/lib/x86/libssl.a index abf4aa5..29a00dc 100644 Binary files a/no-asm/static/lib/x86/libssl.a and b/no-asm/static/lib/x86/libssl.a differ diff --git a/no-asm/static/lib/x86_64/libcrypto.a b/no-asm/static/lib/x86_64/libcrypto.a index 0da1345..f58cd74 100644 Binary files a/no-asm/static/lib/x86_64/libcrypto.a and b/no-asm/static/lib/x86_64/libcrypto.a differ diff --git a/no-asm/static/lib/x86_64/libssl.a b/no-asm/static/lib/x86_64/libssl.a index 72eb55e..e15ab1d 100644 Binary files a/no-asm/static/lib/x86_64/libssl.a and b/no-asm/static/lib/x86_64/libssl.a differ diff --git a/static/include/openssl/opensslv.h b/static/include/openssl/opensslv.h index 8c697f5..17d271f 100644 --- a/static/include/openssl/opensslv.h +++ b/static/include/openssl/opensslv.h @@ -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 0x1010106fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1f 31 Mar 2020" +# define OPENSSL_VERSION_NUMBER 0x1010107fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1g 21 Apr 2020" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/static/lib/arm/libcrypto.a b/static/lib/arm/libcrypto.a index 0167ee7..5268b1b 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 dee0cbc..2404968 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 2700cef..6f7a65c 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 8ec9496..a7d5caf 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 2700cef..6f7a65c 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 0167ee7..5268b1b 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 00240e0..9e22473 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 4ef7aea..adbcaff 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 8ec9496..a7d5caf 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 dee0cbc..2404968 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 cb3edf5..335c219 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 03f3a5b..412c1db 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 00240e0..9e22473 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 cb3edf5..335c219 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 4ef7aea..adbcaff 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 03f3a5b..412c1db 100644 Binary files a/static/lib/x86_64/libssl.a and b/static/lib/x86_64/libssl.a differ