aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-01-28 11:07:32 +0100
committerIngela Anderton Andin <[email protected]>2014-01-28 11:07:32 +0100
commit9b0637d83248699eca1673d9b11a542cb2e63720 (patch)
treeb72fa3cb493a163178f1a3e113c8c6089b4d86e2 /lib/ssl/doc/src
parentbb5b33bd3a7c8cbb97695c00f4b9b0d89121f861 (diff)
parentcb16d84c66b6040ca668b2e23ad4e740a3f3d0af (diff)
downloadotp-9b0637d83248699eca1673d9b11a542cb2e63720.tar.gz
otp-9b0637d83248699eca1673d9b11a542cb2e63720.tar.bz2
otp-9b0637d83248699eca1673d9b11a542cb2e63720.zip
Merge branch 'ia/Vagabond/adt-honor-cipher-order/OTP-11621'
* ia/Vagabond/adt-honor-cipher-order/OTP-11621: Implement 'honor_cipher_order' SSL server-side option
Diffstat (limited to 'lib/ssl/doc/src')
-rw-r--r--lib/ssl/doc/src/ssl.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 80ef419fb7..910dca3889 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -460,6 +460,10 @@ fun(srp, Username :: string(), UserState :: term()) ->
</item>
<tag>{log_alert, boolean()}</tag>
<item>If false, error reports will not be displayed.</item>
+ <tag>{honor_cipher_order, boolean()}</tag>
+ <item>If true, use the server's preference for cipher selection. If false
+ (the default), use the client's preference.
+ </item>
</taglist>
</section>