From 3987f9ec26083dcf61d75551710fc1077d79be8a Mon Sep 17 00:00:00 2001 From: Huiyue Xu Date: Thu, 16 Nov 2023 15:43:29 +0800 Subject: [PATCH] Prepare for release of 1.1.1wa Changes between 1.1.1w and 1.1.1wa [16 Nov 2023] *) Make DH_check_pub_key() and DH_generate_key() safer yet Signed-off-by: Huiyue Xu --- CHANGES | 6 +----- NEWS | 6 +----- README | 2 +- include/openssl/opensslv.h | 2 +- util/libcrypto.num | 16 ++++++++-------- util/libssl.num | 34 +++++++++++++++++----------------- util/mkdef.pl | 4 ++-- 7 files changed, 31 insertions(+), 39 deletions(-) diff --git a/CHANGES b/CHANGES index dc7382fedb..cfacdac307 100644 --- a/CHANGES +++ b/CHANGES @@ -7,11 +7,7 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. - Changes between 1.1.1ea and 1.1.1eb [xx xxx xxxx] - - *) - - Changes between 1.1.1w and 1.1.1ea [8 Nov 2023] + Changes between 1.1.1w and 1.1.1wa [16 Nov 2023] *) Make DH_check_pub_key() and DH_generate_key() safer yet diff --git a/NEWS b/NEWS index fb03f33c0c..3af54bfed6 100644 --- a/NEWS +++ b/NEWS @@ -5,11 +5,7 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. - Major changes between OpenSSL 1.1.1ea and OpenSSL 1.1.1eb [under development] - - o - - Major changes between OpenSSL 1.1.1w and OpenSSL 1.1.1ea [8 Nov 2023] + Major changes between OpenSSL 1.1.1w and OpenSSL 1.1.1wa [16 Nov 2023] o Make DH_check_pub_key() and DH_generate_key() safer yet (CVE-2023-5678) diff --git a/README b/README index 8f714a9dc5..d205a93f6d 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1eb-dev + OpenSSL 1.1.1wa Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index c731ca5a28..e9fcf7e249 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -40,7 +40,7 @@ extern "C" { * major minor fix final patch/beta) */ # define OPENSSL_VERSION_NUMBER 0x10101810L -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1eb-dev xx xxx xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1wa 16 Nov 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/util/libcrypto.num b/util/libcrypto.num index 4d6cd12a8a..6d5e4bc762 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4591,11 +4591,11 @@ X509_ALGOR_copy 4544 1_1_1h EXIST::FUNCTION: X509_REQ_set0_signature 4545 1_1_1h EXIST::FUNCTION: X509_REQ_set1_signature_algo 4546 1_1_1h EXIST::FUNCTION: EC_KEY_decoded_from_explicit_params 4547 1_1_1h EXIST::FUNCTION:EC -EVP_sm4_xts 4548 1_1_1ea EXIST::FUNCTION:SM4 -CRYPTO_xts128gb_encrypt 4549 1_1_1ea EXIST::FUNCTION: -X509_set0_sm2_id 4550 1_1_1ea EXIST::FUNCTION:SM2 -X509_get0_sm2_id 4551 1_1_1ea EXIST::FUNCTION:SM2 -X509_REQ_get0_sm2_id 4552 1_1_1ea EXIST::FUNCTION:SM2 -X509_REQ_set0_sm2_id 4553 1_1_1ea EXIST::FUNCTION:SM2 -EVP_PKEY_is_sm2 4554 1_1_1ea EXIST::FUNCTION:SM2 -SM2_compute_key 4555 1_1_1ea EXIST::FUNCTION:SM2 +EVP_sm4_xts 4548 1_1_1wa EXIST::FUNCTION:SM4 +CRYPTO_xts128gb_encrypt 4549 1_1_1wa EXIST::FUNCTION: +X509_set0_sm2_id 4550 1_1_1wa EXIST::FUNCTION:SM2 +X509_get0_sm2_id 4551 1_1_1wa EXIST::FUNCTION:SM2 +X509_REQ_get0_sm2_id 4552 1_1_1wa EXIST::FUNCTION:SM2 +X509_REQ_set0_sm2_id 4553 1_1_1wa EXIST::FUNCTION:SM2 +EVP_PKEY_is_sm2 4554 1_1_1wa EXIST::FUNCTION:SM2 +SM2_compute_key 4555 1_1_1wa EXIST::FUNCTION:SM2 diff --git a/util/libssl.num b/util/libssl.num index f120bed625..7422b8c415 100644 --- a/util/libssl.num +++ b/util/libssl.num @@ -498,20 +498,20 @@ SSL_CTX_get_recv_max_early_data 498 1_1_1 EXIST::FUNCTION: SSL_CTX_set_recv_max_early_data 499 1_1_1 EXIST::FUNCTION: SSL_CTX_set_post_handshake_auth 500 1_1_1 EXIST::FUNCTION: SSL_get_signature_type_nid 501 1_1_1a EXIST::FUNCTION: -SSL_use_gm_PrivateKey 502 1_1_1m EXIST::FUNCTION:TLCP -SSL_CTX_use_gm_certificate_file 503 1_1_1m EXIST::FUNCTION:TLCP -SSL_CTX_use_gm_certificate 504 1_1_1m EXIST::FUNCTION:TLCP -SSL_use_gm_certificate_file 505 1_1_1m EXIST::FUNCTION:TLCP -SSL_CTX_use_gm_certificate_ASN1 506 1_1_1m EXIST::FUNCTION:TLCP -SSL_use_gm_PrivateKey_file 507 1_1_1m EXIST::FUNCTION:TLCP -TLCP_method 508 1_1_1m EXIST::FUNCTION:TLCP -SSL_CTX_use_gm_PrivateKey_file 509 1_1_1m EXIST::FUNCTION:TLCP -SSL_use_gm_PrivateKey_ASN1 510 1_1_1m EXIST::FUNCTION:TLCP -TLCP_client_method 511 1_1_1m EXIST::FUNCTION:TLCP -SSL_CTX_use_gm_cert_and_key 512 1_1_1m EXIST::FUNCTION:TLCP -SSL_CTX_use_gm_PrivateKey 513 1_1_1m EXIST::FUNCTION:TLCP -TLCP_server_method 514 1_1_1m EXIST::FUNCTION:TLCP -SSL_use_gm_cert_and_key 515 1_1_1m EXIST::FUNCTION:TLCP -SSL_use_gm_certificate 516 1_1_1m EXIST::FUNCTION:TLCP -SSL_use_gm_certificate_ASN1 517 1_1_1m EXIST::FUNCTION:TLCP -SSL_CTX_use_gm_PrivateKey_ASN1 518 1_1_1m EXIST::FUNCTION:TLCP +SSL_use_gm_PrivateKey 502 1_1_1wa EXIST::FUNCTION:TLCP +SSL_CTX_use_gm_certificate_file 503 1_1_1wa EXIST::FUNCTION:TLCP +SSL_CTX_use_gm_certificate 504 1_1_1wa EXIST::FUNCTION:TLCP +SSL_use_gm_certificate_file 505 1_1_1wa EXIST::FUNCTION:TLCP +SSL_CTX_use_gm_certificate_ASN1 506 1_1_1wa EXIST::FUNCTION:TLCP +SSL_use_gm_PrivateKey_file 507 1_1_1wa EXIST::FUNCTION:TLCP +TLCP_method 508 1_1_1wa EXIST::FUNCTION:TLCP +SSL_CTX_use_gm_PrivateKey_file 509 1_1_1wa EXIST::FUNCTION:TLCP +SSL_use_gm_PrivateKey_ASN1 510 1_1_1wa EXIST::FUNCTION:TLCP +TLCP_client_method 511 1_1_1wa EXIST::FUNCTION:TLCP +SSL_CTX_use_gm_cert_and_key 512 1_1_1wa EXIST::FUNCTION:TLCP +SSL_CTX_use_gm_PrivateKey 513 1_1_1wa EXIST::FUNCTION:TLCP +TLCP_server_method 514 1_1_1wa EXIST::FUNCTION:TLCP +SSL_use_gm_cert_and_key 515 1_1_1wa EXIST::FUNCTION:TLCP +SSL_use_gm_certificate 516 1_1_1wa EXIST::FUNCTION:TLCP +SSL_use_gm_certificate_ASN1 517 1_1_1wa EXIST::FUNCTION:TLCP +SSL_CTX_use_gm_PrivateKey_ASN1 518 1_1_1wa EXIST::FUNCTION:TLCP diff --git a/util/mkdef.pl b/util/mkdef.pl index 92928e4c37..5528f69ea8 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -1517,13 +1517,13 @@ sub get_next_version() my ($base, $letter) = $thisversion =~ /^(\d_\d_\d)([a-z]{0,2})$/; if ($thisversion eq "1_1_1w") { - return "1_1_1"."ea"; + return "1_1_1"."wa"; } if ((length $letter) > 1) { my $baseletter = ""; my $endletter; ($baseletter, $endletter) = $letter =~ /([a-z]+)([a-z])/; - if ($baseletter eq "e") { + if ($baseletter eq "w") { return "1_1_1".$baseletter.(++$endletter); } } -- Gitee