diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-11-11 10:05:12 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-11-11 10:05:12 +0100 |
| commit | a2d97b6405066c702678e891d0d3c7640b81d621 (patch) | |
| tree | 5add7650f8d4599ba736ab5955b0abda31dd29cb /lib/ssl/src/ssl_handshake.hrl | |
| parent | 7724137c2952a343a709fc9e2f1a44eb2e1fb584 (diff) | |
| parent | 06d4f009136b853cd8b50a6b5e8ae0ff5bb54041 (diff) | |
| download | otp-a2d97b6405066c702678e891d0d3c7640b81d621.tar.gz otp-a2d97b6405066c702678e891d0d3c7640b81d621.tar.bz2 otp-a2d97b6405066c702678e891d0d3c7640b81d621.zip | |
Merge branch 'klyr/ssl_sni_client/OTP-11460' into maint
* klyr/ssl_sni_client/OTP-11460:
Update documentation
Add a new server_name_indication option to ssl:connect
Add SSL Server Name Indication (SNI) client support
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). - - - |