diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-01-26 08:36:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-01-26 08:36:03 +0100 |
| commit | 51bc4157763032e18342eefe1ccbd7f262505483 (patch) | |
| tree | 772cf5da56cf94ab78ea68ccb2772fd061e2db61 /lib/ssl/doc/src/ssl.xml | |
| parent | e3175a030bcb3ddbdea328c218bcc79913b746c1 (diff) | |
| parent | e53c55dd0ab69982bc511396ccf8655d27c6d38c (diff) | |
| download | otp-51bc4157763032e18342eefe1ccbd7f262505483.tar.gz otp-51bc4157763032e18342eefe1ccbd7f262505483.tar.bz2 otp-51bc4157763032e18342eefe1ccbd7f262505483.zip | |
Merge branch 'ia/ssl/maint/poddle/OTP-12420' into maint
* ia/ssl/maint/poddle/OTP-12420:
ssl: Reenable padding check for TLS-1.0 and provide backwards compatible disable option
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index b53344e381..39b9b70579 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1999</year><year>2014</year> + <year>1999</year><year>2015</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -348,11 +348,23 @@ fun(srp, Username :: string(), UserState :: term()) -> </p> </item> + <tag>{padding_check, boolean()}</tag> + <item> + <p> This option only affects TLS-1.0 connections. + If set to false it disables the block cipher padding check + to be able to interoperate with legacy software. + </p> + + <warning><p> Using this option makes TLS vulnerable to + the Poodle attack</p></warning> + + </item> + </taglist> - + </section> - - <section> + + <section> <title>SSL OPTION DESCRIPTIONS - CLIENT SIDE</title> <p>Options described here are client specific or has a slightly different |