KDAB · carlonluca · Aug 3, 2024
diff --git a/build_ssl.sh b/build_ssl.sh
@@ -18,8 +18,8 @@ declare -A ssl_versions_output_dir=(
     ["ssl_3"]="3*"
 )
 declare -A ssl_versions_ndk=(
-    ["1.1.1u"]="$HOME/android/ndk/21.4.7075529"
-    ["3.1.1"]="$HOME/android/ndk/25.2.9519653"
+    ["1.1.1w"]="$HOME/android/ndk/21.4.7075529"
+    ["3.1.6"]="$HOME/android/ndk/25.2.9519653"
 )
 declare -A architectures=(
     ["x86_64"]="x86_64"

diff --git a/no-asm/ssl_1.1/arm64-v8a/include b/no-asm/ssl_1.1/arm64-v8a/include
@@ -1 +1 @@
-../include/
+../../ssl_1.1/include
diff --git a/no-asm/ssl_1.1/arm64-v8a/libcrypto.a b/no-asm/ssl_1.1/arm64-v8a/libcrypto.a
diff --git a/no-asm/ssl_1.1/arm64-v8a/libcrypto_1_1.so b/no-asm/ssl_1.1/arm64-v8a/libcrypto_1_1.so
diff --git a/no-asm/ssl_1.1/arm64-v8a/libssl.a b/no-asm/ssl_1.1/arm64-v8a/libssl.a
diff --git a/no-asm/ssl_1.1/arm64-v8a/libssl_1_1.so b/no-asm/ssl_1.1/arm64-v8a/libssl_1_1.so
diff --git a/no-asm/ssl_1.1/armeabi-v7a/include b/no-asm/ssl_1.1/armeabi-v7a/include
@@ -1 +1 @@
-../include/
+../../ssl_1.1/include
diff --git a/no-asm/ssl_1.1/armeabi-v7a/libcrypto.a b/no-asm/ssl_1.1/armeabi-v7a/libcrypto.a
diff --git a/no-asm/ssl_1.1/armeabi-v7a/libcrypto_1_1.so b/no-asm/ssl_1.1/armeabi-v7a/libcrypto_1_1.so
diff --git a/no-asm/ssl_1.1/armeabi-v7a/libssl.a b/no-asm/ssl_1.1/armeabi-v7a/libssl.a
diff --git a/no-asm/ssl_1.1/armeabi-v7a/libssl_1_1.so b/no-asm/ssl_1.1/armeabi-v7a/libssl_1_1.so
diff --git a/no-asm/ssl_1.1/include/crypto/bn_conf.h b/no-asm/ssl_1.1/include/crypto/bn_conf.h
diff --git a/no-asm/ssl_1.1/include/crypto/dso_conf.h b/no-asm/ssl_1.1/include/crypto/dso_conf.h
diff --git a/no-asm/ssl_1.1/include/openssl/dh.h b/no-asm/ssl_1.1/include/openssl/dh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -29,6 +29,9 @@ extern "C" {
 # ifndef OPENSSL_DH_MAX_MODULUS_BITS
 #  define OPENSSL_DH_MAX_MODULUS_BITS    10000
 # endif
+# ifndef OPENSSL_DH_CHECK_MAX_MODULUS_BITS
+#  define OPENSSL_DH_CHECK_MAX_MODULUS_BITS  32768
+# endif
 
 # define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
 

diff --git a/no-asm/ssl_1.1/include/openssl/dherr.h b/no-asm/ssl_1.1/include/openssl/dherr.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-2023 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
@@ -30,6 +30,7 @@ int ERR_load_DH_strings(void);
 #  define DH_F_COMPUTE_KEY                                 102
 #  define DH_F_DHPARAMS_PRINT_FP                           101
 #  define DH_F_DH_BUILTIN_GENPARAMS                        106
+#  define DH_F_DH_CHECK                                    126
 #  define DH_F_DH_CHECK_EX                                 121
 #  define DH_F_DH_CHECK_PARAMS_EX                          122
 #  define DH_F_DH_CHECK_PUB_KEY_EX                         123

diff --git a/no-asm/ssl_1.1/include/openssl/opensslconf.h b/no-asm/ssl_1.1/include/openssl/opensslconf.h
diff --git a/no-asm/ssl_1.1/include/openssl/opensslv.h b/no-asm/ssl_1.1/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  0x1010115fL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1u  30 May 2023"
+# define OPENSSL_VERSION_NUMBER  0x1010117fL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1w  11 Sep 2023"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)

diff --git a/no-asm/ssl_1.1/x86/include b/no-asm/ssl_1.1/x86/include
@@ -1 +1 @@
-../include/
+../../ssl_1.1/include
diff --git a/no-asm/ssl_1.1/x86/libcrypto.a b/no-asm/ssl_1.1/x86/libcrypto.a
diff --git a/no-asm/ssl_1.1/x86/libcrypto_1_1.so b/no-asm/ssl_1.1/x86/libcrypto_1_1.so
diff --git a/no-asm/ssl_1.1/x86/libssl.a b/no-asm/ssl_1.1/x86/libssl.a
diff --git a/no-asm/ssl_1.1/x86/libssl_1_1.so b/no-asm/ssl_1.1/x86/libssl_1_1.so
diff --git a/no-asm/ssl_1.1/x86_64/include b/no-asm/ssl_1.1/x86_64/include
@@ -1 +1 @@
-../include/
+../../ssl_1.1/include
diff --git a/no-asm/ssl_1.1/x86_64/libcrypto.a b/no-asm/ssl_1.1/x86_64/libcrypto.a
diff --git a/no-asm/ssl_1.1/x86_64/libcrypto_1_1.so b/no-asm/ssl_1.1/x86_64/libcrypto_1_1.so
diff --git a/no-asm/ssl_1.1/x86_64/libssl.a b/no-asm/ssl_1.1/x86_64/libssl.a
diff --git a/no-asm/ssl_1.1/x86_64/libssl_1_1.so b/no-asm/ssl_1.1/x86_64/libssl_1_1.so
diff --git a/no-asm/ssl_3/arm64-v8a/include b/no-asm/ssl_3/arm64-v8a/include
@@ -1 +1 @@
-../include/
+../../ssl_3/include
diff --git a/no-asm/ssl_3/arm64-v8a/libcrypto.a b/no-asm/ssl_3/arm64-v8a/libcrypto.a
diff --git a/no-asm/ssl_3/arm64-v8a/libcrypto_3.so b/no-asm/ssl_3/arm64-v8a/libcrypto_3.so
diff --git a/no-asm/ssl_3/arm64-v8a/libssl.a b/no-asm/ssl_3/arm64-v8a/libssl.a
diff --git a/no-asm/ssl_3/arm64-v8a/libssl_3.so b/no-asm/ssl_3/arm64-v8a/libssl_3.so
diff --git a/no-asm/ssl_3/armeabi-v7a/include b/no-asm/ssl_3/armeabi-v7a/include
@@ -1 +1 @@
-../include/
+../../ssl_3/include
diff --git a/no-asm/ssl_3/armeabi-v7a/libcrypto.a b/no-asm/ssl_3/armeabi-v7a/libcrypto.a
diff --git a/no-asm/ssl_3/armeabi-v7a/libcrypto_3.so b/no-asm/ssl_3/armeabi-v7a/libcrypto_3.so
diff --git a/no-asm/ssl_3/armeabi-v7a/libssl.a b/no-asm/ssl_3/armeabi-v7a/libssl.a
diff --git a/no-asm/ssl_3/armeabi-v7a/libssl_3.so b/no-asm/ssl_3/armeabi-v7a/libssl_3.so
diff --git a/no-asm/ssl_3/include/crypto/aes_platform.h b/no-asm/ssl_3/include/crypto/aes_platform.h
@@ -165,7 +165,7 @@ void gcm_ghash_v8(u64 Xi[2],const u128 Htable[16],const u8 *inp, size_t len);
 # if defined(__loongarch__) || defined(__loongarch64)
 #  include "loongarch_arch.h"
 #  if defined(VPAES_ASM)
-#   define VPAES_CAPABLE  (OPENSSL_loongarchcap_P & LOONGARCH_CFG2_LSX)
+#   define VPAES_CAPABLE  (OPENSSL_loongarch_hwcap_P & LOONGARCH_HWCAP_LSX)
 #  endif
 # endif
 

diff --git a/no-asm/ssl_3/include/crypto/bn.h b/no-asm/ssl_3/include/crypto/bn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2024 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -87,6 +87,14 @@ int bn_lshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n);
 int bn_rshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n);
 int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
                      const BIGNUM *d, BN_CTX *ctx);
+int ossl_bn_mask_bits_fixed_top(BIGNUM *a, int n);
+int ossl_bn_is_word_fixed_top(const BIGNUM *a, BN_ULONG w);
+int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
+                                      unsigned int strength, BN_CTX *ctx);
+int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
+                                    const BIGNUM *priv,
+                                    const unsigned char *message,
+                                    size_t message_len, BN_CTX *ctx);
 
 #define BN_PRIMETEST_COMPOSITE                    0
 #define BN_PRIMETEST_COMPOSITE_WITH_FACTOR        1

diff --git a/no-asm/ssl_3/include/crypto/bn_conf.h b/no-asm/ssl_3/include/crypto/bn_conf.h