diff --git a/Linux/Change-Log.txt b/Linux/Change-Log.txt index bad1ed21b..22ed2af6b 100644 --- a/Linux/Change-Log.txt +++ b/Linux/Change-Log.txt @@ -10,7 +10,8 @@ v6.0.1 Update: > Third-party library Upadate ----------------- -1. zlib upgrade to version 1.3.1. +1. openssl upgrade to version 3.0.13. +2. zlib upgrade to version 1.3.1. ========================================================================================== v5.9.5 Update: diff --git a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/bio.h b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/bio.h index e16cf622c..f9aa74731 100644 --- a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/bio.h +++ b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/conferr.h b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/conferr.h +++ b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/dh.h b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/dh.h +++ b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/dherr.h b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/dherr.h +++ b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/opensslv.h b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/opensslv.h index 73590b76c..012d77ee8 100644 --- a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/opensslv.h +++ b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Linux/dependent/android-ndk/arm64-v8a/lib/libcrypto.a b/Linux/dependent/android-ndk/arm64-v8a/lib/libcrypto.a index 4caad9ca4..32ac2b10b 100644 Binary files a/Linux/dependent/android-ndk/arm64-v8a/lib/libcrypto.a and b/Linux/dependent/android-ndk/arm64-v8a/lib/libcrypto.a differ diff --git a/Linux/dependent/android-ndk/arm64-v8a/lib/libssl.a b/Linux/dependent/android-ndk/arm64-v8a/lib/libssl.a index 75f28e83e..4b00c0e20 100644 Binary files a/Linux/dependent/android-ndk/arm64-v8a/lib/libssl.a and b/Linux/dependent/android-ndk/arm64-v8a/lib/libssl.a differ diff --git a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/bio.h b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/bio.h index e16cf622c..f9aa74731 100644 --- a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/bio.h +++ b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/conferr.h b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/conferr.h +++ b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/dh.h b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/dh.h +++ b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/dherr.h b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/dherr.h +++ b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/opensslv.h b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/opensslv.h index 73590b76c..012d77ee8 100644 --- a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/opensslv.h +++ b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Linux/dependent/android-ndk/armeabi-v7a/lib/libcrypto.a b/Linux/dependent/android-ndk/armeabi-v7a/lib/libcrypto.a index d357fb294..088614acb 100644 Binary files a/Linux/dependent/android-ndk/armeabi-v7a/lib/libcrypto.a and b/Linux/dependent/android-ndk/armeabi-v7a/lib/libcrypto.a differ diff --git a/Linux/dependent/android-ndk/armeabi-v7a/lib/libssl.a b/Linux/dependent/android-ndk/armeabi-v7a/lib/libssl.a index d292ba3f8..c30d58242 100644 Binary files a/Linux/dependent/android-ndk/armeabi-v7a/lib/libssl.a and b/Linux/dependent/android-ndk/armeabi-v7a/lib/libssl.a differ diff --git a/Linux/dependent/android-ndk/x86/include/openssl/bio.h b/Linux/dependent/android-ndk/x86/include/openssl/bio.h index e16cf622c..f9aa74731 100644 --- a/Linux/dependent/android-ndk/x86/include/openssl/bio.h +++ b/Linux/dependent/android-ndk/x86/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Linux/dependent/android-ndk/x86/include/openssl/conferr.h b/Linux/dependent/android-ndk/x86/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Linux/dependent/android-ndk/x86/include/openssl/conferr.h +++ b/Linux/dependent/android-ndk/x86/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Linux/dependent/android-ndk/x86/include/openssl/dh.h b/Linux/dependent/android-ndk/x86/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Linux/dependent/android-ndk/x86/include/openssl/dh.h +++ b/Linux/dependent/android-ndk/x86/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Linux/dependent/android-ndk/x86/include/openssl/dherr.h b/Linux/dependent/android-ndk/x86/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Linux/dependent/android-ndk/x86/include/openssl/dherr.h +++ b/Linux/dependent/android-ndk/x86/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Linux/dependent/android-ndk/x86/include/openssl/opensslv.h b/Linux/dependent/android-ndk/x86/include/openssl/opensslv.h index 73590b76c..012d77ee8 100644 --- a/Linux/dependent/android-ndk/x86/include/openssl/opensslv.h +++ b/Linux/dependent/android-ndk/x86/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Linux/dependent/android-ndk/x86/lib/libcrypto.a b/Linux/dependent/android-ndk/x86/lib/libcrypto.a index f396178b5..194b9778d 100644 Binary files a/Linux/dependent/android-ndk/x86/lib/libcrypto.a and b/Linux/dependent/android-ndk/x86/lib/libcrypto.a differ diff --git a/Linux/dependent/android-ndk/x86/lib/libssl.a b/Linux/dependent/android-ndk/x86/lib/libssl.a index 1853ed50a..7a9bf86ae 100644 Binary files a/Linux/dependent/android-ndk/x86/lib/libssl.a and b/Linux/dependent/android-ndk/x86/lib/libssl.a differ diff --git a/Linux/dependent/android-ndk/x86_64/include/openssl/bio.h b/Linux/dependent/android-ndk/x86_64/include/openssl/bio.h index e16cf622c..f9aa74731 100644 --- a/Linux/dependent/android-ndk/x86_64/include/openssl/bio.h +++ b/Linux/dependent/android-ndk/x86_64/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Linux/dependent/android-ndk/x86_64/include/openssl/conferr.h b/Linux/dependent/android-ndk/x86_64/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Linux/dependent/android-ndk/x86_64/include/openssl/conferr.h +++ b/Linux/dependent/android-ndk/x86_64/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Linux/dependent/android-ndk/x86_64/include/openssl/dh.h b/Linux/dependent/android-ndk/x86_64/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Linux/dependent/android-ndk/x86_64/include/openssl/dh.h +++ b/Linux/dependent/android-ndk/x86_64/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Linux/dependent/android-ndk/x86_64/include/openssl/dherr.h b/Linux/dependent/android-ndk/x86_64/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Linux/dependent/android-ndk/x86_64/include/openssl/dherr.h +++ b/Linux/dependent/android-ndk/x86_64/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Linux/dependent/android-ndk/x86_64/include/openssl/opensslv.h b/Linux/dependent/android-ndk/x86_64/include/openssl/opensslv.h index 73590b76c..012d77ee8 100644 --- a/Linux/dependent/android-ndk/x86_64/include/openssl/opensslv.h +++ b/Linux/dependent/android-ndk/x86_64/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Linux/dependent/android-ndk/x86_64/lib/libcrypto.a b/Linux/dependent/android-ndk/x86_64/lib/libcrypto.a index c43959ff5..e07041801 100644 Binary files a/Linux/dependent/android-ndk/x86_64/lib/libcrypto.a and b/Linux/dependent/android-ndk/x86_64/lib/libcrypto.a differ diff --git a/Linux/dependent/android-ndk/x86_64/lib/libssl.a b/Linux/dependent/android-ndk/x86_64/lib/libssl.a index f9bddadb8..c385d038c 100644 Binary files a/Linux/dependent/android-ndk/x86_64/lib/libssl.a and b/Linux/dependent/android-ndk/x86_64/lib/libssl.a differ diff --git a/Linux/dependent/arm/include/openssl/bio.h b/Linux/dependent/arm/include/openssl/bio.h index e16cf622c..f9aa74731 100644 --- a/Linux/dependent/arm/include/openssl/bio.h +++ b/Linux/dependent/arm/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Linux/dependent/arm/include/openssl/conferr.h b/Linux/dependent/arm/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Linux/dependent/arm/include/openssl/conferr.h +++ b/Linux/dependent/arm/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Linux/dependent/arm/include/openssl/dh.h b/Linux/dependent/arm/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Linux/dependent/arm/include/openssl/dh.h +++ b/Linux/dependent/arm/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Linux/dependent/arm/include/openssl/dherr.h b/Linux/dependent/arm/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Linux/dependent/arm/include/openssl/dherr.h +++ b/Linux/dependent/arm/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Linux/dependent/arm/include/openssl/opensslv.h b/Linux/dependent/arm/include/openssl/opensslv.h index 73590b76c..012d77ee8 100644 --- a/Linux/dependent/arm/include/openssl/opensslv.h +++ b/Linux/dependent/arm/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Linux/dependent/arm/lib/libcrypto.a b/Linux/dependent/arm/lib/libcrypto.a index 39ca8747a..e7e13f0c7 100644 Binary files a/Linux/dependent/arm/lib/libcrypto.a and b/Linux/dependent/arm/lib/libcrypto.a differ diff --git a/Linux/dependent/arm/lib/libssl.a b/Linux/dependent/arm/lib/libssl.a index 3cae6258c..3af58de51 100644 Binary files a/Linux/dependent/arm/lib/libssl.a and b/Linux/dependent/arm/lib/libssl.a differ diff --git a/Linux/dependent/arm64/include/openssl/bio.h b/Linux/dependent/arm64/include/openssl/bio.h index e16cf622c..f9aa74731 100644 --- a/Linux/dependent/arm64/include/openssl/bio.h +++ b/Linux/dependent/arm64/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Linux/dependent/arm64/include/openssl/conferr.h b/Linux/dependent/arm64/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Linux/dependent/arm64/include/openssl/conferr.h +++ b/Linux/dependent/arm64/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Linux/dependent/arm64/include/openssl/dh.h b/Linux/dependent/arm64/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Linux/dependent/arm64/include/openssl/dh.h +++ b/Linux/dependent/arm64/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Linux/dependent/arm64/include/openssl/dherr.h b/Linux/dependent/arm64/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Linux/dependent/arm64/include/openssl/dherr.h +++ b/Linux/dependent/arm64/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Linux/dependent/arm64/include/openssl/opensslv.h b/Linux/dependent/arm64/include/openssl/opensslv.h index 73590b76c..012d77ee8 100644 --- a/Linux/dependent/arm64/include/openssl/opensslv.h +++ b/Linux/dependent/arm64/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Linux/dependent/arm64/lib/libcrypto.a b/Linux/dependent/arm64/lib/libcrypto.a index 96259ac97..00e172b17 100644 Binary files a/Linux/dependent/arm64/lib/libcrypto.a and b/Linux/dependent/arm64/lib/libcrypto.a differ diff --git a/Linux/dependent/arm64/lib/libssl.a b/Linux/dependent/arm64/lib/libssl.a index ce997c6fd..7d92ce172 100644 Binary files a/Linux/dependent/arm64/lib/libssl.a and b/Linux/dependent/arm64/lib/libssl.a differ diff --git a/Linux/dependent/x64/include/openssl/bio.h b/Linux/dependent/x64/include/openssl/bio.h index e16cf622c..f9aa74731 100644 --- a/Linux/dependent/x64/include/openssl/bio.h +++ b/Linux/dependent/x64/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Linux/dependent/x64/include/openssl/conferr.h b/Linux/dependent/x64/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Linux/dependent/x64/include/openssl/conferr.h +++ b/Linux/dependent/x64/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Linux/dependent/x64/include/openssl/dh.h b/Linux/dependent/x64/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Linux/dependent/x64/include/openssl/dh.h +++ b/Linux/dependent/x64/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Linux/dependent/x64/include/openssl/dherr.h b/Linux/dependent/x64/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Linux/dependent/x64/include/openssl/dherr.h +++ b/Linux/dependent/x64/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Linux/dependent/x64/include/openssl/opensslv.h b/Linux/dependent/x64/include/openssl/opensslv.h index 73590b76c..012d77ee8 100644 --- a/Linux/dependent/x64/include/openssl/opensslv.h +++ b/Linux/dependent/x64/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Linux/dependent/x64/lib/libcrypto.a b/Linux/dependent/x64/lib/libcrypto.a index 6660bd34c..1d10a0193 100644 Binary files a/Linux/dependent/x64/lib/libcrypto.a and b/Linux/dependent/x64/lib/libcrypto.a differ diff --git a/Linux/dependent/x64/lib/libssl.a b/Linux/dependent/x64/lib/libssl.a index 38654ab48..f70d54ecc 100644 Binary files a/Linux/dependent/x64/lib/libssl.a and b/Linux/dependent/x64/lib/libssl.a differ diff --git a/Linux/dependent/x86/include/openssl/bio.h b/Linux/dependent/x86/include/openssl/bio.h index e16cf622c..f9aa74731 100644 --- a/Linux/dependent/x86/include/openssl/bio.h +++ b/Linux/dependent/x86/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Linux/dependent/x86/include/openssl/conferr.h b/Linux/dependent/x86/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Linux/dependent/x86/include/openssl/conferr.h +++ b/Linux/dependent/x86/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Linux/dependent/x86/include/openssl/dh.h b/Linux/dependent/x86/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Linux/dependent/x86/include/openssl/dh.h +++ b/Linux/dependent/x86/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Linux/dependent/x86/include/openssl/dherr.h b/Linux/dependent/x86/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Linux/dependent/x86/include/openssl/dherr.h +++ b/Linux/dependent/x86/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Linux/dependent/x86/include/openssl/opensslv.h b/Linux/dependent/x86/include/openssl/opensslv.h index 73590b76c..012d77ee8 100644 --- a/Linux/dependent/x86/include/openssl/opensslv.h +++ b/Linux/dependent/x86/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Linux/dependent/x86/lib/libcrypto.a b/Linux/dependent/x86/lib/libcrypto.a index 6a510c105..3d0a66921 100644 Binary files a/Linux/dependent/x86/lib/libcrypto.a and b/Linux/dependent/x86/lib/libcrypto.a differ diff --git a/Linux/dependent/x86/lib/libssl.a b/Linux/dependent/x86/lib/libssl.a index 9a8c2e260..5c894a05d 100644 Binary files a/Linux/dependent/x86/lib/libssl.a and b/Linux/dependent/x86/lib/libssl.a differ diff --git a/Linux/include/hpsocket/HPTypeDef.h b/Linux/include/hpsocket/HPTypeDef.h index 5c40f7355..dbb9d62c5 100644 --- a/Linux/include/hpsocket/HPTypeDef.h +++ b/Linux/include/hpsocket/HPTypeDef.h @@ -29,7 +29,7 @@ #define HP_VERSION_MAJOR 6 // 主版本号 #define HP_VERSION_MINOR 0 // 子版本号 #define HP_VERSION_REVISE 1 // 修正版本号 -#define HP_VERSION_BUILD 5 // 构建编号 +#define HP_VERSION_BUILD 6 // 构建编号 //#define _UDP_DISABLED // 禁用 UDP //#define _SSL_DISABLED // 禁用 SSL diff --git a/Linux/project/Version.props b/Linux/project/Version.props index a4458e504..83f35dddb 100644 --- a/Linux/project/Version.props +++ b/Linux/project/Version.props @@ -5,7 +5,7 @@ 6 0 1 - 5 + 6 ..\..\dependent\arm\include\brotli\decode.h:=$(RemoteRootDir)/dependent/arm/include/brotli/decode.h;..\..\dependent\arm\include\brotli\encode.h:=$(RemoteRootDir)/dependent/arm/include/brotli/encode.h;..\..\dependent\arm\include\brotli\port.h:=$(RemoteRootDir)/dependent/arm/include/brotli/port.h;..\..\dependent\arm\include\brotli\types.h:=$(RemoteRootDir)/dependent/arm/include/brotli/types.h;..\..\dependent\arm\lib\libbrotli.a:=$(RemoteRootDir)/dependent/arm/lib/libbrotli.a;..\..\dependent\arm\lib\libjemalloc_pic.a:=$(RemoteRootDir)/dependent/arm/lib/libjemalloc_pic.a;..\..\dependent\arm\lib\libmimalloc.a:=$(RemoteRootDir)/dependent/arm/lib/libmimalloc.a ..\..\dependent\arm64\include\brotli\decode.h:=$(RemoteRootDir)/dependent/arm64/include/brotli/decode.h;..\..\dependent\arm64\include\brotli\encode.h:=$(RemoteRootDir)/dependent/arm64/include/brotli/encode.h;..\..\dependent\arm64\include\brotli\port.h:=$(RemoteRootDir)/dependent/arm64/include/brotli/port.h;..\..\dependent\arm64\include\brotli\types.h:=$(RemoteRootDir)/dependent/arm64/include/brotli/types.h;..\..\dependent\arm64\lib\libbrotli.a:=$(RemoteRootDir)/dependent/arm64/lib/libbrotli.a;..\..\dependent\arm64\lib\libjemalloc_pic.a:=$(RemoteRootDir)/dependent/arm64/lib/libjemalloc_pic.a;..\..\dependent\arm64\lib\libmimalloc.a:=$(RemoteRootDir)/dependent/arm64/lib/libmimalloc.a ..\..\script\clean.sh:=$(RemoteRootDir)/script/clean.sh;..\..\script\cp-dependent.sh:=$(RemoteRootDir)/script/cp-dependent.sh;..\..\script\cp-include.sh:=$(RemoteRootDir)/script/cp-include.sh;..\..\script\env.sh:=$(RemoteRootDir)/script/env.sh;..\..\script\post-link.sh:=$(RemoteRootDir)/script/post-link.sh;..\..\script\pre-link.sh:=$(RemoteRootDir)/script/pre-link.sh;..\..\compile.sh:=$(RemoteRootDir)/compile.sh;..\..\install.sh:=$(RemoteRootDir)/install.sh diff --git a/Windows/Change-Log.txt b/Windows/Change-Log.txt index 112d14076..18b9ea740 100644 --- a/Windows/Change-Log.txt +++ b/Windows/Change-Log.txt @@ -9,7 +9,8 @@ v6.0.1 > £ ----------------- -1zlib 1.3.1 汾 +1openssl 3.0.13 汾 +2zlib 1.3.1 汾 > ˵ ----------------- diff --git a/Windows/Demo/HttpProxy/Server-1/Server.rc b/Windows/Demo/HttpProxy/Server-1/Server.rc index 512f6a4c1..c7ae5713e 100644 Binary files a/Windows/Demo/HttpProxy/Server-1/Server.rc and b/Windows/Demo/HttpProxy/Server-1/Server.rc differ diff --git a/Windows/Demo/HttpProxy/Server-2/Server.rc b/Windows/Demo/HttpProxy/Server-2/Server.rc index 1c66fb34b..2c0cadb49 100644 Binary files a/Windows/Demo/HttpProxy/Server-2/Server.rc and b/Windows/Demo/HttpProxy/Server-2/Server.rc differ diff --git a/Windows/Demo/TestEcho-4C/Client/Client.rc b/Windows/Demo/TestEcho-4C/Client/Client.rc index 8351c9a51..36d55cf7b 100644 Binary files a/Windows/Demo/TestEcho-4C/Client/Client.rc and b/Windows/Demo/TestEcho-4C/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-4C/Server/Server.rc b/Windows/Demo/TestEcho-4C/Server/Server.rc index 8d86d8124..238113e19 100644 Binary files a/Windows/Demo/TestEcho-4C/Server/Server.rc and b/Windows/Demo/TestEcho-4C/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-ARQ-PFM/Client/Client.rc b/Windows/Demo/TestEcho-ARQ-PFM/Client/Client.rc index ff55e035d..03d46e8e1 100644 Binary files a/Windows/Demo/TestEcho-ARQ-PFM/Client/Client.rc and b/Windows/Demo/TestEcho-ARQ-PFM/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-ARQ-PFM/Server/Server.rc b/Windows/Demo/TestEcho-ARQ-PFM/Server/Server.rc index 19cbe4b30..049f12064 100644 Binary files a/Windows/Demo/TestEcho-ARQ-PFM/Server/Server.rc and b/Windows/Demo/TestEcho-ARQ-PFM/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-ARQ/Client/Client.rc b/Windows/Demo/TestEcho-ARQ/Client/Client.rc index 840171ee6..4e6642ca1 100644 Binary files a/Windows/Demo/TestEcho-ARQ/Client/Client.rc and b/Windows/Demo/TestEcho-ARQ/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-ARQ/Server/Server.rc b/Windows/Demo/TestEcho-ARQ/Server/Server.rc index a812073d1..44f46bd5b 100644 Binary files a/Windows/Demo/TestEcho-ARQ/Server/Server.rc and b/Windows/Demo/TestEcho-ARQ/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-Agent/Agent-4C/Client.rc b/Windows/Demo/TestEcho-Agent/Agent-4C/Client.rc index 8eeb10017..f36a7bb1a 100644 Binary files a/Windows/Demo/TestEcho-Agent/Agent-4C/Client.rc and b/Windows/Demo/TestEcho-Agent/Agent-4C/Client.rc differ diff --git a/Windows/Demo/TestEcho-Agent/Agent-PFM/Client.rc b/Windows/Demo/TestEcho-Agent/Agent-PFM/Client.rc index e7dd3cf44..456a1b428 100644 Binary files a/Windows/Demo/TestEcho-Agent/Agent-PFM/Client.rc and b/Windows/Demo/TestEcho-Agent/Agent-PFM/Client.rc differ diff --git a/Windows/Demo/TestEcho-Agent/Agent-Pull/Client.rc b/Windows/Demo/TestEcho-Agent/Agent-Pull/Client.rc index 18c4c696c..9695a3694 100644 Binary files a/Windows/Demo/TestEcho-Agent/Agent-Pull/Client.rc and b/Windows/Demo/TestEcho-Agent/Agent-Pull/Client.rc differ diff --git a/Windows/Demo/TestEcho-Http-4C/Client/Client.rc b/Windows/Demo/TestEcho-Http-4C/Client/Client.rc index 802e3a33b..9d0f3d6af 100644 Binary files a/Windows/Demo/TestEcho-Http-4C/Client/Client.rc and b/Windows/Demo/TestEcho-Http-4C/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-Http-4C/Server/Server.rc b/Windows/Demo/TestEcho-Http-4C/Server/Server.rc index d35038ab7..b32424106 100644 Binary files a/Windows/Demo/TestEcho-Http-4C/Server/Server.rc and b/Windows/Demo/TestEcho-Http-4C/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-Http-4C/SyncClient/Client.rc b/Windows/Demo/TestEcho-Http-4C/SyncClient/Client.rc index 5efa1ff64..a8d3931d4 100644 Binary files a/Windows/Demo/TestEcho-Http-4C/SyncClient/Client.rc and b/Windows/Demo/TestEcho-Http-4C/SyncClient/Client.rc differ diff --git a/Windows/Demo/TestEcho-Http/Client/Client.rc b/Windows/Demo/TestEcho-Http/Client/Client.rc index e3c4c8c64..34662714d 100644 Binary files a/Windows/Demo/TestEcho-Http/Client/Client.rc and b/Windows/Demo/TestEcho-Http/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-Http/Server/Server.rc b/Windows/Demo/TestEcho-Http/Server/Server.rc index 54f471485..ca59151b8 100644 Binary files a/Windows/Demo/TestEcho-Http/Server/Server.rc and b/Windows/Demo/TestEcho-Http/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-Http/SyncClient/Client.rc b/Windows/Demo/TestEcho-Http/SyncClient/Client.rc index 8e73c0f5d..05c0faa16 100644 Binary files a/Windows/Demo/TestEcho-Http/SyncClient/Client.rc and b/Windows/Demo/TestEcho-Http/SyncClient/Client.rc differ diff --git a/Windows/Demo/TestEcho-PFM/Client/Client.rc b/Windows/Demo/TestEcho-PFM/Client/Client.rc index c715a48a7..5ac17c8ee 100644 Binary files a/Windows/Demo/TestEcho-PFM/Client/Client.rc and b/Windows/Demo/TestEcho-PFM/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-PFM/Server/Server.rc b/Windows/Demo/TestEcho-PFM/Server/Server.rc index d75ba75c6..3fe3e1b7c 100644 Binary files a/Windows/Demo/TestEcho-PFM/Server/Server.rc and b/Windows/Demo/TestEcho-PFM/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-Pack/Client/Client.rc b/Windows/Demo/TestEcho-Pack/Client/Client.rc index 42ad12405..9313d5d02 100644 Binary files a/Windows/Demo/TestEcho-Pack/Client/Client.rc and b/Windows/Demo/TestEcho-Pack/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-Pack/Server/Server.rc b/Windows/Demo/TestEcho-Pack/Server/Server.rc index 65d0f23e8..1cf4d87d5 100644 Binary files a/Windows/Demo/TestEcho-Pack/Server/Server.rc and b/Windows/Demo/TestEcho-Pack/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-Pull/Client/Client.rc b/Windows/Demo/TestEcho-Pull/Client/Client.rc index 9643e3d80..b83c5bd66 100644 Binary files a/Windows/Demo/TestEcho-Pull/Client/Client.rc and b/Windows/Demo/TestEcho-Pull/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-Pull/Server/Server.rc b/Windows/Demo/TestEcho-Pull/Server/Server.rc index 4f92291a7..0793bb78d 100644 Binary files a/Windows/Demo/TestEcho-Pull/Server/Server.rc and b/Windows/Demo/TestEcho-Pull/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-SSL-4C/Client/Client.rc b/Windows/Demo/TestEcho-SSL-4C/Client/Client.rc index 07111e93b..9b1879dd2 100644 Binary files a/Windows/Demo/TestEcho-SSL-4C/Client/Client.rc and b/Windows/Demo/TestEcho-SSL-4C/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-SSL-4C/Server/Server.rc b/Windows/Demo/TestEcho-SSL-4C/Server/Server.rc index e21a132db..244040146 100644 Binary files a/Windows/Demo/TestEcho-SSL-4C/Server/Server.rc and b/Windows/Demo/TestEcho-SSL-4C/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-SSL-PFM/Client/Client.rc b/Windows/Demo/TestEcho-SSL-PFM/Client/Client.rc index f7bc7ed87..9c1381dd9 100644 Binary files a/Windows/Demo/TestEcho-SSL-PFM/Client/Client.rc and b/Windows/Demo/TestEcho-SSL-PFM/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-SSL-PFM/Server/Server.rc b/Windows/Demo/TestEcho-SSL-PFM/Server/Server.rc index cfc40856f..d4f4c9e0b 100644 Binary files a/Windows/Demo/TestEcho-SSL-PFM/Server/Server.rc and b/Windows/Demo/TestEcho-SSL-PFM/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-SSL-Pack/Client/Client.rc b/Windows/Demo/TestEcho-SSL-Pack/Client/Client.rc index 55a472b98..8359dfd4e 100644 Binary files a/Windows/Demo/TestEcho-SSL-Pack/Client/Client.rc and b/Windows/Demo/TestEcho-SSL-Pack/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-SSL-Pack/Server/Server.rc b/Windows/Demo/TestEcho-SSL-Pack/Server/Server.rc index 6daa7958f..5a20b9930 100644 Binary files a/Windows/Demo/TestEcho-SSL-Pack/Server/Server.rc and b/Windows/Demo/TestEcho-SSL-Pack/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-SSL/Client/Client.rc b/Windows/Demo/TestEcho-SSL/Client/Client.rc index e169ba1ed..62629e111 100644 Binary files a/Windows/Demo/TestEcho-SSL/Client/Client.rc and b/Windows/Demo/TestEcho-SSL/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-SSL/Server/Server.rc b/Windows/Demo/TestEcho-SSL/Server/Server.rc index 4809726ac..363080c6b 100644 Binary files a/Windows/Demo/TestEcho-SSL/Server/Server.rc and b/Windows/Demo/TestEcho-SSL/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-UDP-PFM/Client/Client.rc b/Windows/Demo/TestEcho-UDP-PFM/Client/Client.rc index b77940c1b..ede550729 100644 Binary files a/Windows/Demo/TestEcho-UDP-PFM/Client/Client.rc and b/Windows/Demo/TestEcho-UDP-PFM/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-UDP-PFM/Server/Server.rc b/Windows/Demo/TestEcho-UDP-PFM/Server/Server.rc index c8cbb8577..b9a05bc10 100644 Binary files a/Windows/Demo/TestEcho-UDP-PFM/Server/Server.rc and b/Windows/Demo/TestEcho-UDP-PFM/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho-UDP/Client/Client.rc b/Windows/Demo/TestEcho-UDP/Client/Client.rc index b17b59baf..80445c417 100644 Binary files a/Windows/Demo/TestEcho-UDP/Client/Client.rc and b/Windows/Demo/TestEcho-UDP/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho-UDP/Server/Server.rc b/Windows/Demo/TestEcho-UDP/Server/Server.rc index f52f82cd9..48737202e 100644 Binary files a/Windows/Demo/TestEcho-UDP/Server/Server.rc and b/Windows/Demo/TestEcho-UDP/Server/Server.rc differ diff --git a/Windows/Demo/TestEcho/Client/Client.rc b/Windows/Demo/TestEcho/Client/Client.rc index ace0051ff..7ed87958a 100644 Binary files a/Windows/Demo/TestEcho/Client/Client.rc and b/Windows/Demo/TestEcho/Client/Client.rc differ diff --git a/Windows/Demo/TestEcho/Server/Server.rc b/Windows/Demo/TestEcho/Server/Server.rc index dbb8cc462..0072159bc 100644 Binary files a/Windows/Demo/TestEcho/Server/Server.rc and b/Windows/Demo/TestEcho/Server/Server.rc differ diff --git a/Windows/Demo/TestUDPCast/Member/Client.rc b/Windows/Demo/TestUDPCast/Member/Client.rc index 703e39fd3..8b2849454 100644 Binary files a/Windows/Demo/TestUDPCast/Member/Client.rc and b/Windows/Demo/TestUDPCast/Member/Client.rc differ diff --git a/Windows/Demo/TestUDPNode/Node/Node.rc b/Windows/Demo/TestUDPNode/Node/Node.rc index 3491d7ff0..16150335e 100644 Binary files a/Windows/Demo/TestUDPNode/Node/Node.rc and b/Windows/Demo/TestUDPNode/Node/Node.rc differ diff --git a/Windows/Dependent/openssl/100/x64/include/openssl/bio.h b/Windows/Dependent/openssl/100/x64/include/openssl/bio.h index 3e9489afe..e5e46c96b 100644 --- a/Windows/Dependent/openssl/100/x64/include/openssl/bio.h +++ b/Windows/Dependent/openssl/100/x64/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Windows/Dependent/openssl/100/x64/include/openssl/conferr.h b/Windows/Dependent/openssl/100/x64/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Windows/Dependent/openssl/100/x64/include/openssl/conferr.h +++ b/Windows/Dependent/openssl/100/x64/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Windows/Dependent/openssl/100/x64/include/openssl/dh.h b/Windows/Dependent/openssl/100/x64/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Windows/Dependent/openssl/100/x64/include/openssl/dh.h +++ b/Windows/Dependent/openssl/100/x64/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Windows/Dependent/openssl/100/x64/include/openssl/dherr.h b/Windows/Dependent/openssl/100/x64/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Windows/Dependent/openssl/100/x64/include/openssl/dherr.h +++ b/Windows/Dependent/openssl/100/x64/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Windows/Dependent/openssl/100/x64/include/openssl/opensslv.h b/Windows/Dependent/openssl/100/x64/include/openssl/opensslv.h index 8fa8dda62..34a5aa72d 100644 --- a/Windows/Dependent/openssl/100/x64/include/openssl/opensslv.h +++ b/Windows/Dependent/openssl/100/x64/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Windows/Dependent/openssl/100/x64/lib/libcrypto.lib b/Windows/Dependent/openssl/100/x64/lib/libcrypto.lib index 676870b19..ad513d6e9 100644 Binary files a/Windows/Dependent/openssl/100/x64/lib/libcrypto.lib and b/Windows/Dependent/openssl/100/x64/lib/libcrypto.lib differ diff --git a/Windows/Dependent/openssl/100/x64/lib/libssl.lib b/Windows/Dependent/openssl/100/x64/lib/libssl.lib index 0550e3c1e..ec8f3afdb 100644 Binary files a/Windows/Dependent/openssl/100/x64/lib/libssl.lib and b/Windows/Dependent/openssl/100/x64/lib/libssl.lib differ diff --git a/Windows/Dependent/openssl/100/x86/include/openssl/bio.h b/Windows/Dependent/openssl/100/x86/include/openssl/bio.h index 3e9489afe..e5e46c96b 100644 --- a/Windows/Dependent/openssl/100/x86/include/openssl/bio.h +++ b/Windows/Dependent/openssl/100/x86/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Windows/Dependent/openssl/100/x86/include/openssl/conferr.h b/Windows/Dependent/openssl/100/x86/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Windows/Dependent/openssl/100/x86/include/openssl/conferr.h +++ b/Windows/Dependent/openssl/100/x86/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Windows/Dependent/openssl/100/x86/include/openssl/dh.h b/Windows/Dependent/openssl/100/x86/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Windows/Dependent/openssl/100/x86/include/openssl/dh.h +++ b/Windows/Dependent/openssl/100/x86/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Windows/Dependent/openssl/100/x86/include/openssl/dherr.h b/Windows/Dependent/openssl/100/x86/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Windows/Dependent/openssl/100/x86/include/openssl/dherr.h +++ b/Windows/Dependent/openssl/100/x86/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Windows/Dependent/openssl/100/x86/include/openssl/opensslv.h b/Windows/Dependent/openssl/100/x86/include/openssl/opensslv.h index 8fa8dda62..34a5aa72d 100644 --- a/Windows/Dependent/openssl/100/x86/include/openssl/opensslv.h +++ b/Windows/Dependent/openssl/100/x86/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Windows/Dependent/openssl/100/x86/lib/libcrypto.lib b/Windows/Dependent/openssl/100/x86/lib/libcrypto.lib index 3f8f2b891..308c4911d 100644 Binary files a/Windows/Dependent/openssl/100/x86/lib/libcrypto.lib and b/Windows/Dependent/openssl/100/x86/lib/libcrypto.lib differ diff --git a/Windows/Dependent/openssl/100/x86/lib/libssl.lib b/Windows/Dependent/openssl/100/x86/lib/libssl.lib index a97dde656..00abe0729 100644 Binary files a/Windows/Dependent/openssl/100/x86/lib/libssl.lib and b/Windows/Dependent/openssl/100/x86/lib/libssl.lib differ diff --git a/Windows/Dependent/openssl/14x/x64/include/openssl/bio.h b/Windows/Dependent/openssl/14x/x64/include/openssl/bio.h index 3e9489afe..e5e46c96b 100644 --- a/Windows/Dependent/openssl/14x/x64/include/openssl/bio.h +++ b/Windows/Dependent/openssl/14x/x64/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Windows/Dependent/openssl/14x/x64/include/openssl/conferr.h b/Windows/Dependent/openssl/14x/x64/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Windows/Dependent/openssl/14x/x64/include/openssl/conferr.h +++ b/Windows/Dependent/openssl/14x/x64/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Windows/Dependent/openssl/14x/x64/include/openssl/dh.h b/Windows/Dependent/openssl/14x/x64/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Windows/Dependent/openssl/14x/x64/include/openssl/dh.h +++ b/Windows/Dependent/openssl/14x/x64/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Windows/Dependent/openssl/14x/x64/include/openssl/dherr.h b/Windows/Dependent/openssl/14x/x64/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Windows/Dependent/openssl/14x/x64/include/openssl/dherr.h +++ b/Windows/Dependent/openssl/14x/x64/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Windows/Dependent/openssl/14x/x64/include/openssl/opensslv.h b/Windows/Dependent/openssl/14x/x64/include/openssl/opensslv.h index 8fa8dda62..34a5aa72d 100644 --- a/Windows/Dependent/openssl/14x/x64/include/openssl/opensslv.h +++ b/Windows/Dependent/openssl/14x/x64/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Windows/Dependent/openssl/14x/x64/lib/libcrypto.lib b/Windows/Dependent/openssl/14x/x64/lib/libcrypto.lib index 0ad167b67..753babeab 100644 Binary files a/Windows/Dependent/openssl/14x/x64/lib/libcrypto.lib and b/Windows/Dependent/openssl/14x/x64/lib/libcrypto.lib differ diff --git a/Windows/Dependent/openssl/14x/x64/lib/libssl.lib b/Windows/Dependent/openssl/14x/x64/lib/libssl.lib index e6d12e9f6..22a19e5e3 100644 Binary files a/Windows/Dependent/openssl/14x/x64/lib/libssl.lib and b/Windows/Dependent/openssl/14x/x64/lib/libssl.lib differ diff --git a/Windows/Dependent/openssl/14x/x86/include/openssl/bio.h b/Windows/Dependent/openssl/14x/x86/include/openssl/bio.h index 3e9489afe..e5e46c96b 100644 --- a/Windows/Dependent/openssl/14x/x86/include/openssl/bio.h +++ b/Windows/Dependent/openssl/14x/x86/include/openssl/bio.h @@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, - int (*gets) (BIO *, char *, int)); + int (*ossl_gets) (BIO *, char *, int)); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); diff --git a/Windows/Dependent/openssl/14x/x86/include/openssl/conferr.h b/Windows/Dependent/openssl/14x/x86/include/openssl/conferr.h index 496e2e1ef..5dd4868ab 100644 --- a/Windows/Dependent/openssl/14x/x86/include/openssl/conferr.h +++ b/Windows/Dependent/openssl/14x/x86/include/openssl/conferr.h @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/Windows/Dependent/openssl/14x/x86/include/openssl/dh.h b/Windows/Dependent/openssl/14x/x86/include/openssl/dh.h index 6533260f2..50e0cf54b 100644 --- a/Windows/Dependent/openssl/14x/x86/include/openssl/dh.h +++ b/Windows/Dependent/openssl/14x/x86/include/openssl/dh.h @@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_GENERATOR_3 3 # define DH_GENERATOR_5 5 -/* DH_check error codes */ +/* DH_check error codes, some of them shared with DH_check_pub_key */ /* * NB: These values must align with the equivalently named macros in * internal/ffc.h. @@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams) # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 # define DH_NOT_SUITABLE_GENERATOR 0x08 # define DH_CHECK_Q_NOT_PRIME 0x10 -# define DH_CHECK_INVALID_Q_VALUE 0x20 +# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ # define DH_CHECK_INVALID_J_VALUE 0x40 # define DH_MODULUS_TOO_SMALL 0x80 -# define DH_MODULUS_TOO_LARGE 0x100 +# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */ /* DH_check_pub_key error codes */ # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 diff --git a/Windows/Dependent/openssl/14x/x86/include/openssl/dherr.h b/Windows/Dependent/openssl/14x/x86/include/openssl/dherr.h index 5d2a762a9..074a70145 100644 --- a/Windows/Dependent/openssl/14x/x86/include/openssl/dherr.h +++ b/Windows/Dependent/openssl/14x/x86/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 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 @@ -50,6 +50,7 @@ # define DH_R_NO_PRIVATE_VALUE 100 # define DH_R_PARAMETER_ENCODING_ERROR 105 # define DH_R_PEER_KEY_ERROR 111 +# define DH_R_Q_TOO_LARGE 130 # define DH_R_SHARED_INFO_ERROR 113 # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 diff --git a/Windows/Dependent/openssl/14x/x86/include/openssl/opensslv.h b/Windows/Dependent/openssl/14x/x86/include/openssl/opensslv.h index 8fa8dda62..34a5aa72d 100644 --- a/Windows/Dependent/openssl/14x/x86/include/openssl/opensslv.h +++ b/Windows/Dependent/openssl/14x/x86/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * 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.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "24 Oct 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/Windows/Dependent/openssl/14x/x86/lib/libcrypto.lib b/Windows/Dependent/openssl/14x/x86/lib/libcrypto.lib index 7e467680d..8c8d2167e 100644 Binary files a/Windows/Dependent/openssl/14x/x86/lib/libcrypto.lib and b/Windows/Dependent/openssl/14x/x86/lib/libcrypto.lib differ diff --git a/Windows/Dependent/openssl/14x/x86/lib/libssl.lib b/Windows/Dependent/openssl/14x/x86/lib/libssl.lib index 632c79b40..0afce58af 100644 Binary files a/Windows/Dependent/openssl/14x/x86/lib/libssl.lib and b/Windows/Dependent/openssl/14x/x86/lib/libssl.lib differ diff --git a/Windows/Include/HPSocket/HPTypeDef.h b/Windows/Include/HPSocket/HPTypeDef.h index d23c0cf08..f8aef561d 100644 --- a/Windows/Include/HPSocket/HPTypeDef.h +++ b/Windows/Include/HPSocket/HPTypeDef.h @@ -27,7 +27,7 @@ #define HP_VERSION_MAJOR 6 // 主版本号 #define HP_VERSION_MINOR 0 // 子版本号 #define HP_VERSION_REVISE 1 // 修正版本号 -#define HP_VERSION_BUILD 5 // 构建编号 +#define HP_VERSION_BUILD 6 // 构建编号 //#define _UDP_DISABLED // 禁用 UDP //#define _SSL_DISABLED // 禁用 SSL diff --git a/Windows/Project/HPSocketDLL-2010/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2010/HPSocketDLL.rc index a82c751be..a8d942d60 100644 Binary files a/Windows/Project/HPSocketDLL-2010/HPSocketDLL.rc and b/Windows/Project/HPSocketDLL-2010/HPSocketDLL.rc differ diff --git a/Windows/Project/HPSocketDLL-2015/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2015/HPSocketDLL.rc index a82c751be..a8d942d60 100644 Binary files a/Windows/Project/HPSocketDLL-2015/HPSocketDLL.rc and b/Windows/Project/HPSocketDLL-2015/HPSocketDLL.rc differ diff --git a/Windows/Project/HPSocketDLL-2017/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2017/HPSocketDLL.rc index a82c751be..a8d942d60 100644 Binary files a/Windows/Project/HPSocketDLL-2017/HPSocketDLL.rc and b/Windows/Project/HPSocketDLL-2017/HPSocketDLL.rc differ diff --git a/Windows/Project/HPSocketDLL-2019/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2019/HPSocketDLL.rc index a82c751be..a8d942d60 100644 Binary files a/Windows/Project/HPSocketDLL-2019/HPSocketDLL.rc and b/Windows/Project/HPSocketDLL-2019/HPSocketDLL.rc differ diff --git a/Windows/Project/HPSocketDLL-2022/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2022/HPSocketDLL.rc index a82c751be..a8d942d60 100644 Binary files a/Windows/Project/HPSocketDLL-2022/HPSocketDLL.rc and b/Windows/Project/HPSocketDLL-2022/HPSocketDLL.rc differ diff --git a/Windows/Project/HPSocketDLL4C-2010/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2010/HPSocketDLL4C.rc index 302b49ce8..482b8af08 100644 Binary files a/Windows/Project/HPSocketDLL4C-2010/HPSocketDLL4C.rc and b/Windows/Project/HPSocketDLL4C-2010/HPSocketDLL4C.rc differ diff --git a/Windows/Project/HPSocketDLL4C-2015/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2015/HPSocketDLL4C.rc index 302b49ce8..482b8af08 100644 Binary files a/Windows/Project/HPSocketDLL4C-2015/HPSocketDLL4C.rc and b/Windows/Project/HPSocketDLL4C-2015/HPSocketDLL4C.rc differ diff --git a/Windows/Project/HPSocketDLL4C-2017/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2017/HPSocketDLL4C.rc index 302b49ce8..482b8af08 100644 Binary files a/Windows/Project/HPSocketDLL4C-2017/HPSocketDLL4C.rc and b/Windows/Project/HPSocketDLL4C-2017/HPSocketDLL4C.rc differ diff --git a/Windows/Project/HPSocketDLL4C-2019/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2019/HPSocketDLL4C.rc index 302b49ce8..482b8af08 100644 Binary files a/Windows/Project/HPSocketDLL4C-2019/HPSocketDLL4C.rc and b/Windows/Project/HPSocketDLL4C-2019/HPSocketDLL4C.rc differ diff --git a/Windows/Project/HPSocketDLL4C-2022/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2022/HPSocketDLL4C.rc index 302b49ce8..482b8af08 100644 Binary files a/Windows/Project/HPSocketDLL4C-2022/HPSocketDLL4C.rc and b/Windows/Project/HPSocketDLL4C-2022/HPSocketDLL4C.rc differ diff --git a/Windows/Project/HPSocketLIB-2010/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2010/HPSocketLIB.rc index 2438e9add..cbbb12502 100644 Binary files a/Windows/Project/HPSocketLIB-2010/HPSocketLIB.rc and b/Windows/Project/HPSocketLIB-2010/HPSocketLIB.rc differ diff --git a/Windows/Project/HPSocketLIB-2015/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2015/HPSocketLIB.rc index 2438e9add..cbbb12502 100644 Binary files a/Windows/Project/HPSocketLIB-2015/HPSocketLIB.rc and b/Windows/Project/HPSocketLIB-2015/HPSocketLIB.rc differ diff --git a/Windows/Project/HPSocketLIB-2017/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2017/HPSocketLIB.rc index 2438e9add..cbbb12502 100644 Binary files a/Windows/Project/HPSocketLIB-2017/HPSocketLIB.rc and b/Windows/Project/HPSocketLIB-2017/HPSocketLIB.rc differ diff --git a/Windows/Project/HPSocketLIB-2019/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2019/HPSocketLIB.rc index 2438e9add..cbbb12502 100644 Binary files a/Windows/Project/HPSocketLIB-2019/HPSocketLIB.rc and b/Windows/Project/HPSocketLIB-2019/HPSocketLIB.rc differ diff --git a/Windows/Project/HPSocketLIB-2022/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2022/HPSocketLIB.rc index 2438e9add..cbbb12502 100644 Binary files a/Windows/Project/HPSocketLIB-2022/HPSocketLIB.rc and b/Windows/Project/HPSocketLIB-2022/HPSocketLIB.rc differ diff --git a/Windows/Project/HPSocketLIB4C-2010/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2010/HPSocketLIB4C.rc index 8af109fa7..85bbd6274 100644 Binary files a/Windows/Project/HPSocketLIB4C-2010/HPSocketLIB4C.rc and b/Windows/Project/HPSocketLIB4C-2010/HPSocketLIB4C.rc differ diff --git a/Windows/Project/HPSocketLIB4C-2015/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2015/HPSocketLIB4C.rc index 8af109fa7..85bbd6274 100644 Binary files a/Windows/Project/HPSocketLIB4C-2015/HPSocketLIB4C.rc and b/Windows/Project/HPSocketLIB4C-2015/HPSocketLIB4C.rc differ diff --git a/Windows/Project/HPSocketLIB4C-2017/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2017/HPSocketLIB4C.rc index 8af109fa7..85bbd6274 100644 Binary files a/Windows/Project/HPSocketLIB4C-2017/HPSocketLIB4C.rc and b/Windows/Project/HPSocketLIB4C-2017/HPSocketLIB4C.rc differ diff --git a/Windows/Project/HPSocketLIB4C-2019/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2019/HPSocketLIB4C.rc index 8af109fa7..85bbd6274 100644 Binary files a/Windows/Project/HPSocketLIB4C-2019/HPSocketLIB4C.rc and b/Windows/Project/HPSocketLIB4C-2019/HPSocketLIB4C.rc differ diff --git a/Windows/Project/HPSocketLIB4C-2022/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2022/HPSocketLIB4C.rc index 8af109fa7..85bbd6274 100644 Binary files a/Windows/Project/HPSocketLIB4C-2022/HPSocketLIB4C.rc and b/Windows/Project/HPSocketLIB4C-2022/HPSocketLIB4C.rc differ