diff options
| author | Erlang/OTP <otp@erlang.org> | 2015-03-13 16:35:40 +0100 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2015-03-13 16:35:40 +0100 |
| commit | 6e2268e187c84908572e2e6a1fb282a7ba8dc45a (patch) | |
| tree | e7aca7375e491169ff6a3ec79da163c21614d15e /lib/ssl/doc/src/ssl.xml | |
| parent | 5a137003f1eb045a39c18438ecc1b22081747487 (diff) | |
| parent | 90e3fdf7a7ed036d51fcd0477141343af9f1cc30 (diff) | |
| download | erlang-6e2268e187c84908572e2e6a1fb282a7ba8dc45a.tar.gz | |
Merge branch 'ia/ssl/maint15/poodle' into maint-r15
* ia/ssl/maint15/poodle:
ssl: Special Poodle protection version for OTP-R15 track
ssl: Check that negotiated version is a supported version.
ssl: Renable padding check
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index f2c1062102..eaa0bff21e 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>2012</year> + <year>1999</year><year>2015</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -273,6 +273,13 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} | <p> {bad_cert, cert_expired}, {bad_cert, invalid_issuer}, {bad_cert, invalid_signature}, {bad_cert, unknown_ca},{bad_cert, selfsigned_peer}, {bad_cert, name_not_permitted}, {bad_cert, missing_basic_constraint}, {bad_cert, invalid_key_usage}</p> </item> + <tag>{versions, [protocol()]}</tag> + <item>TLS protocol versions that will be supported by started clients and servers. + This option overrides the application environment option <c>protocol_version</c>. If the + environment option is not set it defaults to all versions supported by the SSL application. See also + <seealso marker="ssl:ssl_app">ssl(6)</seealso> + </item> + <tag>{hibernate_after, integer()|undefined}</tag> <item>When an integer-value is specified, the <code>ssl_connection</code> will go into hibernation after the specified number of milliseconds |