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/doc/src/ssl.xml | |
| 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/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 154664d855..33ece8f769 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -417,10 +417,24 @@ fun(srp, Username :: string(), UserState :: term()) -> If set to <c>false</c>, it disables the block cipher padding check to be able to interoperate with legacy software.</p></item> - </taglist> - <warning><p>Using <c>{padding_check, boolean()}</c> makes TLS vulnerable to the Poodle attack.</p></warning> + + <tag><c>{beast_mitigation, one_n_minus_one | zero_n | disabled}</c></tag> + <item><p>Affects SSL-3.0 and TLS-1.0 connections only. Used to change the BEAST + mitigation strategy to interoperate with legacy software. + Defaults to <c>one_n_minus_one</c></p>. + + <p><c>one_n_minus_one</c> - Perform 1/n-1 BEAST mitigation.</p> + + <p><c>zero_n</c> - Perform 0/n BEAST mitigation.</p> + + <p><c>disabled</c> - Disable BEAST mitigation.</p></item> + + <warning><p>Using <c>{beast_mitigation, disabled}</c> makes SSL or TLS + vulnerable to the BEAST attack.</p></warning> + </taglist> + </section> <section> |