aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_record.erl
diff options
context:
space:
mode:
authorAndreas Schultz <[email protected]>2012-04-08 03:55:39 +0200
committerIngela Anderton Andin <[email protected]>2012-08-22 14:00:45 +0200
commit263e1ab8a7e1a36481b4526bdb933e0fa2998953 (patch)
tree00e300dd0ee3e35db703d6a7cfc5889668bdaa5c /lib/ssl/src/ssl_record.erl
parentc2761da0b7d764ca2862a4ea138cfe8a95f96c59 (diff)
downloadotp-263e1ab8a7e1a36481b4526bdb933e0fa2998953.tar.gz
otp-263e1ab8a7e1a36481b4526bdb933e0fa2998953.tar.bz2
otp-263e1ab8a7e1a36481b4526bdb933e0fa2998953.zip
ssl: Enable TLS 1.2
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
-rw-r--r--lib/ssl/src/ssl_record.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 4cf962c9ea..3bfcff5517 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -383,6 +383,8 @@ get_tls_records_aux(Data, Acc) ->
%% Description: Creates a protocol version record from a version atom
%% or vice versa.
%%--------------------------------------------------------------------
+protocol_version('tlsv1.2') ->
+ {3, 3};
protocol_version('tlsv1.1') ->
{3, 2};
protocol_version(tlsv1) ->
@@ -391,6 +393,8 @@ protocol_version(sslv3) ->
{3, 0};
protocol_version(sslv2) -> %% Backwards compatibility
{2, 0};
+protocol_version({3, 3}) ->
+ 'tlsv1.2';
protocol_version({3, 2}) ->
'tlsv1.1';
protocol_version({3, 1}) ->