diff --git a/build_ssl.sh b/build_ssl.sh index 15cce7f..671a74d 100755 --- a/build_ssl.sh +++ b/build_ssl.sh @@ -12,8 +12,8 @@ declare -A ssl_versions_output_dir=( ["ssl_3"]="3.1*" ) declare -A ssl_versions_ndk=( - ["1.1.1t"]="$HOME/android/ndk/25.1.8937393" - ["3.1.0"]="$HOME/android/ndk/25.1.8937393" + ["1.1.1u"]="$HOME/android/ndk/21.4.7075529" + ["3.1.1"]="$HOME/android/ndk/25.2.9519653" ) declare -A architectures=( ["x86_64"]="x86_64" @@ -62,10 +62,10 @@ configure_ssl() { done case $ssl_version in - 1.1.1t) + 1.1.1*) ANDROID_API=21 ;; - 3.1.0) + 3.1.*) ANDROID_API=23 ;; esac diff --git a/no-asm/ssl_1.1/arm64-v8a/libcrypto.a b/no-asm/ssl_1.1/arm64-v8a/libcrypto.a index cf3f9df..3c880e0 100644 Binary files a/no-asm/ssl_1.1/arm64-v8a/libcrypto.a and b/no-asm/ssl_1.1/arm64-v8a/libcrypto.a differ 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 index ee7c00e..ad3d613 100755 Binary files a/no-asm/ssl_1.1/arm64-v8a/libcrypto_1_1.so and b/no-asm/ssl_1.1/arm64-v8a/libcrypto_1_1.so differ diff --git a/no-asm/ssl_1.1/arm64-v8a/libssl.a b/no-asm/ssl_1.1/arm64-v8a/libssl.a index fd315bc..0c96e27 100644 Binary files a/no-asm/ssl_1.1/arm64-v8a/libssl.a and b/no-asm/ssl_1.1/arm64-v8a/libssl.a differ 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 index f36b272..af62c55 100755 Binary files a/no-asm/ssl_1.1/arm64-v8a/libssl_1_1.so and b/no-asm/ssl_1.1/arm64-v8a/libssl_1_1.so differ diff --git a/no-asm/ssl_1.1/armeabi-v7a/libcrypto.a b/no-asm/ssl_1.1/armeabi-v7a/libcrypto.a index 1b8d498..2d3a226 100644 Binary files a/no-asm/ssl_1.1/armeabi-v7a/libcrypto.a and b/no-asm/ssl_1.1/armeabi-v7a/libcrypto.a differ 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 index 9890c27..1e2403e 100755 Binary files a/no-asm/ssl_1.1/armeabi-v7a/libcrypto_1_1.so and b/no-asm/ssl_1.1/armeabi-v7a/libcrypto_1_1.so differ diff --git a/no-asm/ssl_1.1/armeabi-v7a/libssl.a b/no-asm/ssl_1.1/armeabi-v7a/libssl.a index 0e9d555..1305601 100644 Binary files a/no-asm/ssl_1.1/armeabi-v7a/libssl.a and b/no-asm/ssl_1.1/armeabi-v7a/libssl.a differ 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 index 9bcca6a..deca17e 100755 Binary files a/no-asm/ssl_1.1/armeabi-v7a/libssl_1_1.so and b/no-asm/ssl_1.1/armeabi-v7a/libssl_1_1.so differ diff --git a/no-asm/ssl_1.1/include/crypto/bn.h b/no-asm/ssl_1.1/include/crypto/bn.h index 9f866ed..250914c 100644 --- a/no-asm/ssl_1.1/include/crypto/bn.h +++ b/no-asm/ssl_1.1/include/crypto/bn.h @@ -86,10 +86,5 @@ 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_rsa_do_unblind(const BIGNUM *intermediate, - const BN_BLINDING *blinding, - const BIGNUM *possible_arg2, - const BIGNUM *to_mod, BN_CTX *ctx, - unsigned char *buf, int num); #endif diff --git a/no-asm/ssl_1.1/include/openssl/opensslv.h b/no-asm/ssl_1.1/include/openssl/opensslv.h index 7b6c212..5ed047d 100644 --- a/no-asm/ssl_1.1/include/openssl/opensslv.h +++ b/no-asm/ssl_1.1/include/openssl/opensslv.h @@ -1,5 +1,5 @@ /* - * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-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 @@ -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 0x1010114fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1t 7 Feb 2023" +# define OPENSSL_VERSION_NUMBER 0x1010115fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1u 30 May 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/no-asm/ssl_1.1/x86/libcrypto.a b/no-asm/ssl_1.1/x86/libcrypto.a index fc92a99..6b62891 100644 Binary files a/no-asm/ssl_1.1/x86/libcrypto.a and b/no-asm/ssl_1.1/x86/libcrypto.a differ diff --git a/no-asm/ssl_1.1/x86/libcrypto_1_1.so b/no-asm/ssl_1.1/x86/libcrypto_1_1.so index e04773c..a014059 100755 Binary files a/no-asm/ssl_1.1/x86/libcrypto_1_1.so and b/no-asm/ssl_1.1/x86/libcrypto_1_1.so differ diff --git a/no-asm/ssl_1.1/x86/libssl.a b/no-asm/ssl_1.1/x86/libssl.a index 8d186ab..fa7f5da 100644 Binary files a/no-asm/ssl_1.1/x86/libssl.a and b/no-asm/ssl_1.1/x86/libssl.a differ diff --git a/no-asm/ssl_1.1/x86/libssl_1_1.so b/no-asm/ssl_1.1/x86/libssl_1_1.so index 362c1e3..7c047d5 100755 Binary files a/no-asm/ssl_1.1/x86/libssl_1_1.so and b/no-asm/ssl_1.1/x86/libssl_1_1.so differ diff --git a/no-asm/ssl_1.1/x86_64/libcrypto.a b/no-asm/ssl_1.1/x86_64/libcrypto.a index 0430024..d97a7cd 100644 Binary files a/no-asm/ssl_1.1/x86_64/libcrypto.a and b/no-asm/ssl_1.1/x86_64/libcrypto.a differ 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 index 77c603c..180ed40 100755 Binary files a/no-asm/ssl_1.1/x86_64/libcrypto_1_1.so and b/no-asm/ssl_1.1/x86_64/libcrypto_1_1.so differ diff --git a/no-asm/ssl_1.1/x86_64/libssl.a b/no-asm/ssl_1.1/x86_64/libssl.a index ed58b74..7d9eec8 100644 Binary files a/no-asm/ssl_1.1/x86_64/libssl.a and b/no-asm/ssl_1.1/x86_64/libssl.a differ 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 index cfe821d..165dec5 100755 Binary files a/no-asm/ssl_1.1/x86_64/libssl_1_1.so and b/no-asm/ssl_1.1/x86_64/libssl_1_1.so differ diff --git a/no-asm/ssl_3/arm64-v8a/libcrypto.a b/no-asm/ssl_3/arm64-v8a/libcrypto.a index f79b70f..fcdc851 100644 Binary files a/no-asm/ssl_3/arm64-v8a/libcrypto.a and b/no-asm/ssl_3/arm64-v8a/libcrypto.a differ diff --git a/no-asm/ssl_3/arm64-v8a/libcrypto_3.so b/no-asm/ssl_3/arm64-v8a/libcrypto_3.so index 1690abf..3a43e1c 100755 Binary files a/no-asm/ssl_3/arm64-v8a/libcrypto_3.so and b/no-asm/ssl_3/arm64-v8a/libcrypto_3.so differ diff --git a/no-asm/ssl_3/arm64-v8a/libssl.a b/no-asm/ssl_3/arm64-v8a/libssl.a index 47c2069..2c16b4b 100644 Binary files a/no-asm/ssl_3/arm64-v8a/libssl.a and b/no-asm/ssl_3/arm64-v8a/libssl.a differ diff --git a/no-asm/ssl_3/arm64-v8a/libssl_3.so b/no-asm/ssl_3/arm64-v8a/libssl_3.so index db8b46c..c02e115 100755 Binary files a/no-asm/ssl_3/arm64-v8a/libssl_3.so and b/no-asm/ssl_3/arm64-v8a/libssl_3.so differ diff --git a/no-asm/ssl_3/armeabi-v7a/libcrypto.a b/no-asm/ssl_3/armeabi-v7a/libcrypto.a index 8e274fd..5f8bc56 100644 Binary files a/no-asm/ssl_3/armeabi-v7a/libcrypto.a and b/no-asm/ssl_3/armeabi-v7a/libcrypto.a differ diff --git a/no-asm/ssl_3/armeabi-v7a/libcrypto_3.so b/no-asm/ssl_3/armeabi-v7a/libcrypto_3.so index 2d9fd64..8c17b6e 100755 Binary files a/no-asm/ssl_3/armeabi-v7a/libcrypto_3.so and b/no-asm/ssl_3/armeabi-v7a/libcrypto_3.so differ diff --git a/no-asm/ssl_3/armeabi-v7a/libssl.a b/no-asm/ssl_3/armeabi-v7a/libssl.a index ccaad46..02c5e22 100644 Binary files a/no-asm/ssl_3/armeabi-v7a/libssl.a and b/no-asm/ssl_3/armeabi-v7a/libssl.a differ diff --git a/no-asm/ssl_3/armeabi-v7a/libssl_3.so b/no-asm/ssl_3/armeabi-v7a/libssl_3.so index a5a63d8..794c144 100755 Binary files a/no-asm/ssl_3/armeabi-v7a/libssl_3.so and b/no-asm/ssl_3/armeabi-v7a/libssl_3.so differ diff --git a/no-asm/ssl_3/include/crypto/aes_platform.h b/no-asm/ssl_3/include/crypto/aes_platform.h index 95e7e71..75aa781 100644 --- a/no-asm/ssl_3/include/crypto/aes_platform.h +++ b/no-asm/ssl_3/include/crypto/aes_platform.h @@ -74,7 +74,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len, # define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks # define HWAES_xts_encrypt aes_p8_xts_encrypt # define HWAES_xts_decrypt aes_p8_xts_decrypt -# ifndef OPENSSL_SYS_AIX +# if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX) # define PPC_AES_GCM_CAPABLE (OPENSSL_ppccap_P & PPC_MADD300) # define AES_GCM_ENC_BYTES 128 # define AES_GCM_DEC_BYTES 128 @@ -87,7 +87,7 @@ size_t ppc_aes_gcm_decrypt(const unsigned char *in, unsigned char *out, # define AES_GCM_ASM_PPC(gctx) ((gctx)->ctr==aes_p8_ctr32_encrypt_blocks && \ (gctx)->gcm.funcs.ghash==gcm_ghash_p8) void gcm_ghash_p8(u64 Xi[2],const u128 Htable[16],const u8 *inp, size_t len); -# endif /* OPENSSL_SYS_AIX */ +# endif /* OPENSSL_SYS_AIX || OPENSSL_SYS_MACOSX */ # endif /* PPC */ # if (defined(__arm__) || defined(__arm) || defined(__aarch64__)) diff --git a/no-asm/ssl_3/include/crypto/bn.h b/no-asm/ssl_3/include/crypto/bn.h index f6bfdeb..00544d9 100644 --- a/no-asm/ssl_3/include/crypto/bn.h +++ b/no-asm/ssl_3/include/crypto/bn.h @@ -116,10 +116,4 @@ OSSL_LIB_CTX *ossl_bn_get_libctx(BN_CTX *ctx); extern const BIGNUM ossl_bn_inv_sqrt_2; -int ossl_bn_rsa_do_unblind(const BIGNUM *intermediate, - const BN_BLINDING *blinding, - const BIGNUM *possible_arg2, - const BIGNUM *to_mod, BN_CTX *ctx, - unsigned char *buf, int num); - #endif diff --git a/no-asm/ssl_3/include/crypto/cmperr.h b/no-asm/ssl_3/include/crypto/cmperr.h index ac61dd4..2bd1637 100644 --- a/no-asm/ssl_3/include/crypto/cmperr.h +++ b/no-asm/ssl_3/include/crypto/cmperr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2023 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 diff --git a/no-asm/ssl_3/include/crypto/sm4_platform.h b/no-asm/ssl_3/include/crypto/sm4_platform.h index 11f9b9d..6cc1dfa 100644 --- a/no-asm/ssl_3/include/crypto/sm4_platform.h +++ b/no-asm/ssl_3/include/crypto/sm4_platform.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2022-2023 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 @@ -12,9 +12,8 @@ # pragma once # if defined(OPENSSL_CPUID_OBJ) -# if (defined(__arm__) || defined(__arm) || defined(__aarch64__)) +# if defined(__aarch64__) # include "arm_arch.h" -# if __ARM_MAX_ARCH__>=8 extern unsigned int OPENSSL_arm_midr; static inline int vpsm4_capable(void) { @@ -22,18 +21,17 @@ static inline int vpsm4_capable(void) (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1)); } -# if defined(VPSM4_ASM) -# define VPSM4_CAPABLE vpsm4_capable() -# endif -# define HWSM4_CAPABLE (OPENSSL_armcap_P & ARMV8_SM4) -# define HWSM4_set_encrypt_key sm4_v8_set_encrypt_key -# define HWSM4_set_decrypt_key sm4_v8_set_decrypt_key -# define HWSM4_encrypt sm4_v8_encrypt -# define HWSM4_decrypt sm4_v8_decrypt -# define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt -# define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt -# define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks +# if defined(VPSM4_ASM) +# define VPSM4_CAPABLE vpsm4_capable() # endif +# define HWSM4_CAPABLE (OPENSSL_armcap_P & ARMV8_SM4) +# define HWSM4_set_encrypt_key sm4_v8_set_encrypt_key +# define HWSM4_set_decrypt_key sm4_v8_set_decrypt_key +# define HWSM4_encrypt sm4_v8_encrypt +# define HWSM4_decrypt sm4_v8_decrypt +# define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt +# define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt +# define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks # endif # endif /* OPENSSL_CPUID_OBJ */ diff --git a/no-asm/ssl_3/include/openssl/cmp.h b/no-asm/ssl_3/include/openssl/cmp.h index b388e3a..4982557 100644 --- a/no-asm/ssl_3/include/openssl/cmp.h +++ b/no-asm/ssl_3/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/no-asm/ssl_3/include/openssl/cmperr.h b/no-asm/ssl_3/include/openssl/cmperr.h index 06e9dbf..49fd5e3 100644 --- a/no-asm/ssl_3/include/openssl/cmperr.h +++ b/no-asm/ssl_3/include/openssl/cmperr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 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 @@ -67,7 +67,9 @@ # define CMP_R_MISSING_P10CSR 121 # define CMP_R_MISSING_PBM_SECRET 166 # define CMP_R_MISSING_PRIVATE_KEY 131 +# define CMP_R_MISSING_PRIVATE_KEY_FOR_POPO 190 # define CMP_R_MISSING_PROTECTION 143 +# define CMP_R_MISSING_PUBLIC_KEY 183 # define CMP_R_MISSING_REFERENCE_CERT 168 # define CMP_R_MISSING_SECRET 178 # define CMP_R_MISSING_SENDER_IDENTIFICATION 111 diff --git a/no-asm/ssl_3/include/openssl/core_names.h b/no-asm/ssl_3/include/openssl/core_names.h index f5dcb99..5e3c132 100644 --- a/no-asm/ssl_3/include/openssl/core_names.h +++ b/no-asm/ssl_3/include/openssl/core_names.h @@ -27,6 +27,7 @@ extern "C" { #define OSSL_PROV_PARAM_STATUS "status" /* uint */ #define OSSL_PROV_PARAM_SECURITY_CHECKS "security-checks" /* uint */ #define OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK "tls1-prf-ems-check" /* uint */ +#define OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST "drbg-no-trunc-md" /* uint */ /* Self test callback parameters */ #define OSSL_PROV_PARAM_SELF_TEST_PHASE "st-phase" /* utf8_string */ diff --git a/no-asm/ssl_3/include/openssl/fips_names.h b/no-asm/ssl_3/include/openssl/fips_names.h index a94e262..5c77f6d 100644 --- a/no-asm/ssl_3/include/openssl/fips_names.h +++ b/no-asm/ssl_3/include/openssl/fips_names.h @@ -49,6 +49,7 @@ extern "C" { /* * A boolean that determines if the runtime FIPS security checks are performed. + * This is enabled by default. * Type: OSSL_PARAM_UTF8_STRING */ # define OSSL_PROV_FIPS_PARAM_SECURITY_CHECKS "security-checks" @@ -56,11 +57,19 @@ extern "C" { /* * A boolean that determines if the runtime FIPS check for TLS1_PRF EMS is performed. * This is disabled by default. - * * Type: OSSL_PARAM_UTF8_STRING */ # define OSSL_PROV_FIPS_PARAM_TLS1_PRF_EMS_CHECK "tls1-prf-ems-check" +/* + * A boolean that determines if truncated digests can be used with Hash and HMAC + * DRBGs. FIPS 140-3 IG D.R disallows such use for efficiency rather than + * security reasons. + * This is disabled by default. + * Type: OSSL_PARAM_UTF8_STRING + */ +# define OSSL_PROV_FIPS_PARAM_DRBG_TRUNC_DIGEST "drbg-no-trunc-md" + # ifdef __cplusplus } # endif diff --git a/no-asm/ssl_3/include/openssl/macros.h b/no-asm/ssl_3/include/openssl/macros.h index bcd42ec..a614cd6 100644 --- a/no-asm/ssl_3/include/openssl/macros.h +++ b/no-asm/ssl_3/include/openssl/macros.h @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2023 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 @@ -314,7 +314,7 @@ # ifndef OSSL_CRYPTO_ALLOC # if defined(__GNUC__) -# define OSSL_CRYPTO_ALLOC __attribute__((malloc)) +# define OSSL_CRYPTO_ALLOC __attribute__((__malloc__)) # elif defined(_MSC_VER) # define OSSL_CRYPTO_ALLOC __declspec(restrict) # else diff --git a/no-asm/ssl_3/include/openssl/opensslv.h b/no-asm/ssl_3/include/openssl/opensslv.h index 6821cc3..e07eee0 100644 --- a/no-asm/ssl_3/include/openssl/opensslv.h +++ b/no-asm/ssl_3/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 1 -# define OPENSSL_VERSION_PATCH 0 +# define OPENSSL_VERSION_PATCH 1 /* * Additional version information @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.1.0" -# define OPENSSL_FULL_VERSION_STR "3.1.0" +# define OPENSSL_VERSION_STR "3.1.1" +# define OPENSSL_FULL_VERSION_STR "3.1.1" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "14 Mar 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.1.0 14 Mar 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.1.1 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/no-asm/ssl_3/x86/libcrypto.a b/no-asm/ssl_3/x86/libcrypto.a index 5a99ded..1937379 100644 Binary files a/no-asm/ssl_3/x86/libcrypto.a and b/no-asm/ssl_3/x86/libcrypto.a differ diff --git a/no-asm/ssl_3/x86/libcrypto_3.so b/no-asm/ssl_3/x86/libcrypto_3.so index 4259363..ad5a394 100755 Binary files a/no-asm/ssl_3/x86/libcrypto_3.so and b/no-asm/ssl_3/x86/libcrypto_3.so differ diff --git a/no-asm/ssl_3/x86/libssl.a b/no-asm/ssl_3/x86/libssl.a index c148975..31945b8 100644 Binary files a/no-asm/ssl_3/x86/libssl.a and b/no-asm/ssl_3/x86/libssl.a differ diff --git a/no-asm/ssl_3/x86/libssl_3.so b/no-asm/ssl_3/x86/libssl_3.so index 73051a9..f7a0d81 100755 Binary files a/no-asm/ssl_3/x86/libssl_3.so and b/no-asm/ssl_3/x86/libssl_3.so differ diff --git a/no-asm/ssl_3/x86_64/libcrypto.a b/no-asm/ssl_3/x86_64/libcrypto.a index 536706d..3c41164 100644 Binary files a/no-asm/ssl_3/x86_64/libcrypto.a and b/no-asm/ssl_3/x86_64/libcrypto.a differ diff --git a/no-asm/ssl_3/x86_64/libcrypto_3.so b/no-asm/ssl_3/x86_64/libcrypto_3.so index 1392bbf..88baa70 100755 Binary files a/no-asm/ssl_3/x86_64/libcrypto_3.so and b/no-asm/ssl_3/x86_64/libcrypto_3.so differ diff --git a/no-asm/ssl_3/x86_64/libssl.a b/no-asm/ssl_3/x86_64/libssl.a index bc70369..aa1c970 100644 Binary files a/no-asm/ssl_3/x86_64/libssl.a and b/no-asm/ssl_3/x86_64/libssl.a differ diff --git a/no-asm/ssl_3/x86_64/libssl_3.so b/no-asm/ssl_3/x86_64/libssl_3.so index ddbf38a..c3140c8 100755 Binary files a/no-asm/ssl_3/x86_64/libssl_3.so and b/no-asm/ssl_3/x86_64/libssl_3.so differ diff --git a/ssl_1.1/arm64-v8a/libcrypto.a b/ssl_1.1/arm64-v8a/libcrypto.a index 55151db..2f214b8 100644 Binary files a/ssl_1.1/arm64-v8a/libcrypto.a and b/ssl_1.1/arm64-v8a/libcrypto.a differ diff --git a/ssl_1.1/arm64-v8a/libcrypto_1_1.so b/ssl_1.1/arm64-v8a/libcrypto_1_1.so index fb0f0d1..63cae86 100755 Binary files a/ssl_1.1/arm64-v8a/libcrypto_1_1.so and b/ssl_1.1/arm64-v8a/libcrypto_1_1.so differ diff --git a/ssl_1.1/arm64-v8a/libssl.a b/ssl_1.1/arm64-v8a/libssl.a index 411607b..4f2c26d 100644 Binary files a/ssl_1.1/arm64-v8a/libssl.a and b/ssl_1.1/arm64-v8a/libssl.a differ diff --git a/ssl_1.1/arm64-v8a/libssl_1_1.so b/ssl_1.1/arm64-v8a/libssl_1_1.so index 083ce3f..20b0d0d 100755 Binary files a/ssl_1.1/arm64-v8a/libssl_1_1.so and b/ssl_1.1/arm64-v8a/libssl_1_1.so differ diff --git a/ssl_1.1/armeabi-v7a/libcrypto.a b/ssl_1.1/armeabi-v7a/libcrypto.a index 60871f1..e72fcee 100644 Binary files a/ssl_1.1/armeabi-v7a/libcrypto.a and b/ssl_1.1/armeabi-v7a/libcrypto.a differ diff --git a/ssl_1.1/armeabi-v7a/libcrypto_1_1.so b/ssl_1.1/armeabi-v7a/libcrypto_1_1.so index a812058..215432f 100755 Binary files a/ssl_1.1/armeabi-v7a/libcrypto_1_1.so and b/ssl_1.1/armeabi-v7a/libcrypto_1_1.so differ diff --git a/ssl_1.1/armeabi-v7a/libssl.a b/ssl_1.1/armeabi-v7a/libssl.a index 0050922..74be4d2 100644 Binary files a/ssl_1.1/armeabi-v7a/libssl.a and b/ssl_1.1/armeabi-v7a/libssl.a differ diff --git a/ssl_1.1/armeabi-v7a/libssl_1_1.so b/ssl_1.1/armeabi-v7a/libssl_1_1.so index 1055d56..bf0baf8 100755 Binary files a/ssl_1.1/armeabi-v7a/libssl_1_1.so and b/ssl_1.1/armeabi-v7a/libssl_1_1.so differ diff --git a/ssl_1.1/include/crypto/bn.h b/ssl_1.1/include/crypto/bn.h index 9f866ed..250914c 100644 --- a/ssl_1.1/include/crypto/bn.h +++ b/ssl_1.1/include/crypto/bn.h @@ -86,10 +86,5 @@ 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_rsa_do_unblind(const BIGNUM *intermediate, - const BN_BLINDING *blinding, - const BIGNUM *possible_arg2, - const BIGNUM *to_mod, BN_CTX *ctx, - unsigned char *buf, int num); #endif diff --git a/ssl_1.1/include/openssl/opensslv.h b/ssl_1.1/include/openssl/opensslv.h index 7b6c212..5ed047d 100644 --- a/ssl_1.1/include/openssl/opensslv.h +++ b/ssl_1.1/include/openssl/opensslv.h @@ -1,5 +1,5 @@ /* - * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-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 @@ -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 0x1010114fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1t 7 Feb 2023" +# define OPENSSL_VERSION_NUMBER 0x1010115fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1u 30 May 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/ssl_1.1/x86/libcrypto.a b/ssl_1.1/x86/libcrypto.a index 316a9ee..be91801 100644 Binary files a/ssl_1.1/x86/libcrypto.a and b/ssl_1.1/x86/libcrypto.a differ diff --git a/ssl_1.1/x86/libcrypto_1_1.so b/ssl_1.1/x86/libcrypto_1_1.so index df107a7..964ad73 100755 Binary files a/ssl_1.1/x86/libcrypto_1_1.so and b/ssl_1.1/x86/libcrypto_1_1.so differ diff --git a/ssl_1.1/x86/libssl.a b/ssl_1.1/x86/libssl.a index 4adcbc2..91e987e 100644 Binary files a/ssl_1.1/x86/libssl.a and b/ssl_1.1/x86/libssl.a differ diff --git a/ssl_1.1/x86/libssl_1_1.so b/ssl_1.1/x86/libssl_1_1.so index 4bc8c7b..f14260d 100755 Binary files a/ssl_1.1/x86/libssl_1_1.so and b/ssl_1.1/x86/libssl_1_1.so differ diff --git a/ssl_1.1/x86_64/libcrypto.a b/ssl_1.1/x86_64/libcrypto.a index 227cea7..0c2091c 100644 Binary files a/ssl_1.1/x86_64/libcrypto.a and b/ssl_1.1/x86_64/libcrypto.a differ diff --git a/ssl_1.1/x86_64/libcrypto_1_1.so b/ssl_1.1/x86_64/libcrypto_1_1.so index 59ddffb..c11d418 100755 Binary files a/ssl_1.1/x86_64/libcrypto_1_1.so and b/ssl_1.1/x86_64/libcrypto_1_1.so differ diff --git a/ssl_1.1/x86_64/libssl.a b/ssl_1.1/x86_64/libssl.a index a831c28..c27a1c0 100644 Binary files a/ssl_1.1/x86_64/libssl.a and b/ssl_1.1/x86_64/libssl.a differ diff --git a/ssl_1.1/x86_64/libssl_1_1.so b/ssl_1.1/x86_64/libssl_1_1.so index 5671667..9afc53c 100755 Binary files a/ssl_1.1/x86_64/libssl_1_1.so and b/ssl_1.1/x86_64/libssl_1_1.so differ diff --git a/ssl_3/arm64-v8a/libcrypto.a b/ssl_3/arm64-v8a/libcrypto.a index 040a257..a46b387 100644 Binary files a/ssl_3/arm64-v8a/libcrypto.a and b/ssl_3/arm64-v8a/libcrypto.a differ diff --git a/ssl_3/arm64-v8a/libcrypto_3.so b/ssl_3/arm64-v8a/libcrypto_3.so index 972b0f0..cd8801c 100755 Binary files a/ssl_3/arm64-v8a/libcrypto_3.so and b/ssl_3/arm64-v8a/libcrypto_3.so differ diff --git a/ssl_3/arm64-v8a/libssl.a b/ssl_3/arm64-v8a/libssl.a index 47c2069..2c16b4b 100644 Binary files a/ssl_3/arm64-v8a/libssl.a and b/ssl_3/arm64-v8a/libssl.a differ diff --git a/ssl_3/arm64-v8a/libssl_3.so b/ssl_3/arm64-v8a/libssl_3.so index c058ca7..0dc3c93 100755 Binary files a/ssl_3/arm64-v8a/libssl_3.so and b/ssl_3/arm64-v8a/libssl_3.so differ diff --git a/ssl_3/armeabi-v7a/libcrypto.a b/ssl_3/armeabi-v7a/libcrypto.a index 375e643..86c5f3f 100644 Binary files a/ssl_3/armeabi-v7a/libcrypto.a and b/ssl_3/armeabi-v7a/libcrypto.a differ diff --git a/ssl_3/armeabi-v7a/libcrypto_3.so b/ssl_3/armeabi-v7a/libcrypto_3.so index b48c5f8..2f903e6 100755 Binary files a/ssl_3/armeabi-v7a/libcrypto_3.so and b/ssl_3/armeabi-v7a/libcrypto_3.so differ diff --git a/ssl_3/armeabi-v7a/libssl.a b/ssl_3/armeabi-v7a/libssl.a index ccaad46..02c5e22 100644 Binary files a/ssl_3/armeabi-v7a/libssl.a and b/ssl_3/armeabi-v7a/libssl.a differ diff --git a/ssl_3/armeabi-v7a/libssl_3.so b/ssl_3/armeabi-v7a/libssl_3.so index 3c689b4..da384b7 100755 Binary files a/ssl_3/armeabi-v7a/libssl_3.so and b/ssl_3/armeabi-v7a/libssl_3.so differ diff --git a/ssl_3/include/crypto/aes_platform.h b/ssl_3/include/crypto/aes_platform.h index 95e7e71..75aa781 100644 --- a/ssl_3/include/crypto/aes_platform.h +++ b/ssl_3/include/crypto/aes_platform.h @@ -74,7 +74,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len, # define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks # define HWAES_xts_encrypt aes_p8_xts_encrypt # define HWAES_xts_decrypt aes_p8_xts_decrypt -# ifndef OPENSSL_SYS_AIX +# if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX) # define PPC_AES_GCM_CAPABLE (OPENSSL_ppccap_P & PPC_MADD300) # define AES_GCM_ENC_BYTES 128 # define AES_GCM_DEC_BYTES 128 @@ -87,7 +87,7 @@ size_t ppc_aes_gcm_decrypt(const unsigned char *in, unsigned char *out, # define AES_GCM_ASM_PPC(gctx) ((gctx)->ctr==aes_p8_ctr32_encrypt_blocks && \ (gctx)->gcm.funcs.ghash==gcm_ghash_p8) void gcm_ghash_p8(u64 Xi[2],const u128 Htable[16],const u8 *inp, size_t len); -# endif /* OPENSSL_SYS_AIX */ +# endif /* OPENSSL_SYS_AIX || OPENSSL_SYS_MACOSX */ # endif /* PPC */ # if (defined(__arm__) || defined(__arm) || defined(__aarch64__)) diff --git a/ssl_3/include/crypto/bn.h b/ssl_3/include/crypto/bn.h index f6bfdeb..00544d9 100644 --- a/ssl_3/include/crypto/bn.h +++ b/ssl_3/include/crypto/bn.h @@ -116,10 +116,4 @@ OSSL_LIB_CTX *ossl_bn_get_libctx(BN_CTX *ctx); extern const BIGNUM ossl_bn_inv_sqrt_2; -int ossl_bn_rsa_do_unblind(const BIGNUM *intermediate, - const BN_BLINDING *blinding, - const BIGNUM *possible_arg2, - const BIGNUM *to_mod, BN_CTX *ctx, - unsigned char *buf, int num); - #endif diff --git a/ssl_3/include/crypto/cmperr.h b/ssl_3/include/crypto/cmperr.h index ac61dd4..2bd1637 100644 --- a/ssl_3/include/crypto/cmperr.h +++ b/ssl_3/include/crypto/cmperr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2023 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 diff --git a/ssl_3/include/crypto/sm4_platform.h b/ssl_3/include/crypto/sm4_platform.h index 11f9b9d..6cc1dfa 100644 --- a/ssl_3/include/crypto/sm4_platform.h +++ b/ssl_3/include/crypto/sm4_platform.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2022-2023 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 @@ -12,9 +12,8 @@ # pragma once # if defined(OPENSSL_CPUID_OBJ) -# if (defined(__arm__) || defined(__arm) || defined(__aarch64__)) +# if defined(__aarch64__) # include "arm_arch.h" -# if __ARM_MAX_ARCH__>=8 extern unsigned int OPENSSL_arm_midr; static inline int vpsm4_capable(void) { @@ -22,18 +21,17 @@ static inline int vpsm4_capable(void) (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1)); } -# if defined(VPSM4_ASM) -# define VPSM4_CAPABLE vpsm4_capable() -# endif -# define HWSM4_CAPABLE (OPENSSL_armcap_P & ARMV8_SM4) -# define HWSM4_set_encrypt_key sm4_v8_set_encrypt_key -# define HWSM4_set_decrypt_key sm4_v8_set_decrypt_key -# define HWSM4_encrypt sm4_v8_encrypt -# define HWSM4_decrypt sm4_v8_decrypt -# define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt -# define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt -# define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks +# if defined(VPSM4_ASM) +# define VPSM4_CAPABLE vpsm4_capable() # endif +# define HWSM4_CAPABLE (OPENSSL_armcap_P & ARMV8_SM4) +# define HWSM4_set_encrypt_key sm4_v8_set_encrypt_key +# define HWSM4_set_decrypt_key sm4_v8_set_decrypt_key +# define HWSM4_encrypt sm4_v8_encrypt +# define HWSM4_decrypt sm4_v8_decrypt +# define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt +# define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt +# define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks # endif # endif /* OPENSSL_CPUID_OBJ */ diff --git a/ssl_3/include/openssl/cmp.h b/ssl_3/include/openssl/cmp.h index b388e3a..4982557 100644 --- a/ssl_3/include/openssl/cmp.h +++ b/ssl_3/include/openssl/cmp.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from include/openssl/cmp.h.in * - * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -442,8 +442,8 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted, int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey); int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx, const unsigned char *ref, int len); -int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec, - const int len); +int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, + const unsigned char *sec, int len); /* CMP message header and extra certificates: */ int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name); int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav); @@ -503,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr); OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg); int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); +int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg); OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid); OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx, const char *propq); diff --git a/ssl_3/include/openssl/cmperr.h b/ssl_3/include/openssl/cmperr.h index 06e9dbf..49fd5e3 100644 --- a/ssl_3/include/openssl/cmperr.h +++ b/ssl_3/include/openssl/cmperr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 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 @@ -67,7 +67,9 @@ # define CMP_R_MISSING_P10CSR 121 # define CMP_R_MISSING_PBM_SECRET 166 # define CMP_R_MISSING_PRIVATE_KEY 131 +# define CMP_R_MISSING_PRIVATE_KEY_FOR_POPO 190 # define CMP_R_MISSING_PROTECTION 143 +# define CMP_R_MISSING_PUBLIC_KEY 183 # define CMP_R_MISSING_REFERENCE_CERT 168 # define CMP_R_MISSING_SECRET 178 # define CMP_R_MISSING_SENDER_IDENTIFICATION 111 diff --git a/ssl_3/include/openssl/core_names.h b/ssl_3/include/openssl/core_names.h index f5dcb99..5e3c132 100644 --- a/ssl_3/include/openssl/core_names.h +++ b/ssl_3/include/openssl/core_names.h @@ -27,6 +27,7 @@ extern "C" { #define OSSL_PROV_PARAM_STATUS "status" /* uint */ #define OSSL_PROV_PARAM_SECURITY_CHECKS "security-checks" /* uint */ #define OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK "tls1-prf-ems-check" /* uint */ +#define OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST "drbg-no-trunc-md" /* uint */ /* Self test callback parameters */ #define OSSL_PROV_PARAM_SELF_TEST_PHASE "st-phase" /* utf8_string */ diff --git a/ssl_3/include/openssl/fips_names.h b/ssl_3/include/openssl/fips_names.h index a94e262..5c77f6d 100644 --- a/ssl_3/include/openssl/fips_names.h +++ b/ssl_3/include/openssl/fips_names.h @@ -49,6 +49,7 @@ extern "C" { /* * A boolean that determines if the runtime FIPS security checks are performed. + * This is enabled by default. * Type: OSSL_PARAM_UTF8_STRING */ # define OSSL_PROV_FIPS_PARAM_SECURITY_CHECKS "security-checks" @@ -56,11 +57,19 @@ extern "C" { /* * A boolean that determines if the runtime FIPS check for TLS1_PRF EMS is performed. * This is disabled by default. - * * Type: OSSL_PARAM_UTF8_STRING */ # define OSSL_PROV_FIPS_PARAM_TLS1_PRF_EMS_CHECK "tls1-prf-ems-check" +/* + * A boolean that determines if truncated digests can be used with Hash and HMAC + * DRBGs. FIPS 140-3 IG D.R disallows such use for efficiency rather than + * security reasons. + * This is disabled by default. + * Type: OSSL_PARAM_UTF8_STRING + */ +# define OSSL_PROV_FIPS_PARAM_DRBG_TRUNC_DIGEST "drbg-no-trunc-md" + # ifdef __cplusplus } # endif diff --git a/ssl_3/include/openssl/macros.h b/ssl_3/include/openssl/macros.h index bcd42ec..a614cd6 100644 --- a/ssl_3/include/openssl/macros.h +++ b/ssl_3/include/openssl/macros.h @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2023 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 @@ -314,7 +314,7 @@ # ifndef OSSL_CRYPTO_ALLOC # if defined(__GNUC__) -# define OSSL_CRYPTO_ALLOC __attribute__((malloc)) +# define OSSL_CRYPTO_ALLOC __attribute__((__malloc__)) # elif defined(_MSC_VER) # define OSSL_CRYPTO_ALLOC __declspec(restrict) # else diff --git a/ssl_3/include/openssl/opensslv.h b/ssl_3/include/openssl/opensslv.h index 6821cc3..e07eee0 100644 --- a/ssl_3/include/openssl/opensslv.h +++ b/ssl_3/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 1 -# define OPENSSL_VERSION_PATCH 0 +# define OPENSSL_VERSION_PATCH 1 /* * Additional version information @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.1.0" -# define OPENSSL_FULL_VERSION_STR "3.1.0" +# define OPENSSL_VERSION_STR "3.1.1" +# define OPENSSL_FULL_VERSION_STR "3.1.1" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "14 Mar 2023" +# define OPENSSL_RELEASE_DATE "30 May 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.1.0 14 Mar 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.1.1 30 May 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/ssl_3/x86/libcrypto.a b/ssl_3/x86/libcrypto.a index 1c1d625..7bb9913 100644 Binary files a/ssl_3/x86/libcrypto.a and b/ssl_3/x86/libcrypto.a differ diff --git a/ssl_3/x86/libcrypto_3.so b/ssl_3/x86/libcrypto_3.so index 275fe25..fedcb81 100755 Binary files a/ssl_3/x86/libcrypto_3.so and b/ssl_3/x86/libcrypto_3.so differ diff --git a/ssl_3/x86/libssl.a b/ssl_3/x86/libssl.a index c148975..31945b8 100644 Binary files a/ssl_3/x86/libssl.a and b/ssl_3/x86/libssl.a differ diff --git a/ssl_3/x86/libssl_3.so b/ssl_3/x86/libssl_3.so index 4c3f688..b9553cf 100755 Binary files a/ssl_3/x86/libssl_3.so and b/ssl_3/x86/libssl_3.so differ diff --git a/ssl_3/x86_64/libcrypto.a b/ssl_3/x86_64/libcrypto.a index ea50c02..dd4e997 100644 Binary files a/ssl_3/x86_64/libcrypto.a and b/ssl_3/x86_64/libcrypto.a differ diff --git a/ssl_3/x86_64/libcrypto_3.so b/ssl_3/x86_64/libcrypto_3.so index f776761..d50d262 100755 Binary files a/ssl_3/x86_64/libcrypto_3.so and b/ssl_3/x86_64/libcrypto_3.so differ diff --git a/ssl_3/x86_64/libssl.a b/ssl_3/x86_64/libssl.a index 05e5c73..adfd6ee 100644 Binary files a/ssl_3/x86_64/libssl.a and b/ssl_3/x86_64/libssl.a differ diff --git a/ssl_3/x86_64/libssl_3.so b/ssl_3/x86_64/libssl_3.so index 114dad1..0d16002 100755 Binary files a/ssl_3/x86_64/libssl_3.so and b/ssl_3/x86_64/libssl_3.so differ