diff --git a/deps/openssl/android/arm64-v8a/usr/local/include/crypto/dso_conf.h b/deps/openssl/android/arm64-v8a/usr/local/include/crypto/dso_conf.h index 795dfa0f..6d9c478c 100644 --- a/deps/openssl/android/arm64-v8a/usr/local/include/crypto/dso_conf.h +++ b/deps/openssl/android/arm64-v8a/usr/local/include/crypto/dso_conf.h @@ -13,7 +13,6 @@ # define OSSL_CRYPTO_DSO_CONF_H # pragma once -# define DSO_DLFCN -# define HAVE_DLFCN_H +# define DSO_NONE # define DSO_EXTENSION ".so" #endif diff --git a/deps/openssl/android/arm64-v8a/usr/local/include/openssl/configuration.h b/deps/openssl/android/arm64-v8a/usr/local/include/openssl/configuration.h index c10bad63..974ead19 100644 --- a/deps/openssl/android/arm64-v8a/usr/local/include/openssl/configuration.h +++ b/deps/openssl/android/arm64-v8a/usr/local/include/openssl/configuration.h @@ -40,6 +40,18 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif +# ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +# endif +# ifndef OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC +# endif +# ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +# endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -49,15 +61,36 @@ extern "C" { # ifndef OPENSSL_NO_DEVCRYPTOENG # define OPENSSL_NO_DEVCRYPTOENG # endif +# ifndef OPENSSL_NO_DGRAM +# define OPENSSL_NO_DGRAM +# endif +# ifndef OPENSSL_NO_DSO +# define OPENSSL_NO_DSO +# endif +# ifndef OPENSSL_NO_DTLS +# define OPENSSL_NO_DTLS +# endif +# ifndef OPENSSL_NO_DTLS1 +# define OPENSSL_NO_DTLS1 +# endif +# ifndef OPENSSL_NO_DTLS1_2 +# define OPENSSL_NO_DTLS1_2 +# endif # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 # define OPENSSL_NO_EC_NISTP_64_GCC_128 # endif # ifndef OPENSSL_NO_EGD # define OPENSSL_NO_EGD # endif +# ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +# endif # ifndef OPENSSL_NO_EXTERNAL_TESTS # define OPENSSL_NO_EXTERNAL_TESTS # endif +# ifndef OPENSSL_NO_FILENAMES +# define OPENSSL_NO_FILENAMES +# endif # ifndef OPENSSL_NO_FIPS_SECURITYCHECKS # define OPENSSL_NO_FIPS_SECURITYCHECKS # endif @@ -67,6 +100,9 @@ extern "C" { # ifndef OPENSSL_NO_FUZZ_LIBFUZZER # define OPENSSL_NO_FUZZ_LIBFUZZER # endif +# ifndef OPENSSL_NO_IDEA +# define OPENSSL_NO_IDEA +# endif # ifndef OPENSSL_NO_KTLS # define OPENSSL_NO_KTLS # endif @@ -76,15 +112,30 @@ extern "C" { # ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 # endif +# ifndef OPENSSL_NO_MD4 +# define OPENSSL_NO_MD4 +# endif # ifndef OPENSSL_NO_MSAN # define OPENSSL_NO_MSAN # endif +# ifndef OPENSSL_NO_MULTIBLOCK +# define OPENSSL_NO_MULTIBLOCK +# endif +# ifndef OPENSSL_NO_PADLOCKENG +# define OPENSSL_NO_PADLOCKENG +# endif +# ifndef OPENSSL_NO_PSK +# define OPENSSL_NO_PSK +# endif # ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 # endif # ifndef OPENSSL_NO_SCTP # define OPENSSL_NO_SCTP # endif +# ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +# endif # ifndef OPENSSL_NO_SSL3 # define OPENSSL_NO_SSL3 # endif diff --git a/deps/openssl/android/arm64-v8a/usr/local/lib/libcrypto.a b/deps/openssl/android/arm64-v8a/usr/local/lib/libcrypto.a index 98ed61b1..4863e40d 100644 Binary files a/deps/openssl/android/arm64-v8a/usr/local/lib/libcrypto.a and b/deps/openssl/android/arm64-v8a/usr/local/lib/libcrypto.a differ diff --git a/deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a b/deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a index 04efe433..0f7c8969 100644 Binary files a/deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a and b/deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a differ diff --git a/deps/openssl/android/armeabi-v7a/usr/local/include/crypto/dso_conf.h b/deps/openssl/android/armeabi-v7a/usr/local/include/crypto/dso_conf.h index 795dfa0f..6d9c478c 100644 --- a/deps/openssl/android/armeabi-v7a/usr/local/include/crypto/dso_conf.h +++ b/deps/openssl/android/armeabi-v7a/usr/local/include/crypto/dso_conf.h @@ -13,7 +13,6 @@ # define OSSL_CRYPTO_DSO_CONF_H # pragma once -# define DSO_DLFCN -# define HAVE_DLFCN_H +# define DSO_NONE # define DSO_EXTENSION ".so" #endif diff --git a/deps/openssl/android/armeabi-v7a/usr/local/include/openssl/configuration.h b/deps/openssl/android/armeabi-v7a/usr/local/include/openssl/configuration.h index cd21037c..2a8b7c4d 100644 --- a/deps/openssl/android/armeabi-v7a/usr/local/include/openssl/configuration.h +++ b/deps/openssl/android/armeabi-v7a/usr/local/include/openssl/configuration.h @@ -31,9 +31,6 @@ extern "C" { # ifndef OPENSSL_RAND_SEED_OS # define OPENSSL_RAND_SEED_OS # endif -# ifndef OPENSSL_THREADS -# define OPENSSL_THREADS -# endif # ifndef OPENSSL_NO_ACVP_TESTS # define OPENSSL_NO_ACVP_TESTS # endif @@ -43,6 +40,18 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif +# ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +# endif +# ifndef OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC +# endif +# ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +# endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -52,15 +61,36 @@ extern "C" { # ifndef OPENSSL_NO_DEVCRYPTOENG # define OPENSSL_NO_DEVCRYPTOENG # endif +# ifndef OPENSSL_NO_DGRAM +# define OPENSSL_NO_DGRAM +# endif +# ifndef OPENSSL_NO_DSO +# define OPENSSL_NO_DSO +# endif +# ifndef OPENSSL_NO_DTLS +# define OPENSSL_NO_DTLS +# endif +# ifndef OPENSSL_NO_DTLS1 +# define OPENSSL_NO_DTLS1 +# endif +# ifndef OPENSSL_NO_DTLS1_2 +# define OPENSSL_NO_DTLS1_2 +# endif # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 # define OPENSSL_NO_EC_NISTP_64_GCC_128 # endif # ifndef OPENSSL_NO_EGD # define OPENSSL_NO_EGD # endif +# ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +# endif # ifndef OPENSSL_NO_EXTERNAL_TESTS # define OPENSSL_NO_EXTERNAL_TESTS # endif +# ifndef OPENSSL_NO_FILENAMES +# define OPENSSL_NO_FILENAMES +# endif # ifndef OPENSSL_NO_FIPS_SECURITYCHECKS # define OPENSSL_NO_FIPS_SECURITYCHECKS # endif @@ -70,21 +100,42 @@ extern "C" { # ifndef OPENSSL_NO_FUZZ_LIBFUZZER # define OPENSSL_NO_FUZZ_LIBFUZZER # endif +# ifndef OPENSSL_NO_IDEA +# define OPENSSL_NO_IDEA +# endif # ifndef OPENSSL_NO_KTLS # define OPENSSL_NO_KTLS # endif +# ifndef OPENSSL_NO_LOADERENG +# define OPENSSL_NO_LOADERENG +# endif # ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 # endif +# ifndef OPENSSL_NO_MD4 +# define OPENSSL_NO_MD4 +# endif # ifndef OPENSSL_NO_MSAN # define OPENSSL_NO_MSAN # endif +# ifndef OPENSSL_NO_MULTIBLOCK +# define OPENSSL_NO_MULTIBLOCK +# endif +# ifndef OPENSSL_NO_PADLOCKENG +# define OPENSSL_NO_PADLOCKENG +# endif +# ifndef OPENSSL_NO_PSK +# define OPENSSL_NO_PSK +# endif # ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 # endif # ifndef OPENSSL_NO_SCTP # define OPENSSL_NO_SCTP # endif +# ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +# endif # ifndef OPENSSL_NO_SSL3 # define OPENSSL_NO_SSL3 # endif @@ -109,8 +160,8 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_STATIC_ENGINE -# define OPENSSL_NO_STATIC_ENGINE +# ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE # endif diff --git a/deps/openssl/android/x86/usr/local/include/crypto/dso_conf.h b/deps/openssl/android/x86/usr/local/include/crypto/dso_conf.h index 795dfa0f..6d9c478c 100644 --- a/deps/openssl/android/x86/usr/local/include/crypto/dso_conf.h +++ b/deps/openssl/android/x86/usr/local/include/crypto/dso_conf.h @@ -13,7 +13,6 @@ # define OSSL_CRYPTO_DSO_CONF_H # pragma once -# define DSO_DLFCN -# define HAVE_DLFCN_H +# define DSO_NONE # define DSO_EXTENSION ".so" #endif diff --git a/deps/openssl/android/x86/usr/local/include/openssl/configuration.h b/deps/openssl/android/x86/usr/local/include/openssl/configuration.h index 1e3f8c46..64de3940 100644 --- a/deps/openssl/android/x86/usr/local/include/openssl/configuration.h +++ b/deps/openssl/android/x86/usr/local/include/openssl/configuration.h @@ -31,9 +31,6 @@ extern "C" { # ifndef OPENSSL_RAND_SEED_OS # define OPENSSL_RAND_SEED_OS # endif -# ifndef OPENSSL_THREADS -# define OPENSSL_THREADS -# endif # ifndef OPENSSL_NO_ACVP_TESTS # define OPENSSL_NO_ACVP_TESTS # endif @@ -43,6 +40,18 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif +# ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +# endif +# ifndef OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC +# endif +# ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +# endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -52,15 +61,36 @@ extern "C" { # ifndef OPENSSL_NO_DEVCRYPTOENG # define OPENSSL_NO_DEVCRYPTOENG # endif +# ifndef OPENSSL_NO_DGRAM +# define OPENSSL_NO_DGRAM +# endif +# ifndef OPENSSL_NO_DSO +# define OPENSSL_NO_DSO +# endif +# ifndef OPENSSL_NO_DTLS +# define OPENSSL_NO_DTLS +# endif +# ifndef OPENSSL_NO_DTLS1 +# define OPENSSL_NO_DTLS1 +# endif +# ifndef OPENSSL_NO_DTLS1_2 +# define OPENSSL_NO_DTLS1_2 +# endif # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 # define OPENSSL_NO_EC_NISTP_64_GCC_128 # endif # ifndef OPENSSL_NO_EGD # define OPENSSL_NO_EGD # endif +# ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +# endif # ifndef OPENSSL_NO_EXTERNAL_TESTS # define OPENSSL_NO_EXTERNAL_TESTS # endif +# ifndef OPENSSL_NO_FILENAMES +# define OPENSSL_NO_FILENAMES +# endif # ifndef OPENSSL_NO_FIPS_SECURITYCHECKS # define OPENSSL_NO_FIPS_SECURITYCHECKS # endif @@ -70,21 +100,42 @@ extern "C" { # ifndef OPENSSL_NO_FUZZ_LIBFUZZER # define OPENSSL_NO_FUZZ_LIBFUZZER # endif +# ifndef OPENSSL_NO_IDEA +# define OPENSSL_NO_IDEA +# endif # ifndef OPENSSL_NO_KTLS # define OPENSSL_NO_KTLS # endif +# ifndef OPENSSL_NO_LOADERENG +# define OPENSSL_NO_LOADERENG +# endif # ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 # endif +# ifndef OPENSSL_NO_MD4 +# define OPENSSL_NO_MD4 +# endif # ifndef OPENSSL_NO_MSAN # define OPENSSL_NO_MSAN # endif +# ifndef OPENSSL_NO_MULTIBLOCK +# define OPENSSL_NO_MULTIBLOCK +# endif +# ifndef OPENSSL_NO_PADLOCKENG +# define OPENSSL_NO_PADLOCKENG +# endif +# ifndef OPENSSL_NO_PSK +# define OPENSSL_NO_PSK +# endif # ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 # endif # ifndef OPENSSL_NO_SCTP # define OPENSSL_NO_SCTP # endif +# ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +# endif # ifndef OPENSSL_NO_SSL3 # define OPENSSL_NO_SSL3 # endif @@ -109,8 +160,8 @@ extern "C" { # ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS # endif -# ifndef OPENSSL_NO_STATIC_ENGINE -# define OPENSSL_NO_STATIC_ENGINE +# ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE # endif diff --git a/deps/openssl/android/x86_64/usr/local/include/crypto/dso_conf.h b/deps/openssl/android/x86_64/usr/local/include/crypto/dso_conf.h index 795dfa0f..6d9c478c 100644 --- a/deps/openssl/android/x86_64/usr/local/include/crypto/dso_conf.h +++ b/deps/openssl/android/x86_64/usr/local/include/crypto/dso_conf.h @@ -13,7 +13,6 @@ # define OSSL_CRYPTO_DSO_CONF_H # pragma once -# define DSO_DLFCN -# define HAVE_DLFCN_H +# define DSO_NONE # define DSO_EXTENSION ".so" #endif diff --git a/deps/openssl/android/x86_64/usr/local/include/openssl/configuration.h b/deps/openssl/android/x86_64/usr/local/include/openssl/configuration.h index 227149ee..87e4c921 100644 --- a/deps/openssl/android/x86_64/usr/local/include/openssl/configuration.h +++ b/deps/openssl/android/x86_64/usr/local/include/openssl/configuration.h @@ -40,6 +40,18 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif +# ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +# endif +# ifndef OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC +# endif +# ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +# endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif @@ -49,15 +61,36 @@ extern "C" { # ifndef OPENSSL_NO_DEVCRYPTOENG # define OPENSSL_NO_DEVCRYPTOENG # endif +# ifndef OPENSSL_NO_DGRAM +# define OPENSSL_NO_DGRAM +# endif +# ifndef OPENSSL_NO_DSO +# define OPENSSL_NO_DSO +# endif +# ifndef OPENSSL_NO_DTLS +# define OPENSSL_NO_DTLS +# endif +# ifndef OPENSSL_NO_DTLS1 +# define OPENSSL_NO_DTLS1 +# endif +# ifndef OPENSSL_NO_DTLS1_2 +# define OPENSSL_NO_DTLS1_2 +# endif # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 # define OPENSSL_NO_EC_NISTP_64_GCC_128 # endif # ifndef OPENSSL_NO_EGD # define OPENSSL_NO_EGD # endif +# ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +# endif # ifndef OPENSSL_NO_EXTERNAL_TESTS # define OPENSSL_NO_EXTERNAL_TESTS # endif +# ifndef OPENSSL_NO_FILENAMES +# define OPENSSL_NO_FILENAMES +# endif # ifndef OPENSSL_NO_FIPS_SECURITYCHECKS # define OPENSSL_NO_FIPS_SECURITYCHECKS # endif @@ -67,6 +100,9 @@ extern "C" { # ifndef OPENSSL_NO_FUZZ_LIBFUZZER # define OPENSSL_NO_FUZZ_LIBFUZZER # endif +# ifndef OPENSSL_NO_IDEA +# define OPENSSL_NO_IDEA +# endif # ifndef OPENSSL_NO_KTLS # define OPENSSL_NO_KTLS # endif @@ -76,15 +112,30 @@ extern "C" { # ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 # endif +# ifndef OPENSSL_NO_MD4 +# define OPENSSL_NO_MD4 +# endif # ifndef OPENSSL_NO_MSAN # define OPENSSL_NO_MSAN # endif +# ifndef OPENSSL_NO_MULTIBLOCK +# define OPENSSL_NO_MULTIBLOCK +# endif +# ifndef OPENSSL_NO_PADLOCKENG +# define OPENSSL_NO_PADLOCKENG +# endif +# ifndef OPENSSL_NO_PSK +# define OPENSSL_NO_PSK +# endif # ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 # endif # ifndef OPENSSL_NO_SCTP # define OPENSSL_NO_SCTP # endif +# ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +# endif # ifndef OPENSSL_NO_SSL3 # define OPENSSL_NO_SSL3 # endif diff --git a/deps/openssl/android/x86_64/usr/local/lib/libcrypto.a b/deps/openssl/android/x86_64/usr/local/lib/libcrypto.a index 82a8f775..8bbfc53d 100644 Binary files a/deps/openssl/android/x86_64/usr/local/lib/libcrypto.a and b/deps/openssl/android/x86_64/usr/local/lib/libcrypto.a differ diff --git a/deps/openssl/android/x86_64/usr/local/lib/libssl.a b/deps/openssl/android/x86_64/usr/local/lib/libssl.a index f5464645..6cd04443 100644 Binary files a/deps/openssl/android/x86_64/usr/local/lib/libssl.a and b/deps/openssl/android/x86_64/usr/local/lib/libssl.a differ diff --git a/tools/ssl-android b/tools/ssl-android index 3d209d82..84ec7c6a 100755 --- a/tools/ssl-android +++ b/tools/ssl-android @@ -29,8 +29,9 @@ build_the_thing() { TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64 export PATH=$TOOLCHAIN/$TRIBLE/bin:$TOOLCHAIN/bin:$PATH echo $PATH - echo "./Configure $SSL_TARGET $OPTIONS -fuse-ld=$TOOLCHAIN/bin/ld" && \ - ./Configure $SSL_TARGET $OPTIONS -fuse-ld=$TOOLCHAIN/bin/ld no-tests && \ + export GLOBAL_OPTIONS="no-trace no-asm no-threads no-md2 no-md4 no-dso no-async no-multiblock no-dgram no-filenames no-shared no-ssl3 no-engine no-dynamic-engine no-zlib no-comp no-psk no-idea no-srp no-weak-ssl-ciphers no-dtls no-egd no-tests -Os" + echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS -fuse-ld=$TOOLCHAIN/bin/ld" && \ + ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS -fuse-ld=$TOOLCHAIN/bin/ld no-tests && \ make clean && \ make build_generated && \ make libcrypto.a libssl.a || exit 128 @@ -45,14 +46,14 @@ do case $build_target in armeabi-v7a) TRIBLE="arm-linux-androideabi" - OPTIONS="--target=armv7a-linux-androideabi -Wl,--fix-cortex-a8 -fPIC -D__ANDROID_API__=$API_LEVEL -Wno-macro-redefined" + OPTIONS="--target=armv7a-linux-androideabi -ffunction-sections -fdata-sections -Wl,--fix-cortex-a8 -fPIC -D__ANDROID_API__=$API_LEVEL -Wno-macro-redefined" DESTDIR="/tmp/$BUILD_DIR/armeabi-v7a" SSL_TARGET="android-arm" CC=clang ;; x86) TRIBLE="i686-linux-android" - OPTIONS="-fPIC -D__ANDROID_API__=${API_LEVEL} -Wno-macro-redefined" + OPTIONS="-fPIC -ffunction-sections -fdata-sections -D__ANDROID_API__=${API_LEVEL} -Wno-macro-redefined" DESTDIR="/tmp/$BUILD_DIR/x86" SSL_TARGET="android-x86" CC=clang