diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-01 15:36:55 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-03-13 13:21:09 +0100 |
| commit | 96d330814fd8195b0d33d1c33e0683e1fbf752ea (patch) | |
| tree | 2d48ffa4ba50660a737a448e7c6d974c86490f2b /lib/ssl/src/ssl_connection.erl | |
| parent | fbe08ea2c744b7eaf47085c0ccda2f224cc2b5ba (diff) | |
| download | otp-96d330814fd8195b0d33d1c33e0683e1fbf752ea.tar.gz otp-96d330814fd8195b0d33d1c33e0683e1fbf752ea.tar.bz2 otp-96d330814fd8195b0d33d1c33e0683e1fbf752ea.zip | |
ssl: Check that negotiated version is a supported version.
Conflicts:
lib/ssl/src/ssl_handshake.erl
lib/ssl/test/ssl_basic_SUITE.erl
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 73857bccbb..eb71212dcc 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2012. All Rights Reserved. +%% Copyright Ericsson AB 2007-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -74,7 +74,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 |