aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_cipher.hrl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-03-05 09:15:24 +0100
committerIngela Anderton Andin <[email protected]>2015-03-05 09:15:24 +0100
commit549785976441514377e1da14c5c1e7fb289456e0 (patch)
tree70e09cf100cd86020a77f32b4d5d99fe680927a6 /lib/ssl/src/ssl_cipher.hrl
parent71b52f31772210a7160317966ca46e36140b935a (diff)
parented540bd0e457fd43a5b3eaf41f9886cb63a2755a (diff)
downloadotp-549785976441514377e1da14c5c1e7fb289456e0.tar.gz
otp-549785976441514377e1da14c5c1e7fb289456e0.tar.bz2
otp-549785976441514377e1da14c5c1e7fb289456e0.zip
Merge branch 'ia/ssl/TLS_FALLBACK_SCSV/OTP-12458' into maint
* ia/ssl/TLS_FALLBACK_SCSV/OTP-12458: ssl: Implement support for TLS_FALLBACK_SCSV
Diffstat (limited to 'lib/ssl/src/ssl_cipher.hrl')
-rw-r--r--lib/ssl/src/ssl_cipher.hrl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl
index 3ce9c19aa9..3e50563f0a 100644
--- a/lib/ssl/src/ssl_cipher.hrl
+++ b/lib/ssl/src/ssl_cipher.hrl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2014. 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
@@ -355,6 +355,10 @@
%% hello extension data as they should.
-define(TLS_EMPTY_RENEGOTIATION_INFO_SCSV, <<?BYTE(16#00), ?BYTE(16#FF)>>).
+%% TLS Fallback Signaling Cipher Suite Value (SCSV) for Preventing Protocol
+%% Downgrade Attacks
+-define(TLS_FALLBACK_SCSV, <<?BYTE(16#56), ?BYTE(16#00)>>).
+
%%% PSK Cipher Suites RFC 4279
%% TLS_PSK_WITH_RC4_128_SHA = { 0x00, 0x8A };