diff options
author | Matt Caswell <matt@openssl.org> | 2017-01-12 15:28:48 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-01-30 10:17:49 +0000 |
commit | b2f7e8c0fe2f4e8d3d14fa30805211daa5456ffa (patch) | |
tree | 5b88b15b5004c12398da368ee677ea7db85b01f2 /include | |
parent | cc2455bfa8cb4d62792dee533e9262f470e78e72 (diff) |
Add support for the psk_key_exchange_modes extension
This is required for the later addition of resumption support.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/ssl.h | 1 | ||||
-rw-r--r-- | include/openssl/tls1.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index e95fdb4842..708d59b14c 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2281,6 +2281,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_CONSTRUCT_CTOS_KEY_SHARE 470 # define SSL_F_TLS_CONSTRUCT_CTOS_NPN 471 # define SSL_F_TLS_CONSTRUCT_CTOS_PADDING 472 +# define SSL_F_TLS_CONSTRUCT_CTOS_PSK_KEX_MODES 509 # define SSL_F_TLS_CONSTRUCT_CTOS_RENEGOTIATE 473 # define SSL_F_TLS_CONSTRUCT_CTOS_SCT 474 # define SSL_F_TLS_CONSTRUCT_CTOS_SERVER_NAME 475 diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 707fb96054..65569bd50d 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -178,6 +178,7 @@ extern "C" { /* As defined for TLS1.3 */ # define TLSEXT_TYPE_key_share 40 # define TLSEXT_TYPE_supported_versions 43 +# define TLSEXT_TYPE_psk_kex_modes 45 /* Temporary extension type */ # define TLSEXT_TYPE_renegotiate 0xff01 |