diff options
| author | Ingela Andin <[email protected]> | 2018-04-25 10:30:50 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-04-25 10:30:50 +0200 |
| commit | 0e669ed13e20d5d68aa617aacd807eca7268d070 (patch) | |
| tree | dd088e2f20f476f7704ce35a77005ec614682e01 /lib/ssl/src/ssl_connection.hrl | |
| parent | 3beffe5b8f9a454b766674427d4eafa22dbdbbd7 (diff) | |
| parent | 34ef4b8d5feff3b0cc76573d769e482c420673ba (diff) | |
| download | otp-0e669ed13e20d5d68aa617aacd807eca7268d070.tar.gz otp-0e669ed13e20d5d68aa617aacd807eca7268d070.tar.bz2 otp-0e669ed13e20d5d68aa617aacd807eca7268d070.zip | |
Merge pull request #1779 from IngelaAndin/ingela/ssl/hello-pause/ERL-169/OTP-14372
Add new API functions to enable smoother user customizations based on TLS hello extensions
Diffstat (limited to 'lib/ssl/src/ssl_connection.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index f9d2149170..d315c393b4 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -77,7 +77,8 @@ renegotiation :: undefined | {boolean(), From::term() | internal | peer}, start_or_recv_from :: term(), timer :: undefined | reference(), % start_or_recive_timer - %%send_queue :: queue:queue(), + %%send_queue :: queue:queue(), + hello, %%:: #client_hello{} | #server_hello{}, terminated = false ::boolean(), allow_renegotiate = true ::boolean(), expecting_next_protocol_negotiation = false ::boolean(), @@ -88,11 +89,11 @@ sni_hostname = undefined, downgrade, flight_buffer = [] :: list() | map(), %% Buffer of TLS/DTLS records, used during the TLS handshake - %% to when possible pack more than on TLS record into the - %% underlaying packet format. Introduced by DTLS - RFC 4347. - %% The mecahnism is also usefull in TLS although we do not - %% need to worry about packet loss in TLS. In DTLS we need to track DTLS handshake seqnr - flight_state = reliable, %% reliable | {retransmit, integer()}| {waiting, ref(), integer()} - last two is used in DTLS over udp. + %% to when possible pack more than one TLS record into the + %% underlaying packet format. Introduced by DTLS - RFC 4347. + %% The mecahnism is also usefull in TLS although we do not + %% need to worry about packet loss in TLS. In DTLS we need to track DTLS handshake seqnr + flight_state = reliable, %% reliable | {retransmit, integer()}| {waiting, ref(), integer()} - last two is used in DTLS over udp. protocol_specific = #{} :: map() }). -define(DEFAULT_DIFFIE_HELLMAN_PARAMS, |