The branch OpenSSL_1_1_1-stable has been updated via a5ae257ed2d046105cff99d72d2d1335091a3515 (commit) from 7d66cb360c448361654a8ffff73e790c474ba302 (commit)
- Log ----------------------------------------------------------------- commit a5ae257ed2d046105cff99d72d2d1335091a3515 Author: Christian Hohnstaedt <christ...@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 <levi...@openssl.org> Reviewed-by: Bernd Edlinger <bernd.edlin...@hotmail.de> Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/11380) (cherry picked from commit 80b94a5adb461f94629d36db351a051b0a890856) ----------------------------------------------------------------------- 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 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; }