From: Christian Heimes <christian@python.org>
Date: Mon, 11 Dec 2017 06:00:29 +0000 (+0100)
Subject: Document SSL_OP_NO_RENEGOTIATION as new in 1.1.1
X-Git-Tag: OpenSSL_1_1_1-pre1~207
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c3f7971d89c51def9bfac67797ea24c058f64091;p=oweals%2Fopenssl.git

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)
---

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