[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  c3f7971d89c51def9bfac67797ea24c058f64091 (commit)
      from  3e41defe469831236ea25ab9bd7609877cf96c13 (commit)


- Log -----------------------------------------------------------------
commit c3f7971d89c51def9bfac67797ea24c058f64091
Author: Christian Heimes <christian at python.org>
Date:   Mon Dec 11 07:00:29 2017 +0100

    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 at python.org>
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4898)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/SSL_CTX_set_options.pod | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/man3/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
index 072fdb7..2249bc9 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