diff options
| author | Matt Caswell <matt@openssl.org> | 2016-10-20 17:27:59 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-04 12:09:46 +0000 |
| commit | d02ef3d0be3b2cb1e6b3905ad26fc03ec261b317 (patch) | |
| tree | 2d49c375237b9094087f9f15578e93df575d613e | |
| parent | 7714dc5ea1174ca50cd12e5013683284f66c2dd3 (diff) | |
Fix some clashing symbol numbers due to merge conflict
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | include/openssl/ssl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 6f326d6258..c781323fb4 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -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 |