summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2017-12-11 07:00:29 +0100
committerRich Salz <rsalz@openssl.org>2018-01-08 15:32:45 -0500
commitc3f7971d89c51def9bfac67797ea24c058f64091 (patch)
tree870f0bcf5711201a320bdd29254a2f1212419d55 /doc
parent3e41defe469831236ea25ab9bd7609877cf96c13 (diff)
Document SSL_OP_NO_RENEGOTIATION as new in 1.1.1
Closes: https://github.com/openssl/openssl/issues/4897 Signed-off-by: Christian Heimes <christian@python.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4898)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/SSL_CTX_set_options.pod3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/man3/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
index 072fdb7c5c..2249bc92dc 100644
--- a/doc/man3/SSL_CTX_set_options.pod
+++ b/doc/man3/SSL_CTX_set_options.pod
@@ -315,7 +315,8 @@ L<dhparam(1)>
The attempt to always try to use secure renegotiation was added in
Openssl 0.9.8m.
-B<SSL_OP_PRIORITIZE_CHACHA> was added in OpenSSL 1.1.1.
+B<SSL_OP_PRIORITIZE_CHACHA> and B<SSL_OP_NO_RENEGOTIATION> were added in
+OpenSSL 1.1.1.
=head1 COPYRIGHT