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 ae5fa00..3e3a034 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 4bc1a79..7e9f16c 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 6cd2e90..73a1638 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 9444f67..2873df2 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 a2a5658..bd897a1 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 5967021..cc616e8 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 768e4f2..66ef68f 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 0529c38..9787dcf 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 8c1b0f7..2e7b076 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.1l"]=~/android/ndk/21.4.7075529 ["1.0.2u"]=~/android/android-ndk-r10e ) +declare -A ssl_versions=( ["1.1.1n"]=~/android/ndk/21.4.7075529 ["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 5344a5a..0efa077 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 32f7d89..a6e4da2 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 09d584f..248ea80 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 158d088..3e49313 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 8664ef9..733859f 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 f38a5c6..8af22ce 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 6a1ed04..e4d699c 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 2a2ca66..0a4a380 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 b6490f5..6c76639 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 53bbced..3a71e9c 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 9154e87..3fbcf87 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 edfabc4..4804958 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 02feeaa..2d261bc 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 eb8f804..cb44728 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 06fc00f..848e463 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 109bd2e..bdf7a63 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 3740432..c8f3ddc 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 75502df..8f2a493 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 df27697..6f22a19 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 3a4c3d8..f283b88 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 ee6e3ab..1948c2b 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 931fcef..341f4c1 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 4cd8088..386961e 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 68dd4cf..aae24b5 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/ec.h b/no-asm/static/include/openssl/ec.h index 44cc139..24baf53 100644 --- a/no-asm/static/include/openssl/ec.h +++ b/no-asm/static/include/openssl/ec.h @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the OpenSSL license (the "License"). You may not use @@ -793,12 +793,15 @@ int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1, EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len); int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out); -# define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x) -# define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x) -# define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \ - (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x)) -# define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \ - (unsigned char *)(x)) +# define d2i_ECPKParameters_bio(bp,x) \ + ASN1_d2i_bio_of(EC_GROUP, NULL, d2i_ECPKParameters, bp, x) +# define i2d_ECPKParameters_bio(bp,x) \ + ASN1_i2d_bio_of_const(EC_GROUP, i2d_ECPKParameters, bp, x) +# define d2i_ECPKParameters_fp(fp,x) \ + (EC_GROUP *)ASN1_d2i_fp(NULL, (d2i_of_void *)d2i_ECPKParameters, (fp), \ + (void **)(x)) +# define i2d_ECPKParameters_fp(fp,x) \ + ASN1_i2d_fp((i2d_of_void *)i2d_ECPKParameters, (fp), (void *)(x)) int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off); # ifndef OPENSSL_NO_STDIO diff --git a/no-asm/static/include/openssl/engine.h b/no-asm/static/include/openssl/engine.h index 0780f0f..d707eae 100644 --- a/no-asm/static/include/openssl/engine.h +++ b/no-asm/static/include/openssl/engine.h @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the OpenSSL license (the "License"). You may not use @@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id, CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \ fns->mem_fns.realloc_fn, \ fns->mem_fns.free_fn); \ + OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \ skip_cbs: \ if (!fn(e, id)) return 0; \ return 1; } diff --git a/no-asm/static/include/openssl/obj_mac.h b/no-asm/static/include/openssl/obj_mac.h index eb812ed..53516a0 100644 --- a/no-asm/static/include/openssl/obj_mac.h +++ b/no-asm/static/include/openssl/obj_mac.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by crypto/objects/objects.pl * - * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2022 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 * in the file LICENSE in the source distribution or at diff --git a/no-asm/static/include/openssl/opensslv.h b/no-asm/static/include/openssl/opensslv.h index cbbfab1..c486264 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 0x101010cfL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1l 24 Aug 2021" +# define OPENSSL_VERSION_NUMBER 0x101010efL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1n 15 Mar 2022" /*- * 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 2070ea0..9f08650 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 614047b..1308c3b 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 8c432a2..66da16e 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 019c587..a32e26e 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 8c432a2..66da16e 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 2070ea0..9f08650 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 c6dabf1..614a430 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 83eade2..e8d7495 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 019c587..a32e26e 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 614047b..1308c3b 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 7564729..4457b3a 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 c78f1e7..3895005 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 c6dabf1..614a430 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 7564729..4457b3a 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 83eade2..e8d7495 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 c78f1e7..3895005 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/ec.h b/static/include/openssl/ec.h index 44cc139..24baf53 100644 --- a/static/include/openssl/ec.h +++ b/static/include/openssl/ec.h @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the OpenSSL license (the "License"). You may not use @@ -793,12 +793,15 @@ int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1, EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len); int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out); -# define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x) -# define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x) -# define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \ - (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x)) -# define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \ - (unsigned char *)(x)) +# define d2i_ECPKParameters_bio(bp,x) \ + ASN1_d2i_bio_of(EC_GROUP, NULL, d2i_ECPKParameters, bp, x) +# define i2d_ECPKParameters_bio(bp,x) \ + ASN1_i2d_bio_of_const(EC_GROUP, i2d_ECPKParameters, bp, x) +# define d2i_ECPKParameters_fp(fp,x) \ + (EC_GROUP *)ASN1_d2i_fp(NULL, (d2i_of_void *)d2i_ECPKParameters, (fp), \ + (void **)(x)) +# define i2d_ECPKParameters_fp(fp,x) \ + ASN1_i2d_fp((i2d_of_void *)i2d_ECPKParameters, (fp), (void *)(x)) int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off); # ifndef OPENSSL_NO_STDIO diff --git a/static/include/openssl/engine.h b/static/include/openssl/engine.h index 0780f0f..d707eae 100644 --- a/static/include/openssl/engine.h +++ b/static/include/openssl/engine.h @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the OpenSSL license (the "License"). You may not use @@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id, CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \ fns->mem_fns.realloc_fn, \ fns->mem_fns.free_fn); \ + OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \ skip_cbs: \ if (!fn(e, id)) return 0; \ return 1; } diff --git a/static/include/openssl/obj_mac.h b/static/include/openssl/obj_mac.h index eb812ed..53516a0 100644 --- a/static/include/openssl/obj_mac.h +++ b/static/include/openssl/obj_mac.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by crypto/objects/objects.pl * - * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2022 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 * in the file LICENSE in the source distribution or at diff --git a/static/include/openssl/opensslv.h b/static/include/openssl/opensslv.h index cbbfab1..c486264 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 0x101010cfL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1l 24 Aug 2021" +# define OPENSSL_VERSION_NUMBER 0x101010efL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1n 15 Mar 2022" /*- * 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 495ff2d..255e074 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 6119ab8..173d234 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 71bb765..590d7ae 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 e53903c..e4adefe 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 71bb765..590d7ae 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 495ff2d..255e074 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 0869bb7..b4d4388 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 4e96fa3..a999c99 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 e53903c..e4adefe 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 6119ab8..173d234 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 7d07dda..c4feec0 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 9434153..83003c2 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 0869bb7..b4d4388 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 7d07dda..c4feec0 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 4e96fa3..a999c99 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 9434153..83003c2 100644 Binary files a/static/lib/x86_64/libssl.a and b/static/lib/x86_64/libssl.a differ