diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-18 15:36:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-18 15:36:51 +0100 |
| commit | 5caddff6454167783460a6533c3145a510349cc5 (patch) | |
| tree | 6f663450cb233f5ba922d9a519ebd6fae1ee496b /erts | |
| parent | 7a8ee449b79da291ea702c69a7ed4ed6cdae286c (diff) | |
| parent | 730a71a030c30bf233b25cf4aaae47574ea066b8 (diff) | |
| download | otp-5caddff6454167783460a6533c3145a510349cc5.tar.gz otp-5caddff6454167783460a6533c3145a510349cc5.tar.bz2 otp-5caddff6454167783460a6533c3145a510349cc5.zip | |
Merge branch 'ingela/ssl/shrink-state' into maint
* ingela/ssl/shrink-state:
ssl: Remove duplicate record_cb handling
ssl: Add test case for continued handshake with a timeout
ssl: Use gen_statem named timers to handle connection and recv timeouts
ssl: Move and rename diffie_hellman_keys and srp_keys to kex_keys
ssl: Move key_algorithm to handshake_env
ssl: srp
ssl: Rename
ssl: Move diffie_hellman_params to handshake_env
ssl: Move and rename psk_identity state record field
ssl: Move premaster_secret to handshake_env
ssl: Make flight_state DTLS specific
ssl: Add private_key to connection_env
ssl: Remove unused record field
ssl: Add erl_dist_handle to connection_env
ssl: Add negotiated_version to connection_env
ssl: Add key exchange items to handshake_env
ssl: Add hashsign_algorithm and cert_hashsign_algorithm to handshake_env
ssl: Add downgrade handling to connection_env
ssl: Create connection_env
ssl: Handle renegotiation and extensions in handshake_env
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions