From: Hugo Landau Date: Thu, 18 Jan 2024 13:56:24 +0000 (+0000) Subject: make update X-Git-Tag: openssl-3.5.0-alpha1~454 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=745a779fb2aa971e85331d18cacac5ce89384aab;p=thirdparty%2Fopenssl.git make update Reviewed-by: Matt Caswell Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/23334) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 7d82b802f6d..f9dcd57e035 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -1431,6 +1431,7 @@ SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC:281:\ SSL_R_DH_KEY_TOO_SMALL:394:dh key too small SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG:148:dh public value length is wrong SSL_R_DIGEST_CHECK_FAILED:149:digest check failed +SSL_R_DOMAIN_USE_ONLY:422:domain use only SSL_R_DTLS_MESSAGE_TOO_BIG:334:dtls message too big SSL_R_DUPLICATE_COMPRESSION_ID:309:duplicate compression id SSL_R_ECC_CERT_NOT_FOR_SIGNING:318:ecc cert not for signing @@ -1490,7 +1491,7 @@ SSL_R_LENGTH_TOO_LONG:404:length too long SSL_R_LENGTH_TOO_SHORT:160:length too short SSL_R_LIBRARY_BUG:274:library bug SSL_R_LIBRARY_HAS_NO_CIPHERS:161:library has no ciphers -SSL_R_LISTENER_USE_ONLY:412:listener use only +SSL_R_LISTENER_USE_ONLY:421:listener use only SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED:395:maximum encrypted pkts reached SSL_R_MISSING_DSA_SIGNING_CERT:165:missing dsa signing cert SSL_R_MISSING_ECDSA_SIGNING_CERT:381:missing ecdsa signing cert diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 61d22215dbd..8f5287e320b 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -108,6 +108,7 @@ # define SSL_R_DH_KEY_TOO_SMALL 394 # define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG 148 # define SSL_R_DIGEST_CHECK_FAILED 149 +# define SSL_R_DOMAIN_USE_ONLY 422 # define SSL_R_DTLS_MESSAGE_TOO_BIG 334 # define SSL_R_DUPLICATE_COMPRESSION_ID 309 # define SSL_R_ECC_CERT_NOT_FOR_SIGNING 318 @@ -166,7 +167,7 @@ # define SSL_R_LENGTH_TOO_SHORT 160 # define SSL_R_LIBRARY_BUG 274 # define SSL_R_LIBRARY_HAS_NO_CIPHERS 161 -# define SSL_R_LISTENER_USE_ONLY 412 +# define SSL_R_LISTENER_USE_ONLY 421 # define SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED 395 # define SSL_R_MISSING_DSA_SIGNING_CERT 165 # define SSL_R_MISSING_ECDSA_SIGNING_CERT 381 diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index ca4799e3c1f..b791daf5489 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -147,6 +147,7 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { "dh public value length is wrong"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DIGEST_CHECK_FAILED), "digest check failed"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DOMAIN_USE_ONLY), "domain use only"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DTLS_MESSAGE_TOO_BIG), "dtls message too big"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DUPLICATE_COMPRESSION_ID), diff --git a/util/libssl.num b/util/libssl.num index fcb0c7ee76f..2561018362d 100644 --- a/util/libssl.num +++ b/util/libssl.num @@ -587,5 +587,12 @@ SSL_CTX_flush_sessions_ex 587 3_4_0 EXIST::FUNCTION: SSL_CTX_set_block_padding_ex 588 3_4_0 EXIST::FUNCTION: SSL_set_block_padding_ex 589 3_4_0 EXIST::FUNCTION: SSL_get1_builtin_sigalgs 590 3_4_0 EXIST::FUNCTION: -SSL_set_quic_tls_cbs ? 3_5_0 EXIST::FUNCTION: -SSL_set_quic_tls_transport_params ? 3_5_0 EXIST::FUNCTION: +SSL_set_quic_tls_cbs ? 3_5_0 EXIST::FUNCTION: +SSL_set_quic_tls_transport_params ? 3_5_0 EXIST::FUNCTION: +OSSL_QUIC_server_method ? 3_5_0 EXIST::FUNCTION:QUIC +SSL_is_listener ? 3_5_0 EXIST::FUNCTION: +SSL_get0_listener ? 3_5_0 EXIST::FUNCTION: +SSL_new_listener ? 3_5_0 EXIST::FUNCTION: +SSL_accept_connection ? 3_5_0 EXIST::FUNCTION: +SSL_get_accept_connection_queue_len ? 3_5_0 EXIST::FUNCTION: +SSL_listen ? 3_5_0 EXIST::FUNCTION: