diff options
| author | Matt Caswell <matt@openssl.org> | 2017-12-05 10:14:35 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-12-14 15:06:37 +0000 |
| commit | 597c51bc980ba6d7470dd8de747ac12a6c7a442b (patch) | |
| tree | bfaa1fb62ac77032ed159170cf5df7ab7a31b717 /include | |
| parent | db37d32cb89160328b0ba48e3808f601a7b3ebe8 (diff) | |
Merge HRR into ServerHello
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4701)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 2 | ||||
| -rw-r--r-- | include/openssl/ssl3.h | 1 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 48779fa6d2..98a106bb77 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -987,8 +987,6 @@ typedef enum { TLS_ST_CR_CERT_VRFY, TLS_ST_SW_CERT_VRFY, TLS_ST_CR_HELLO_REQ, - TLS_ST_SW_HELLO_RETRY_REQUEST, - TLS_ST_CR_HELLO_RETRY_REQUEST, TLS_ST_SW_KEY_UPDATE, TLS_ST_CW_KEY_UPDATE, TLS_ST_SR_KEY_UPDATE, diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h index e9d56a8385..b781f61dab 100644 --- a/include/openssl/ssl3.h +++ b/include/openssl/ssl3.h @@ -289,7 +289,6 @@ extern "C" { # define SSL3_MT_SERVER_HELLO 2 # define SSL3_MT_NEWSESSION_TICKET 4 # define SSL3_MT_END_OF_EARLY_DATA 5 -# define SSL3_MT_HELLO_RETRY_REQUEST 6 # define SSL3_MT_ENCRYPTED_EXTENSIONS 8 # define SSL3_MT_CERTIFICATE 11 # define SSL3_MT_SERVER_KEY_EXCHANGE 12 diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 9c86220336..9564023044 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -385,6 +385,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO 378 # define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE 384 # define SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE 360 +# define SSL_F_TLS_PROCESS_AS_HELLO_RETRY_REQUEST 610 # define SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST 361 # define SSL_F_TLS_PROCESS_CERT_STATUS 362 # define SSL_F_TLS_PROCESS_CERT_STATUS_BODY 495 |