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 86e4e88..ae5fa00 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 4c565aa..4bc1a79 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 80afb57..6cd2e90 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 8d98ccc..9444f67 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 1d8218e..a2a5658 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 57ef94d..5967021 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 115f3b8..768e4f2 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 687fa0f..0529c38 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 a439fe3..8c1b0f7 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.1k"]=~/android/ndk/21.4.7075529 ["1.0.2u"]=~/android/android-ndk-r10e ) +declare -A ssl_versions=( ["1.1.1l"]=~/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 79dc83d..5344a5a 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 f92e4f1..32f7d89 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 0474aea..09d584f 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 6a41e67..158d088 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 8ca40db..8664ef9 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 37bf9f3..f38a5c6 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 8bb559a..6a1ed04 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 f8ae9b0..2a2ca66 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 0446425..b6490f5 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 501a4aa..53bbced 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 0b1f950..9154e87 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 4fead34..edfabc4 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 c023012..02feeaa 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 a32f9f2..eb8f804 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 8f9a1f5..06fc00f 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 414cfe1..109bd2e 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 9acc08a..3740432 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 bb26af8..75502df 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 d6fcb5f..df27697 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 25467cf..3a4c3d8 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 1b26b0f..ee6e3ab 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 673d1ff..931fcef 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 1db9764..4cd8088 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 5e25e21..68dd4cf 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/e_os2.h b/no-asm/static/include/openssl/e_os2.h index cf308ee..5c88e51 100644 --- a/no-asm/static/include/openssl/e_os2.h +++ b/no-asm/static/include/openssl/e_os2.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -279,7 +279,8 @@ typedef unsigned __int64 uint64_t; # define ossl_inline inline # endif -# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L +# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \ + !defined(__cplusplus) # define ossl_noreturn _Noreturn # elif defined(__GNUC__) && __GNUC__ >= 2 # define ossl_noreturn __attribute__((noreturn)) diff --git a/no-asm/static/include/openssl/opensslv.h b/no-asm/static/include/openssl/opensslv.h index 0cd6b2f..cbbfab1 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 0x101010bfL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1k 25 Mar 2021" +# define OPENSSL_VERSION_NUMBER 0x101010cfL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1l 24 Aug 2021" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/no-asm/static/include/openssl/sslerr.h b/no-asm/static/include/openssl/sslerr.h index 82983d3..701d61c 100644 --- a/no-asm/static/include/openssl/sslerr.h +++ b/no-asm/static/include/openssl/sslerr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -70,6 +70,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_FINAL_EMS 486 # define SSL_F_FINAL_KEY_SHARE 503 # define SSL_F_FINAL_MAXFRAGMENTLEN 557 +# define SSL_F_FINAL_PSK 639 # define SSL_F_FINAL_RENEGOTIATE 483 # define SSL_F_FINAL_SERVER_NAME 558 # define SSL_F_FINAL_SIG_ALGS 497 @@ -592,6 +593,7 @@ int ERR_load_SSL_strings(void); # define SSL_R_MISSING_ECDSA_SIGNING_CERT 381 # define SSL_R_MISSING_FATAL 256 # define SSL_R_MISSING_PARAMETERS 290 +# define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION 310 # define SSL_R_MISSING_RSA_CERTIFICATE 168 # define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169 # define SSL_R_MISSING_RSA_SIGNING_CERT 170 @@ -633,6 +635,7 @@ int ERR_load_SSL_strings(void); # define SSL_R_NO_VERIFY_COOKIE_CALLBACK 403 # define SSL_R_NULL_SSL_CTX 195 # define SSL_R_NULL_SSL_METHOD_PASSED 196 +# define SSL_R_OCSP_CALLBACK_FAILURE 294 # define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED 197 # define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344 # define SSL_R_OVERFLOW_ERROR 237 diff --git a/no-asm/static/include/openssl/x509v3err.h b/no-asm/static/include/openssl/x509v3err.h index 5f25442..3b9f713 100644 --- a/no-asm/static/include/openssl/x509v3err.h +++ b/no-asm/static/include/openssl/x509v3err.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -38,6 +38,7 @@ int ERR_load_X509V3_strings(void); # define X509V3_F_I2S_ASN1_IA5STRING 149 # define X509V3_F_I2S_ASN1_INTEGER 120 # define X509V3_F_I2V_AUTHORITY_INFO_ACCESS 138 +# define X509V3_F_I2V_AUTHORITY_KEYID 173 # define X509V3_F_LEVEL_ADD_NODE 168 # define X509V3_F_NOTICE_SECTION 132 # define X509V3_F_NREF_NOS 133 @@ -78,6 +79,7 @@ int ERR_load_X509V3_strings(void); # define X509V3_F_V2I_TLS_FEATURE 165 # define X509V3_F_V3_GENERIC_EXTENSION 116 # define X509V3_F_X509V3_ADD1_I2D 140 +# define X509V3_F_X509V3_ADD_LEN_VALUE 174 # define X509V3_F_X509V3_ADD_VALUE 105 # define X509V3_F_X509V3_EXT_ADD 104 # define X509V3_F_X509V3_EXT_ADD_ALIAS 106 diff --git a/no-asm/static/lib/arm/libcrypto.a b/no-asm/static/lib/arm/libcrypto.a index d383f2f..2070ea0 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 bd8be82..614047b 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 64175cf..8c432a2 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 ffcd1b6..019c587 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 64175cf..8c432a2 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 d383f2f..2070ea0 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 86acddb..c6dabf1 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 1393bff..83eade2 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 ffcd1b6..019c587 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 bd8be82..614047b 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 cd64fac..7564729 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 360b1fe..c78f1e7 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 86acddb..c6dabf1 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 cd64fac..7564729 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 1393bff..83eade2 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 360b1fe..c78f1e7 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/e_os2.h b/static/include/openssl/e_os2.h index cf308ee..5c88e51 100644 --- a/static/include/openssl/e_os2.h +++ b/static/include/openssl/e_os2.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -279,7 +279,8 @@ typedef unsigned __int64 uint64_t; # define ossl_inline inline # endif -# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L +# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \ + !defined(__cplusplus) # define ossl_noreturn _Noreturn # elif defined(__GNUC__) && __GNUC__ >= 2 # define ossl_noreturn __attribute__((noreturn)) diff --git a/static/include/openssl/opensslv.h b/static/include/openssl/opensslv.h index 0cd6b2f..cbbfab1 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 0x101010bfL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1k 25 Mar 2021" +# define OPENSSL_VERSION_NUMBER 0x101010cfL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1l 24 Aug 2021" /*- * 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 82983d3..701d61c 100644 --- a/static/include/openssl/sslerr.h +++ b/static/include/openssl/sslerr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -70,6 +70,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_FINAL_EMS 486 # define SSL_F_FINAL_KEY_SHARE 503 # define SSL_F_FINAL_MAXFRAGMENTLEN 557 +# define SSL_F_FINAL_PSK 639 # define SSL_F_FINAL_RENEGOTIATE 483 # define SSL_F_FINAL_SERVER_NAME 558 # define SSL_F_FINAL_SIG_ALGS 497 @@ -592,6 +593,7 @@ int ERR_load_SSL_strings(void); # define SSL_R_MISSING_ECDSA_SIGNING_CERT 381 # define SSL_R_MISSING_FATAL 256 # define SSL_R_MISSING_PARAMETERS 290 +# define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION 310 # define SSL_R_MISSING_RSA_CERTIFICATE 168 # define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169 # define SSL_R_MISSING_RSA_SIGNING_CERT 170 @@ -633,6 +635,7 @@ int ERR_load_SSL_strings(void); # define SSL_R_NO_VERIFY_COOKIE_CALLBACK 403 # define SSL_R_NULL_SSL_CTX 195 # define SSL_R_NULL_SSL_METHOD_PASSED 196 +# define SSL_R_OCSP_CALLBACK_FAILURE 294 # define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED 197 # define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344 # define SSL_R_OVERFLOW_ERROR 237 diff --git a/static/include/openssl/x509v3err.h b/static/include/openssl/x509v3err.h index 5f25442..3b9f713 100644 --- a/static/include/openssl/x509v3err.h +++ b/static/include/openssl/x509v3err.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -38,6 +38,7 @@ int ERR_load_X509V3_strings(void); # define X509V3_F_I2S_ASN1_IA5STRING 149 # define X509V3_F_I2S_ASN1_INTEGER 120 # define X509V3_F_I2V_AUTHORITY_INFO_ACCESS 138 +# define X509V3_F_I2V_AUTHORITY_KEYID 173 # define X509V3_F_LEVEL_ADD_NODE 168 # define X509V3_F_NOTICE_SECTION 132 # define X509V3_F_NREF_NOS 133 @@ -78,6 +79,7 @@ int ERR_load_X509V3_strings(void); # define X509V3_F_V2I_TLS_FEATURE 165 # define X509V3_F_V3_GENERIC_EXTENSION 116 # define X509V3_F_X509V3_ADD1_I2D 140 +# define X509V3_F_X509V3_ADD_LEN_VALUE 174 # define X509V3_F_X509V3_ADD_VALUE 105 # define X509V3_F_X509V3_EXT_ADD 104 # define X509V3_F_X509V3_EXT_ADD_ALIAS 106 diff --git a/static/lib/arm/libcrypto.a b/static/lib/arm/libcrypto.a index 60fca06..495ff2d 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 0698640..6119ab8 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 0b5fb5e..71bb765 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 c15c6a0..e53903c 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 0b5fb5e..71bb765 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 60fca06..495ff2d 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 a620ec8..0869bb7 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 21fac25..4e96fa3 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 c15c6a0..e53903c 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 0698640..6119ab8 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 6508ace..7d07dda 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 2c371f4..9434153 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 a620ec8..0869bb7 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 6508ace..7d07dda 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 21fac25..4e96fa3 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 2c371f4..9434153 100644 Binary files a/static/lib/x86_64/libssl.a and b/static/lib/x86_64/libssl.a differ