summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-01-30 16:16:28 +0000
committerMatt Caswell <matt@openssl.org>2017-02-14 13:14:25 +0000
commit7d061fced39d72bd664d04e254c1e3ba6cf99fbc (patch)
tree5d1d4f84329e62d23f3b118aae058647ea07a4cb /include
parent611383586e68921ba4640134c491a4d2b57933d9 (diff)
Add server side support for creating the Hello Retry Request message
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2341)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/ssl.h5
-rw-r--r--include/openssl/ssl3.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index aa3bcc6af0..78acf60093 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -880,7 +880,8 @@ typedef enum {
TLS_ST_CR_ENCRYPTED_EXTENSIONS,
TLS_ST_CR_CERT_VRFY,
TLS_ST_SW_CERT_VRFY,
- TLS_ST_CR_HELLO_REQ
+ TLS_ST_CR_HELLO_REQ,
+ TLS_ST_SW_HELLO_RETRY_REQUEST
} OSSL_HANDSHAKE_STATE;
/*
@@ -2300,6 +2301,7 @@ int ERR_load_SSL_strings(void);
# define SSL_F_TLS_CONSTRUCT_EXTENSIONS 447
# define SSL_F_TLS_CONSTRUCT_FINISHED 359
# define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST 373
+# define SSL_F_TLS_CONSTRUCT_HELLO_RETRY_REQUEST 510
# define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET 428
# define SSL_F_TLS_CONSTRUCT_NEXT_PROTO 426
# define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE 490
@@ -2502,6 +2504,7 @@ int ERR_load_SSL_strings(void);
# define SSL_R_NO_RENEGOTIATION 339
# define SSL_R_NO_REQUIRED_DIGEST 324
# define SSL_R_NO_SHARED_CIPHER 193
+# define SSL_R_NO_SHARED_GROUPS 410
# define SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS 376
# define SSL_R_NO_SRTP_PROFILES 359
# define SSL_R_NO_SUITABLE_KEY_SHARE 101
diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h
index 8d146be19b..d76236ab8d 100644
--- a/include/openssl/ssl3.h
+++ b/include/openssl/ssl3.h
@@ -274,6 +274,7 @@ extern "C" {
# define SSL3_MT_CLIENT_HELLO 1
# define SSL3_MT_SERVER_HELLO 2
# define SSL3_MT_NEWSESSION_TICKET 4
+# 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