aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_connection.hrl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-01-28 16:23:04 +0100
committerIngela Anderton Andin <[email protected]>2019-02-08 09:22:25 +0100
commitf69963a389fa1f933fee0664e8bb453389977b14 (patch)
treebd377a5b6ccf25ca8aaf4a3d615beeb8d0a77f5b /lib/ssl/src/ssl_connection.hrl
parent2a1dab38c8a2186a7413eabb2035234cb66f367f (diff)
downloadotp-f69963a389fa1f933fee0664e8bb453389977b14.tar.gz
otp-f69963a389fa1f933fee0664e8bb453389977b14.tar.bz2
otp-f69963a389fa1f933fee0664e8bb453389977b14.zip
ssl: Handle renegotiation and extensions in handshake_env
Diffstat (limited to 'lib/ssl/src/ssl_connection.hrl')
-rw-r--r--lib/ssl/src/ssl_connection.hrl17
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl
index a46407b27e..e55ef37b71 100644
--- a/lib/ssl/src/ssl_connection.hrl
+++ b/lib/ssl/src/ssl_connection.hrl
@@ -57,7 +57,15 @@
unprocessed_handshake_events = 0 :: integer(),
tls_handshake_history :: ssl_handshake:ssl_handshake_history() | secret_printout()
| 'undefined',
- renegotiation :: undefined | {boolean(), From::term() | internal | peer}
+ expecting_finished = false ::boolean(),
+ renegotiation :: undefined | {boolean(), From::term() | internal | peer},
+ allow_renegotiate = true ::boolean(),
+ %% Ext handling
+ hello, %%:: #client_hello{} | #server_hello{}
+ sni_hostname = undefined,
+ expecting_next_protocol_negotiation = false ::boolean(),
+ next_protocol = undefined :: undefined | binary(),
+ negotiated_protocol
}).
-record(state, {
@@ -68,7 +76,6 @@
ssl_options :: #ssl_options{},
socket_options :: #socket_options{},
session :: #session{} | secret_printout(),
- allow_renegotiate = true ::boolean(),
terminated = false ::boolean() | closed,
negotiated_version :: ssl_record:ssl_version() | 'undefined',
bytes_to_read :: undefined | integer(), %% bytes to read in passive mode
@@ -95,12 +102,6 @@
premaster_secret :: binary() | secret_printout() | 'undefined',
start_or_recv_from :: term(),
timer :: undefined | reference(), % start_or_recive_timer
- hello, %%:: #client_hello{} | #server_hello{},
- expecting_next_protocol_negotiation = false ::boolean(),
- expecting_finished = false ::boolean(),
- next_protocol = undefined :: undefined | binary(),
- negotiated_protocol,
- sni_hostname = undefined,
flight_buffer = [] :: list() | map(), %% Buffer of TLS/DTLS records, used during the TLS handshake
%% to when possible pack more than one TLS record into the
%% underlaying packet format. Introduced by DTLS - RFC 4347.