diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-05-27 10:45:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-27 10:45:08 +0200 |
| commit | 48085e18c31bd303f07d9d75cff282361e38ca8b (patch) | |
| tree | f2215cb4831350ea20ffaae5b603a6142a892614 /lib/ssl/src/ssl_internal.hrl | |
| parent | f0510a55fdc2591ea71107f77e36d6fc7b001874 (diff) | |
| parent | df0c5663dd944a3dd06936105d0696a704c20e4e (diff) | |
| download | otp-48085e18c31bd303f07d9d75cff282361e38ca8b.tar.gz otp-48085e18c31bd303f07d9d75cff282361e38ca8b.tar.bz2 otp-48085e18c31bd303f07d9d75cff282361e38ca8b.zip | |
Merge branch 'kennethlakin/beast-mitigation-options/PR-1041/OTP-13629'
* kennethlakin/beast-mitigation-options/PR-1041/OTP-13629:
ssl: Add BEAST mitigation selection option
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 076e663cd4..dddcbdeeda 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -133,6 +133,9 @@ %% the client? honor_cipher_order = false :: boolean(), padding_check = true :: boolean(), + %%Should we use 1/n-1 or 0/n splitting to mitigate BEAST, or disable + %%mitigation entirely? + beast_mitigation = one_n_minus_one :: one_n_minus_one | zero_n | disabled, fallback = false :: boolean(), crl_check :: boolean() | peer | best_effort, crl_cache, |