The branch master has been updated via 4ac5e43da6d9ee828240e6d347c48c8fae6573a2 (commit) from 459217237640369a092084ccb80175b5758f40b1 (commit)
- Log ----------------------------------------------------------------- commit 4ac5e43da6d9ee828240e6d347c48c8fae6573a2 Author: Hubert Kario <hka...@redhat.com> Date: Wed Feb 20 16:21:18 2019 +0100 SSL_CONF_cmd: fix doc for NoRenegotiation The option is a flag for Options, not a standalone setting. Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8292) ----------------------------------------------------------------------- Summary of changes: doc/man3/SSL_CONF_cmd.pod | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/man3/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod index b8c2a35..5759c7f 100644 --- a/doc/man3/SSL_CONF_cmd.pod +++ b/doc/man3/SSL_CONF_cmd.pod @@ -308,11 +308,6 @@ Attempts to pad TLSv1.3 records so that they are a multiple of B<value> in length on send. A B<value> of 0 or 1 turns off padding. Otherwise, the B<value> must be >1 or <=16384. -=item B<NoRenegotiation> - -Disables all attempts at renegotiation in TLSv1.2 and earlier, same as setting -B<SSL_OP_NO_RENEGOTIATION>. - =item B<SignatureAlgorithms> This sets the supported signature algorithms for TLSv1.2 and TLSv1.3. @@ -456,6 +451,9 @@ Only used by servers. B<NoResumptionOnRenegotiation>: set B<SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION> flag. Only used by servers. +B<NoRenegotiation>: disables all attempts at renegotiation in TLSv1.2 and +earlier, same as setting B<SSL_OP_NO_RENEGOTIATION>. + B<UnsafeLegacyRenegotiation>: permits the use of unsafe legacy renegotiation. Equivalent to B<SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION>.