Commit 67204031 authored by Todd Short's avatar Todd Short Committed by Matt Caswell
Browse files

Fix 'make update' 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4931)
parent 0ababfec

crypto/err/openssl.txt

+2 −2
Original line number Diff line number Diff line
@@ -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:\

include/openssl/sslerr.h

+2 −2
Original line number Diff line number Diff line
@@ -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