aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-03-08 09:37:50 +0100
committerIngela Anderton Andin <[email protected]>2018-03-08 09:37:50 +0100
commit88f654aa94e7a51681ad5774a0677bfa2fba77bd (patch)
tree70dcaddaf422c25e41efe1b8df0cdc95df30152a /lib/ssl/doc
parent9bc4a096025254aed157e4753743be61ce1f7489 (diff)
parent0ff4a42e31e4ef8d190e3be866315a774b590745 (diff)
downloadotp-88f654aa94e7a51681ad5774a0677bfa2fba77bd.tar.gz
otp-88f654aa94e7a51681ad5774a0677bfa2fba77bd.tar.bz2
otp-88f654aa94e7a51681ad5774a0677bfa2fba77bd.zip
Merge branch 'ingela/ssl/no-automated-fallback/OTP-14789'
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r--lib/ssl/doc/src/ssl.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 4f72114ae9..7267083e32 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -264,8 +264,9 @@
<item><p>Specifies if to reject renegotiation attempt that does
not live up to
<url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>.
- By default <c>secure_renegotiate</c> is set to <c>false</c>,
- that is, secure renegotiation is used if possible,
+ By default <c>secure_renegotiate</c> is set to <c>true</c>,
+ that is, secure renegotiation is enforced. If set to <c>false</c> secure renegotiation
+ will still be used if possible,
but it falls back to insecure renegotiation if the peer
does not support
<url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>.</p>