Commit bb90d02a authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix merge issue 



Causes make update to fail.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2634)
parent a34a9df0

include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -2259,7 +2259,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLS1_PRF                                   284

# define SSL_F_TLS1_SETUP_KEY_BLOCK                       211

# define SSL_F_TLS1_SET_SERVER_SIGALGS                    335

# define SSL_F_TLS_CHOOSE_SIGALG                          510

# define SSL_F_TLS_CHOOSE_SIGALG                          513

# define SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK          354

# define SSL_F_TLS_COLLECT_EXTENSIONS                     435

# define SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST          372