diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-06 10:04:21 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-03-06 10:04:21 +0100 |
| commit | 5086c3eea85e1c4cb7e9463c4ca919a32e3cb21c (patch) | |
| tree | 35bbdd3b393073881eeaf540ca84414e1caaed6a /lib/ssl/src/ssl_connection.erl | |
| parent | de50f9f12168325270b67e59782c10f91462a451 (diff) | |
| parent | 5f6d51e05ebe72b9beee17595218aa768464abfa (diff) | |
| download | otp-5086c3eea85e1c4cb7e9463c4ca919a32e3cb21c.tar.gz otp-5086c3eea85e1c4cb7e9463c4ca919a32e3cb21c.tar.bz2 otp-5086c3eea85e1c4cb7e9463c4ca919a32e3cb21c.zip | |
Merge branch 'ia/ssl/versions-option' into maint
* ia/ssl/versions-option:
ssl: Clean code thanks to dialyzer
ssl: Check that negotiated version is a supported version.
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 8f4fd88d42..52ddd3c932 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -73,7 +73,6 @@ session_cache, % session_cache_cb, % negotiated_version, % tls_version() - supported_protocol_versions, % [atom()] client_certificate_requested = false, key_algorithm, % atom as defined by cipher_suite hashsign_algorithm, % atom as defined by cipher_suite @@ -659,8 +658,7 @@ cipher(#certificate_verify{signature = Signature, hashsign_algorithm = CertHashS % client must send a next protocol message if we are expecting it cipher(#finished{}, #state{role = server, expecting_next_protocol_negotiation = true, next_protocol = undefined, negotiated_version = Version} = State0) -> - handle_own_alert(?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), Version, cipher, State0), - {stop, normal, State0}; + handle_own_alert(?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), Version, cipher, State0); cipher(#finished{verify_data = Data} = Finished, #state{negotiated_version = Version, |