diff options
author | Fredrik Gustafsson <[email protected]> | 2013-11-11 10:05:31 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-11-11 10:05:31 +0100 |
commit | 264a12e19030f8861bf909b79479b2c0b7bd1ee0 (patch) | |
tree | dc67c00f57479ba0065f5e43cd2a4265ccd58867 /lib/ssl/src/ssl_handshake.hrl | |
parent | e07a7499a54fe9001b7bdc9544199bec30818e98 (diff) | |
parent | a2d97b6405066c702678e891d0d3c7640b81d621 (diff) | |
download | otp-264a12e19030f8861bf909b79479b2c0b7bd1ee0.tar.gz otp-264a12e19030f8861bf909b79479b2c0b7bd1ee0.tar.bz2 otp-264a12e19030f8861bf909b79479b2c0b7bd1ee0.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_handshake.hrl')
-rw-r--r-- | lib/ssl/src/ssl_handshake.hrl | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl index f25b0df806..75160526b9 100644 --- a/lib/ssl/src/ssl_handshake.hrl +++ b/lib/ssl/src/ssl_handshake.hrl @@ -98,7 +98,8 @@ next_protocol_negotiation = undefined, % [binary()] srp, ec_point_formats, - elliptic_curves + elliptic_curves, + sni }). -record(server_hello, { @@ -339,6 +340,19 @@ -define(NAMED_CURVE, 3). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Server name indication RFC 6066 section 3 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +-define(SNI_EXT, 16#0000). + +%% enum { host_name(0), (255) } NameType; +-define(SNI_NAMETYPE_HOST_NAME, 0). + +-record(sni, { + hostname = undefined + }). + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Dialyzer types %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -353,6 +367,3 @@ -endif. % -ifdef(ssl_handshake). - - - |