summaryrefslogtreecommitdiffstats
path: root/crypto/pem
diff options
context:
space:
mode:
authorChristian Hohnstaedt <christian@hohnstaedt.de>2020-03-22 09:41:30 +0100
committerTomas Mraz <tmraz@fedoraproject.org>2020-04-27 17:43:50 +0200
commita5ae257ed2d046105cff99d72d2d1335091a3515 (patch)
tree7e8855cf9c3aec6502d5cb2367b7c80d73724e7b /crypto/pem
parent7d66cb360c448361654a8ffff73e790c474ba302 (diff)
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)
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pvkfmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 1fc19c17f9..46ed2ecdbc 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;
}