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

Fix some clashing symbol numbers due to merge conflict 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 7714dc5e

include/openssl/ssl.h

+3 −3
Original line number Diff line number Diff line
@@ -2182,9 +2182,9 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT               303

# define SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT         311

# define SSL_F_SSL_PEEK                                   270

# define SSL_F_SSL_PEEK_EX                                425

# define SSL_F_SSL_PEEK_EX                                432

# define SSL_F_SSL_READ                                   223

# define SSL_F_SSL_READ_EX                                426

# define SSL_F_SSL_READ_EX                                434

# define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT                320

# define SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT                321

# define SSL_F_SSL_SESSION_DUP                            348
@@ -2221,7 +2221,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_SSL_VALIDATE_CT                            400

# define SSL_F_SSL_VERIFY_CERT_CHAIN                      207

# define SSL_F_SSL_WRITE                                  208

# define SSL_F_SSL_WRITE_EX                               427

# define SSL_F_SSL_WRITE_EX                               433

# define SSL_F_STATE_MACHINE                              353

# define SSL_F_TLS12_CHECK_PEER_SIGALG                    333

# define SSL_F_TLS1_CHANGE_CIPHER_STATE                   209