From: Todd Short Date: Thu, 14 Dec 2017 19:38:24 +0000 (-0500) Subject: Fix 'make update' X-Git-Tag: OpenSSL_1_1_1-pre1~274 X-Git-Url: https://git.openssl.org/gitweb/?a=commitdiff_plain;h=67204031b6655232a0357b74a0233a41a4646f6c;p=openssl.git Fix 'make update' Reviewed-by: Richard Levitte Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/4931) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 872016f350..4357cfb006 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -1292,7 +1292,7 @@ SSL_F_TLS_CONSTRUCT_STOC_SESSION_TICKET:460:tls_construct_stoc_session_ticket SSL_F_TLS_CONSTRUCT_STOC_STATUS_REQUEST:461:tls_construct_stoc_status_request SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_GROUPS:544:\ tls_construct_stoc_supported_groups -SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_VERSIONS:608:\ +SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_VERSIONS:611:\ tls_construct_stoc_supported_versions SSL_F_TLS_CONSTRUCT_STOC_USE_SRTP:462:tls_construct_stoc_use_srtp SSL_F_TLS_EARLY_POST_PROCESS_CLIENT_HELLO:521:\ @@ -1334,7 +1334,7 @@ SSL_F_TLS_PARSE_STOC_SCT:564:tls_parse_stoc_sct SSL_F_TLS_PARSE_STOC_SERVER_NAME:583:tls_parse_stoc_server_name SSL_F_TLS_PARSE_STOC_SESSION_TICKET:584:tls_parse_stoc_session_ticket SSL_F_TLS_PARSE_STOC_STATUS_REQUEST:585:tls_parse_stoc_status_request -SSL_F_TLS_PARSE_STOC_SUPPORTED_VERSIONS:609:tls_parse_stoc_supported_versions +SSL_F_TLS_PARSE_STOC_SUPPORTED_VERSIONS:612:tls_parse_stoc_supported_versions SSL_F_TLS_PARSE_STOC_USE_SRTP:446:tls_parse_stoc_use_srtp SSL_F_TLS_POST_PROCESS_CLIENT_HELLO:378:tls_post_process_client_hello SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE:384:\ diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 2986be84ad..fdb17a533c 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -340,7 +340,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_CONSTRUCT_STOC_SESSION_TICKET 460 # define SSL_F_TLS_CONSTRUCT_STOC_STATUS_REQUEST 461 # define SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_GROUPS 544 -# define SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_VERSIONS 608 +# define SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_VERSIONS 611 # define SSL_F_TLS_CONSTRUCT_STOC_USE_SRTP 462 # define SSL_F_TLS_EARLY_POST_PROCESS_CLIENT_HELLO 521 # define SSL_F_TLS_FINISH_HANDSHAKE 597 @@ -380,7 +380,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_PARSE_STOC_SERVER_NAME 583 # define SSL_F_TLS_PARSE_STOC_SESSION_TICKET 584 # define SSL_F_TLS_PARSE_STOC_STATUS_REQUEST 585 -# define SSL_F_TLS_PARSE_STOC_SUPPORTED_VERSIONS 609 +# define SSL_F_TLS_PARSE_STOC_SUPPORTED_VERSIONS 612 # define SSL_F_TLS_PARSE_STOC_USE_SRTP 446 # define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO 378 # define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE 384