[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  9f44e96e245993c8e7aaa9fadf1d6713c9c60915 (commit)
      from  5c33a6ba65e4ae4ddac34e3372c962dd49fb6e43 (commit)


- Log -----------------------------------------------------------------
commit 9f44e96e245993c8e7aaa9fadf1d6713c9c60915
Author: James Peach <jpeach6 at bloomberg.net>
Date:   Thu Mar 5 07:43:54 2020 +0000

    docs: fix typo in SSL functions
    
    CLA: trivial
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11253)

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

Summary of changes:
 doc/man3/SSL_accept.pod       | 4 ++--
 doc/man3/SSL_connect.pod      | 4 ++--
 doc/man3/SSL_do_handshake.pod | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/man3/SSL_accept.pod b/doc/man3/SSL_accept.pod
index a8d84ac81d..eda0a35b9e 100644
--- a/doc/man3/SSL_accept.pod
+++ b/doc/man3/SSL_accept.pod
@@ -56,7 +56,7 @@ established.
 
 The TLS/SSL handshake was not successful because a fatal error occurred either
 at the protocol level or a connection failure occurred. The shutdown was
-not clean. It can also occur of action is need to continue the operation
+not clean. It can also occur if action is needed to continue the operation
 for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
 to find out the reason.
 
@@ -72,7 +72,7 @@ L<SSL_CTX_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man3/SSL_connect.pod b/doc/man3/SSL_connect.pod
index 5777f4ffd6..b74aa1d2b6 100644
--- a/doc/man3/SSL_connect.pod
+++ b/doc/man3/SSL_connect.pod
@@ -71,7 +71,7 @@ established.
 
 The TLS/SSL handshake was not successful, because a fatal error occurred either
 at the protocol level or a connection failure occurred. The shutdown was
-not clean. It can also occur of action is need to continue the operation
+not clean. It can also occur if action is needed to continue the operation
 for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
 to find out the reason.
 
@@ -87,7 +87,7 @@ L<SSL_CTX_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man3/SSL_do_handshake.pod b/doc/man3/SSL_do_handshake.pod
index b110cb55fa..55a11ccdbc 100644
--- a/doc/man3/SSL_do_handshake.pod
+++ b/doc/man3/SSL_do_handshake.pod
@@ -57,7 +57,7 @@ established.
 
 The TLS/SSL handshake was not successful because a fatal error occurred either
 at the protocol level or a connection failure occurred. The shutdown was
-not clean. It can also occur of action is need to continue the operation
+not clean. It can also occur if action is needed to continue the operation
 for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
 to find out the reason.
 
@@ -71,7 +71,7 @@ L<SSL_set_connect_state(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy