diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-03-05 09:15:24 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-03-05 09:15:24 +0100 |
| commit | 549785976441514377e1da14c5c1e7fb289456e0 (patch) | |
| tree | 70e09cf100cd86020a77f32b4d5d99fe680927a6 /lib/ssl/src/ssl_internal.hrl | |
| parent | 71b52f31772210a7160317966ca46e36140b935a (diff) | |
| parent | ed540bd0e457fd43a5b3eaf41f9886cb63a2755a (diff) | |
| download | otp-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_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index bb4e732517..88105cac5a 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -118,7 +118,8 @@ %% Should the server prefer its own cipher order over the one provided by %% the client? honor_cipher_order = false, - padding_check = true + padding_check = true, + fallback = false }). -record(socket_options, |