[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  8b7d7789dc4ea0de11331cb4045bcb03ab0864fc (commit)
      from  1287dabd0b23326be491125698dd982e4ae28887 (commit)


- Log -----------------------------------------------------------------
commit 8b7d7789dc4ea0de11331cb4045bcb03ab0864fc
Author: PW Hu <jlu.hpw at foxmail.com>
Date:   Fri Oct 22 18:10:17 2021 +0800

    Fix return value error in doc, and an error test
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16889)
    
    [edited to remove end of line whitespace and wrap lines to eighty columns]

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

Summary of changes:
 doc/man3/RSA_print.pod        | 5 ++++-
 test/evp_pkey_provided_test.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/man3/RSA_print.pod b/doc/man3/RSA_print.pod
index f85c5f3f47..fa5eb1def0 100644
--- a/doc/man3/RSA_print.pod
+++ b/doc/man3/RSA_print.pod
@@ -50,7 +50,10 @@ The output lines are indented by B<offset> spaces.
 
 =head1 RETURN VALUES
 
-These functions return 1 on success, 0 on error.
+DSAparams_print(), DSAparams_print_fp(), DSA_print(), and DSA_print_fp()
+return 1 for success and 0 or a negative value for failure.
+
+DHparams_print() and DHparams_print_fp() return 1 on success, 0 on error.
 
 =head1 SEE ALSO
 
diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c
index 15c8ce77bb..f6424b86fa 100644
--- a/test/evp_pkey_provided_test.c
+++ b/test/evp_pkey_provided_test.c
@@ -141,7 +141,7 @@ static int test_print_key_using_pem(const char *alg, const EVP_PKEY *pk)
                                             (unsigned char *)"pass", 4,
                                             NULL, NULL))
         /* Private key in text form */
-        || !TEST_true(EVP_PKEY_print_private(membio, pk, 0, NULL))
+        || !TEST_int_gt(EVP_PKEY_print_private(membio, pk, 0, NULL), 0)
         || !TEST_true(compare_with_file(alg, PRIV_TEXT, membio))
         /* Public key in PEM form */
         || !TEST_true(PEM_write_bio_PUBKEY(membio, pk))