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 <tomas@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26762)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index f9dcd57e035bedcefd35c3ae7d354ef5352bc52d..4e36b787b76a9b5e4470ffee0ae84e3d23a8f361 100644 (file)
--- 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 8f5287e320bbd0e651e98bd297380be75faa9452..53e0decbe676890ca44b306f3482445d8fc09a2c 100644 (file)
--- 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 ee49b1a604faa661350a1a5e44671caf44c3707c..69186525755ff808d7939cb108422c63d2f56a91 100644 (file)
--- 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: