diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-19 11:49:51 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-19 11:49:51 +0200 |
| commit | 384a5d25b152a1a7e5a8f0c63eba08ed727f4c55 (patch) | |
| tree | 68e18e6b09f97a517c0971fc149b8ad269f1ee4a /include/openssl/ssl.h | |
| parent | ad72d9fdf7709ddb97a58d7d45d755e6e0504b96 (diff) | |
| download | openssl-384a5d25b152a1a7e5a8f0c63eba08ed727f4c55.tar.gz | |
Fixup collision between SSL_F_TLS_PROCESS_SKE and SSL_F_TLS_PROCESS_CKE macros
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include/openssl/ssl.h')
| -rw-r--r-- | include/openssl/ssl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 8dcd525a98..cdb175a4bc 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2228,12 +2228,12 @@ void ERR_load_SSL_strings(void); # define SSL_F_TLS_PROCESS_CERT_STATUS 362 # define SSL_F_TLS_PROCESS_CERT_VERIFY 379 # define SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC 363 -# define SSL_F_TLS_PROCESS_CKE_DHE 404 -# define SSL_F_TLS_PROCESS_CKE_ECDHE 405 -# define SSL_F_TLS_PROCESS_CKE_GOST 406 -# define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE 407 -# define SSL_F_TLS_PROCESS_CKE_RSA 409 -# define SSL_F_TLS_PROCESS_CKE_SRP 410 +# define SSL_F_TLS_PROCESS_CKE_DHE 411 +# define SSL_F_TLS_PROCESS_CKE_ECDHE 412 +# define SSL_F_TLS_PROCESS_CKE_GOST 413 +# define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE 414 +# define SSL_F_TLS_PROCESS_CKE_RSA 415 +# define SSL_F_TLS_PROCESS_CKE_SRP 416 # define SSL_F_TLS_PROCESS_CLIENT_CERTIFICATE 380 # define SSL_F_TLS_PROCESS_CLIENT_HELLO 381 # define SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE 382 |