[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  80b94a5adb461f94629d36db351a051b0a890856 (commit)
      from  7ffce852372799b6cd856b711db21332f0048314 (commit)


- Log -----------------------------------------------------------------
commit 80b94a5adb461f94629d36db351a051b0a890856
Author: Christian Hohnstaedt <christian at hohnstaedt.de>
Date:   Sun Mar 22 09:41:30 2020 +0100

    i2b_PVK_bio: don't set PEM_R_BIO_WRITE_FAILURE in case of success
    
    but in case of an error
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11380)

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

Summary of changes:
 crypto/pem/pvkfmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 6896cc4e4c..1a24ce755a 100644
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -882,9 +882,9 @@ int i2b_PVK_bio(BIO *out, const EVP_PKEY *pk, int enclevel,
     wrlen = BIO_write(out, tmp, outlen);
     OPENSSL_free(tmp);
     if (wrlen == outlen) {
-        PEMerr(PEM_F_I2B_PVK_BIO, PEM_R_BIO_WRITE_FAILURE);
         return outlen;
     }
+    PEMerr(PEM_F_I2B_PVK_BIO, PEM_R_BIO_WRITE_FAILURE);
     return -1;
 }