diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-18 10:53:48 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-18 10:53:48 +0100 |
| commit | 3479136b0a14fc213dfb34c9d44b8350d9f50ff3 (patch) | |
| tree | 7b58780a421d2595004716b785ab8ffea9d02f1d /lib/ssl/src/ssl.erl | |
| parent | e25fe1d35209d321a512091018a78ee9b7cc0b64 (diff) | |
| parent | 730a71a030c30bf233b25cf4aaae47574ea066b8 (diff) | |
| download | otp-3479136b0a14fc213dfb34c9d44b8350d9f50ff3.tar.gz otp-3479136b0a14fc213dfb34c9d44b8350d9f50ff3.tar.bz2 otp-3479136b0a14fc213dfb34c9d44b8350d9f50ff3.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 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index a7d6f28c7a..c39a6f1603 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1202,7 +1202,6 @@ handle_options(Opts0, Role, Host) -> handle_verify_options(Opts, CaCerts), CertFile = handle_option(certfile, Opts, <<>>), - RecordCb = record_cb(Opts), Versions = case handle_option(versions, Opts, []) of [] -> |