From a903be9cae5094c8f1a04496445d41985f8f6624 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 14 Feb 2025 16:40:45 -0500 Subject: [PATCH] Fixup error ennumeration The merge gives us a conflict on SSL_R_MISSING_QUIC_TLS_FUNCTIONS which conflicted with SSL_R_LISTENER_USE_ONLY. Move the former to ordinal 423 Reviewed-by: Tomas Mraz Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/26762) --- crypto/err/openssl.txt | 2 +- include/openssl/sslerr.h | 2 +- util/libssl.num | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index f9dcd57e035..4e36b787b76 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -1498,7 +1498,7 @@ SSL_R_MISSING_ECDSA_SIGNING_CERT:381:missing ecdsa signing cert SSL_R_MISSING_FATAL:256:missing fatal SSL_R_MISSING_PARAMETERS:290:missing parameters SSL_R_MISSING_PSK_KEX_MODES_EXTENSION:310:missing psk kex modes extension -SSL_R_MISSING_QUIC_TLS_FUNCTIONS:421:missing quic tls functions +SSL_R_MISSING_QUIC_TLS_FUNCTIONS:423:missing quic tls functions SSL_R_MISSING_RSA_CERTIFICATE:168:missing rsa certificate SSL_R_MISSING_RSA_ENCRYPTING_CERT:169:missing rsa encrypting cert SSL_R_MISSING_RSA_SIGNING_CERT:170:missing rsa signing cert diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 8f5287e320b..53e0decbe67 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -174,7 +174,7 @@ # define SSL_R_MISSING_FATAL 256 # define SSL_R_MISSING_PARAMETERS 290 # define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION 310 -# define SSL_R_MISSING_QUIC_TLS_FUNCTIONS 421 +# define SSL_R_MISSING_QUIC_TLS_FUNCTIONS 423 # define SSL_R_MISSING_RSA_CERTIFICATE 168 # define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169 # define SSL_R_MISSING_RSA_SIGNING_CERT 170 diff --git a/util/libssl.num b/util/libssl.num index ee49b1a604f..69186525755 100644 --- a/util/libssl.num +++ b/util/libssl.num @@ -587,8 +587,8 @@ 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: -- 2.47.2