Update OpenSSL to 1.1.1n

Close #29
KDAB · Jan 27, 2023 · aef7ae2 · aef7ae2
1 parent aa3c67c
commit aef7ae2
Show file tree

Hide file tree

Showing 73 changed files with 31 additions and 23 deletions.
diff --git a/Qt-5.12.4_5.13.0/arm/libcrypto.so b/Qt-5.12.4_5.13.0/arm/libcrypto.so
diff --git a/Qt-5.12.4_5.13.0/arm/libssl.so b/Qt-5.12.4_5.13.0/arm/libssl.so
diff --git a/Qt-5.12.4_5.13.0/arm64/libcrypto.so b/Qt-5.12.4_5.13.0/arm64/libcrypto.so
diff --git a/Qt-5.12.4_5.13.0/arm64/libssl.so b/Qt-5.12.4_5.13.0/arm64/libssl.so
diff --git a/Qt-5.12.4_5.13.0/x86/libcrypto.so b/Qt-5.12.4_5.13.0/x86/libcrypto.so
diff --git a/Qt-5.12.4_5.13.0/x86/libssl.so b/Qt-5.12.4_5.13.0/x86/libssl.so
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
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
diff --git 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
diff --git a/latest/arm/libssl_1_1.so b/latest/arm/libssl_1_1.so
diff --git a/latest/arm64/libcrypto_1_1.so b/latest/arm64/libcrypto_1_1.so
diff --git a/latest/arm64/libssl_1_1.so b/latest/arm64/libssl_1_1.so
diff --git a/latest/x86/libcrypto_1_1.so b/latest/x86/libcrypto_1_1.so
diff --git a/latest/x86/libssl_1_1.so b/latest/x86/libssl_1_1.so
diff --git a/latest/x86_64/libcrypto_1_1.so b/latest/x86_64/libcrypto_1_1.so
diff --git a/latest/x86_64/libssl_1_1.so b/latest/x86_64/libssl_1_1.so
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
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
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
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
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
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
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
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
diff --git a/no-asm/latest/arm/libcrypto_1_1.so b/no-asm/latest/arm/libcrypto_1_1.so
diff --git a/no-asm/latest/arm/libssl_1_1.so b/no-asm/latest/arm/libssl_1_1.so
diff --git a/no-asm/latest/arm64/libcrypto_1_1.so b/no-asm/latest/arm64/libcrypto_1_1.so
diff --git a/no-asm/latest/arm64/libssl_1_1.so b/no-asm/latest/arm64/libssl_1_1.so
diff --git a/no-asm/latest/x86/libcrypto_1_1.so b/no-asm/latest/x86/libcrypto_1_1.so
diff --git a/no-asm/latest/x86/libssl_1_1.so b/no-asm/latest/x86/libssl_1_1.so
diff --git a/no-asm/latest/x86_64/libcrypto_1_1.so b/no-asm/latest/x86_64/libcrypto_1_1.so
diff --git a/no-asm/latest/x86_64/libssl_1_1.so b/no-asm/latest/x86_64/libssl_1_1.so
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/no-asm/static/lib/arm/libssl.a b/no-asm/static/lib/arm/libssl.a
diff --git a/no-asm/static/lib/arm64/libcrypto.a b/no-asm/static/lib/arm64/libcrypto.a
diff --git a/no-asm/static/lib/arm64/libssl.a b/no-asm/static/lib/arm64/libssl.a
diff --git a/no-asm/static/lib/multiabi/libcrypto_arm64-v8a.a b/no-asm/static/lib/multiabi/libcrypto_arm64-v8a.a
diff --git a/no-asm/static/lib/multiabi/libcrypto_armeabi-v7a.a b/no-asm/static/lib/multiabi/libcrypto_armeabi-v7a.a
diff --git a/no-asm/static/lib/multiabi/libcrypto_x86.a b/no-asm/static/lib/multiabi/libcrypto_x86.a
diff --git a/no-asm/static/lib/multiabi/libcrypto_x86_64.a b/no-asm/static/lib/multiabi/libcrypto_x86_64.a
diff --git a/no-asm/static/lib/multiabi/libssl_arm64-v8a.a b/no-asm/static/lib/multiabi/libssl_arm64-v8a.a
diff --git a/no-asm/static/lib/multiabi/libssl_armeabi-v7a.a b/no-asm/static/lib/multiabi/libssl_armeabi-v7a.a
diff --git a/no-asm/static/lib/multiabi/libssl_x86.a b/no-asm/static/lib/multiabi/libssl_x86.a
diff --git a/no-asm/static/lib/multiabi/libssl_x86_64.a b/no-asm/static/lib/multiabi/libssl_x86_64.a
diff --git a/no-asm/static/lib/x86/libcrypto.a b/no-asm/static/lib/x86/libcrypto.a
diff --git a/no-asm/static/lib/x86/libssl.a b/no-asm/static/lib/x86/libssl.a
diff --git a/no-asm/static/lib/x86_64/libcrypto.a b/no-asm/static/lib/x86_64/libcrypto.a
diff --git a/no-asm/static/lib/x86_64/libssl.a b/no-asm/static/lib/x86_64/libssl.a
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/static/lib/arm/libssl.a b/static/lib/arm/libssl.a
diff --git a/static/lib/arm64/libcrypto.a b/static/lib/arm64/libcrypto.a
diff --git a/static/lib/arm64/libssl.a b/static/lib/arm64/libssl.a
diff --git a/static/lib/multiabi/libcrypto_arm64-v8a.a b/static/lib/multiabi/libcrypto_arm64-v8a.a
diff --git a/static/lib/multiabi/libcrypto_armeabi-v7a.a b/static/lib/multiabi/libcrypto_armeabi-v7a.a
diff --git a/static/lib/multiabi/libcrypto_x86.a b/static/lib/multiabi/libcrypto_x86.a
diff --git a/static/lib/multiabi/libcrypto_x86_64.a b/static/lib/multiabi/libcrypto_x86_64.a
diff --git a/static/lib/multiabi/libssl_arm64-v8a.a b/static/lib/multiabi/libssl_arm64-v8a.a
diff --git a/static/lib/multiabi/libssl_armeabi-v7a.a b/static/lib/multiabi/libssl_armeabi-v7a.a
diff --git a/static/lib/multiabi/libssl_x86.a b/static/lib/multiabi/libssl_x86.a
diff --git a/static/lib/multiabi/libssl_x86_64.a b/static/lib/multiabi/libssl_x86_64.a
diff --git a/static/lib/x86/libcrypto.a b/static/lib/x86/libcrypto.a
diff --git a/static/lib/x86/libssl.a b/static/lib/x86/libssl.a
diff --git a/static/lib/x86_64/libcrypto.a b/static/lib/x86_64/libcrypto.a
diff --git a/static/lib/x86_64/libssl.a b/static/lib/x86_64/libssl.a