[openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  4a4f446008938775c2bea3001c4c8e7a674992ad (commit)
       via  5272fdca6bdedb95fed0403a21a0ab6309f4c161 (commit)
      from  2d17290d2cf269e6c939f983db4ea71275d87f14 (commit)


- Log -----------------------------------------------------------------
commit 4a4f446008938775c2bea3001c4c8e7a674992ad
Author: yangyangtiantianlonglong <yangtianlong1224 at 163.com>
Date:   Wed Feb 16 23:33:17 2022 +0800

    doc: Refactored the example in crypto.pod
    
    Added return value and error code in the sample
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17721)

commit 5272fdca6bdedb95fed0403a21a0ab6309f4c161
Author: yangyangtiantianlonglong <yangtianlong1224 at 163.com>
Date:   Wed Feb 16 23:01:38 2022 +0800

    doc: Update "SSL/TLS" old documentation description in openssl.pod
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17721)

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

Summary of changes:
 doc/man1/openssl.pod | 4 ++--
 doc/man7/crypto.pod  | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index c78d06b020..4ecf3c1950 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -25,8 +25,8 @@ B<openssl> B<no->I<XXX> [ I<options> ]
 
 =head1 DESCRIPTION
 
-OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL
-v2/v3) and Transport Layer Security (TLS v1) network protocols and related
+OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL)
+and Transport Layer Security (TLS) network protocols and related
 cryptography standards required by them.
 
 The B<openssl> program is a command line program for using the various
diff --git a/doc/man7/crypto.pod b/doc/man7/crypto.pod
index 33a321ef60..c3e1664be4 100644
--- a/doc/man7/crypto.pod
+++ b/doc/man7/crypto.pod
@@ -380,6 +380,7 @@ encryption/decryption, signatures, message authentication codes, etc.
  #include <stdio.h>
  #include <openssl/evp.h>
  #include <openssl/bio.h>
+ #include <openssl/err.h>
 
  int main(void)
  {
@@ -390,6 +391,7 @@ encryption/decryption, signatures, message authentication codes, etc.
      };
      unsigned int len = 0;
      unsigned char *outdigest = NULL;
+     int ret = 1;
 
      /* Create a context for the digest operation */
      ctx = EVP_MD_CTX_new();
@@ -430,11 +432,16 @@ encryption/decryption, signatures, message authentication codes, etc.
      /* Print out the digest result */
      BIO_dump_fp(stdout, outdigest, len);
 
+     ret = 0;
+
   err:
      /* Clean up all the resources we allocated */
      OPENSSL_free(outdigest);
      EVP_MD_free(sha256);
      EVP_MD_CTX_free(ctx);
+     if (ret != 0)
+        ERR_print_errors_fp(stderr);
+     return ret;
  }
 
 =head1 CONFIGURATION