[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  21cd6e006cc1ea9a1ba13c45c6858118e34604f6 (commit)
      from  3fde6c9276c9cd6e56e8e06e756350a4fbdd7031 (commit)


- Log -----------------------------------------------------------------
commit 21cd6e006cc1ea9a1ba13c45c6858118e34604f6
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Oct 21 14:40:15 2015 +0100

    Don't use SSLv23_server_method in an example
    
    The function SSLv23_server_method() is an old name. New code should use
    TLS_server_method() instead. Therefore don't use SSLv23_server_method() in
    an example in the docs.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 doc/ssl/SSL_CTX_new.pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ssl/SSL_CTX_new.pod b/doc/ssl/SSL_CTX_new.pod
index 3cbf7a7..15011f8 100644
--- a/doc/ssl/SSL_CTX_new.pod
+++ b/doc/ssl/SSL_CTX_new.pod
@@ -73,7 +73,7 @@ those functions instead.
 The list of protocols available can later be limited using the
 SSL_OP_NO_SSLv3, SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2
 options of the SSL_CTX_set_options() or SSL_set_options() functions.
-Using these options it is possible to choose e.g. SSLv23_server_method() and
+Using these options it is possible to choose e.g. TLS_server_method() and
 be able to negotiate with all possible clients, but to only allow newer
 protocols like TLSv1, TLSv1.1 or TLS v1.2.