diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-06 15:49:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-06 15:49:12 +0200 |
| commit | b0d29cc77f3c8d4d63dabb2f00570b0130f9f175 (patch) | |
| tree | cbc19b39413ef5cf12d1630d3a6def9b1e9f1ccd /lib/ssl/src/ssl_record.hrl | |
| parent | 08ff462b9302f62aafa20c1978d5ca148f03cdd3 (diff) | |
| parent | 01e9582332fd17aad51a8b6a4212f72387699359 (diff) | |
| download | otp-b0d29cc77f3c8d4d63dabb2f00570b0130f9f175.tar.gz otp-b0d29cc77f3c8d4d63dabb2f00570b0130f9f175.tar.bz2 otp-b0d29cc77f3c8d4d63dabb2f00570b0130f9f175.zip | |
Merge branch 'ingela/ssl/dtls-progress/connection-states-as-maps' into maint
* ingela/ssl/dtls-progress/connection-states-as-maps:
dtls: fix encoding of client hello cookie
dtls: Prepare start of DTLS connection manager with SSL app
ssl: Refactor to use maps for the connection states
ssl, dtls: Refactor sni handling
dtls: Add close/5
dtls: Add renegotiate/2
dtls: Add protocol event handling
ssl: Refactor code so that tls and dtls can share more code
ssl, dtls: Disable V2 compatibility clause from ssl_handshake:update_handshake_history
ssl: Make sure common code for TLS and DTLS uses the TLS Version
ssl: remove unused RecordCB argument from master_secret
dtls: Add reinit_handshake_data/1 to dtls
dtls: replace tls_record with RecordCB in connection_info
Fix version numbers and dependencies
Diffstat (limited to 'lib/ssl/src/ssl_record.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_record.hrl | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl index a41264ff9b..ed007f58d7 100644 --- a/lib/ssl/src/ssl_record.hrl +++ b/lib/ssl/src/ssl_record.hrl @@ -30,29 +30,27 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% Connection states - RFC 4346 section 6.1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --record(connection_state, { - security_parameters, - compression_state, - cipher_state, - mac_secret, - epoch, %% Only used by DTLS - sequence_number, - %% RFC 5746 - secure_renegotiation, - client_verify_data, - server_verify_data, - %% How to do BEAST mitigation? - beast_mitigation - }). - --record(connection_states, { - dtls_write_msg_seq, %% Only used by DTLS +%% For documentation purposes are now maps in implementation +%% -record(connection_state, { +%% security_parameters, +%% compression_state, +%% cipher_state, +%% mac_secret, +%% sequence_number, +%% %% RFC 5746 +%% secure_renegotiation, +%% client_verify_data, +%% server_verify_data, +%% %% How to do BEAST mitigation? +%% beast_mitigation +%% }). - current_read, - pending_read, - current_write, - pending_write - }). +%% -record(connection_states, { +%% current_read, +%% pending_read, +%% current_write, +%% pending_write, +%% }). -record(security_parameters, { cipher_suite, |