39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From a5ae257ed2d046105cff99d72d2d1335091a3515 Mon Sep 17 00:00:00 2001
|
|
From: Christian Hohnstaedt <christian@hohnstaedt.de>
|
|
Date: Sun, 22 Mar 2020 09:41:30 +0100
|
|
Subject: [PATCH 036/217] 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@openssl.org>
|
|
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
|
|
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/11380)
|
|
|
|
(cherry picked from commit 80b94a5adb461f94629d36db351a051b0a890856)
|
|
---
|
|
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 1fc19c1..46ed2ec 100644
|
|
--- a/crypto/pem/pvkfmt.c
|
|
+++ b/crypto/pem/pvkfmt.c
|
|
@@ -875,9 +875,9 @@ int i2b_PVK_bio(BIO *out, 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;
|
|
}
|
|
|
|
--
|
|
1.8.3.1
|
|
|