diff options
author | Péter Dimitrov <[email protected]> | 2019-06-11 09:53:16 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2019-06-11 09:53:16 +0200 |
commit | f4b64d3ddaaedf29c81a32af291104279fbbfdce (patch) | |
tree | d8b8aae604e346ea9d847093f724528da958e3da /lib/ssl/src/ssl_connection.hrl | |
parent | 7742555c6f88133c60639e5db464d90495bb943a (diff) | |
parent | 77868eda0882549188f2c387e0b7043f7daaaa70 (diff) | |
download | otp-f4b64d3ddaaedf29c81a32af291104279fbbfdce.tar.gz otp-f4b64d3ddaaedf29c81a32af291104279fbbfdce.tar.bz2 otp-f4b64d3ddaaedf29c81a32af291104279fbbfdce.zip |
Merge pull request #2276 from peterdmv/ssl/tls13-alpn
Implement ALPN in TLS 1.3
Diffstat (limited to 'lib/ssl/src/ssl_connection.hrl')
-rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index ff7207a8ce..844368c761 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -66,6 +66,7 @@ sni_hostname = undefined, expecting_next_protocol_negotiation = false ::boolean(), next_protocol = undefined :: undefined | binary(), + alpn = undefined, %% Used in TLS 1.3 negotiated_protocol, hashsign_algorithm = {undefined, undefined}, cert_hashsign_algorithm = {undefined, undefined}, @@ -76,7 +77,7 @@ srp_params :: #srp_user{} | secret_printout() | 'undefined', public_key_info :: ssl_handshake:public_key_info() | 'undefined', premaster_secret :: binary() | secret_printout() | 'undefined', - server_psk_identity :: binary() | 'undefined' % server psk identity hint + server_psk_identity :: binary() | 'undefined' % server psk identity hint }). -record(connection_env, { |