From: Hugo Landau Date: Tue, 30 Jan 2024 08:02:39 +0000 (+0000) Subject: Fix error code collision X-Git-Tag: openssl-3.3.0-alpha1~146 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07e66f3c3d758619d8594e51afea80d7d23908db;p=thirdparty%2Fopenssl.git Fix error code collision Reviewed-by: Neil Horman Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/23360) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 9ae34200b6f..8476c48f004 100644 --- 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 c9e3a02f43d..bd903400588 100644 --- 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