From: Richard Levitte Date: Tue, 19 Jul 2016 09:49:51 +0000 (+0200) Subject: Fixup collision between SSL_F_TLS_PROCESS_SKE and SSL_F_TLS_PROCESS_CKE macros X-Git-Tag: OpenSSL_1_1_0-pre6~174 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=384a5d25b152a1a7e5a8f0c63eba08ed727f4c55;p=openssl Fixup collision between SSL_F_TLS_PROCESS_SKE and SSL_F_TLS_PROCESS_CKE macros Reviewed-by: Rich Salz --- diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 8dcd525a98..cdb175a4bc 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2228,12 +2228,12 @@ void ERR_load_SSL_strings(void); # define SSL_F_TLS_PROCESS_CERT_STATUS 362 # define SSL_F_TLS_PROCESS_CERT_VERIFY 379 # define SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC 363 -# define SSL_F_TLS_PROCESS_CKE_DHE 404 -# define SSL_F_TLS_PROCESS_CKE_ECDHE 405 -# define SSL_F_TLS_PROCESS_CKE_GOST 406 -# define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE 407 -# define SSL_F_TLS_PROCESS_CKE_RSA 409 -# define SSL_F_TLS_PROCESS_CKE_SRP 410 +# define SSL_F_TLS_PROCESS_CKE_DHE 411 +# define SSL_F_TLS_PROCESS_CKE_ECDHE 412 +# define SSL_F_TLS_PROCESS_CKE_GOST 413 +# define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE 414 +# define SSL_F_TLS_PROCESS_CKE_RSA 415 +# define SSL_F_TLS_PROCESS_CKE_SRP 416 # define SSL_F_TLS_PROCESS_CLIENT_CERTIFICATE 380 # define SSL_F_TLS_PROCESS_CLIENT_HELLO 381 # define SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE 382