diff --git a/openssl/1.1/include/openssl/bnerr.h b/openssl/1.1/include/openssl/bnerr.h index 9f3c7cf..5c83777 100644 --- a/openssl/1.1/include/openssl/bnerr.h +++ b/openssl/1.1/include/openssl/bnerr.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 @@ -72,6 +72,7 @@ int ERR_load_BN_strings(void); # define BN_F_BN_SET_WORDS 144 # define BN_F_BN_STACK_PUSH 148 # define BN_F_BN_USUB 115 +# define BN_F_OSSL_BN_RSA_DO_UNBLIND 151 /* * BN reason codes. diff --git a/openssl/1.1/include/openssl/cmserr.h b/openssl/1.1/include/openssl/cmserr.h index 7dbc13d..d589f59 100644 --- a/openssl/1.1/include/openssl/cmserr.h +++ b/openssl/1.1/include/openssl/cmserr.h @@ -187,6 +187,7 @@ int ERR_load_CMS_strings(void); # define CMS_R_UNKNOWN_DIGEST_ALGORITHM 149 # define CMS_R_UNKNOWN_ID 150 # define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM 151 +# define CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM 194 # define CMS_R_UNSUPPORTED_CONTENT_TYPE 152 # define CMS_R_UNSUPPORTED_KEK_ALGORITHM 153 # define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM 179 diff --git a/openssl/1.1/include/openssl/dh.h b/openssl/1.1/include/openssl/dh.h index 3527540..6c6ff36 100644 --- a/openssl/1.1/include/openssl/dh.h +++ b/openssl/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/openssl/1.1/include/openssl/dherr.h b/openssl/1.1/include/openssl/dherr.h index 916b3be..528c819 100644 --- a/openssl/1.1/include/openssl/dherr.h +++ b/openssl/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/openssl/1.1/include/openssl/opensslconf.h b/openssl/1.1/include/openssl/opensslconf.h index c0b2998..e451cd0 100644 --- a/openssl/1.1/include/openssl/opensslconf.h +++ b/openssl/1.1/include/openssl/opensslconf.h @@ -1,6 +1,6 @@ /* * WARNING: do not edit! - * Generated by Makefile from include/openssl/opensslconf.h.in + * Generated by makefile from include\openssl\opensslconf.h.in * * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * @@ -24,6 +24,9 @@ extern "C" { * OpenSSL was configured with the following options: */ +#ifndef OPENSSL_SYS_WIN32 +# define OPENSSL_SYS_WIN32 1 +#endif #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif @@ -93,8 +96,8 @@ extern "C" { #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS # define OPENSSL_NO_WEAK_SSL_CIPHERS #endif -#ifndef OPENSSL_NO_STATIC_ENGINE -# define OPENSSL_NO_STATIC_ENGINE +#ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE #endif @@ -180,17 +183,17 @@ extern "C" { #undef OPENSSL_UNISTD #define OPENSSL_UNISTD -#undef OPENSSL_EXPORT_VAR_AS_FUNCTION +#define OPENSSL_EXPORT_VAR_AS_FUNCTION /* * The following are cipher-specific, but are part of the public API. */ #if !defined(OPENSSL_SYS_UEFI) -# undef BN_LLONG +# define BN_LLONG /* Only one for the following should be defined */ -# define SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT_LONG # undef SIXTY_FOUR_BIT -# undef THIRTY_TWO_BIT +# define THIRTY_TWO_BIT #endif #define RC4_INT unsigned int diff --git a/openssl/1.1/include/openssl/opensslv.h b/openssl/1.1/include/openssl/opensslv.h index fd9400a..5667d47 100644 --- a/openssl/1.1/include/openssl/opensslv.h +++ b/openssl/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 0x1010113fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1s 1 Nov 2022" +# 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/openssl/1.1/include/openssl/x509v3.h b/openssl/1.1/include/openssl/x509v3.h index 90fa359..3a4f04c 100644 --- a/openssl/1.1/include/openssl/x509v3.h +++ b/openssl/1.1/include/openssl/x509v3.h @@ -1,5 +1,5 @@ /* - * Copyright 1999-2021 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 @@ -136,7 +136,7 @@ typedef struct GENERAL_NAME_st { OTHERNAME *otherName; /* otherName */ ASN1_IA5STRING *rfc822Name; ASN1_IA5STRING *dNSName; - ASN1_TYPE *x400Address; + ASN1_STRING *x400Address; X509_NAME *directoryName; EDIPARTYNAME *ediPartyName; ASN1_IA5STRING *uniformResourceIdentifier; diff --git a/openssl/1.1/version.txt b/openssl/1.1/version.txt index 862fc0c..8522c08 100644 --- a/openssl/1.1/version.txt +++ b/openssl/1.1/version.txt @@ -1 +1 @@ -Version 1.1.1s +Version 1.1.1w diff --git a/openssl/1.1/win32/libcrypto.lib b/openssl/1.1/win32/libcrypto.lib new file mode 100644 index 0000000..0cc1ba1 Binary files /dev/null and b/openssl/1.1/win32/libcrypto.lib differ diff --git a/openssl/1.1/win32/libssl.lib b/openssl/1.1/win32/libssl.lib new file mode 100644 index 0000000..4d9f5ae Binary files /dev/null and b/openssl/1.1/win32/libssl.lib differ diff --git a/openssl/1.1/win64/libcrypto.lib b/openssl/1.1/win64/libcrypto.lib new file mode 100644 index 0000000..9e210ee Binary files /dev/null and b/openssl/1.1/win64/libcrypto.lib differ diff --git a/openssl/1.1/win64/libssl.lib b/openssl/1.1/win64/libssl.lib new file mode 100644 index 0000000..b6e326d Binary files /dev/null and b/openssl/1.1/win64/libssl.lib differ