Fix error code collision

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 9ae34200b6f40aaa32cc5ddf1c1b53424b960c8b..8476c48f00446fd2a8c6a3692fceaa10e1823f0a 100644 (file)
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -1401,7 +1401,7 @@ SSL_R_EXTRA_DATA_IN_MESSAGE:153:extra data in message
 SSL_R_EXT_LENGTH_MISMATCH:163:ext length mismatch
 SSL_R_FAILED_TO_GET_PARAMETER:316:failed to get parameter
 SSL_R_FAILED_TO_INIT_ASYNC:405:failed to init async
-SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE:412:feature negotiation not complete
+SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE:417:feature negotiation not complete
 SSL_R_FEATURE_NOT_RENEGOTIABLE:413:feature not renegotiable
 SSL_R_FRAGMENTED_CLIENT_HELLO:401:fragmented client hello
 SSL_R_GOT_A_FIN_BEFORE_A_CCS:154:got a fin before a ccs

diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index c9e3a02f43d8a7138ccdb709ab969639d86f4649..bd90340058803d803d9b4645ebc757f69f5e3ebf 100644 (file)
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -125,7 +125,7 @@
 # define SSL_R_EXT_LENGTH_MISMATCH                        163
 # define SSL_R_FAILED_TO_GET_PARAMETER                    316
 # define SSL_R_FAILED_TO_INIT_ASYNC                       405
-# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE           412
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE           417
 # define SSL_R_FEATURE_NOT_RENEGOTIABLE                   413
 # define SSL_R_FRAGMENTED_CLIENT_HELLO                    401
 # define SSL_R_GOT_A_FIN_BEFORE_A_CCS                     154