mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-05 14:10:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

pem_read_bio_key_decoder: Avoid spurious error on unknown PEM data

Browse Source 
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15949)
This commit is contained in:
Tomas Mraz 2021-06-29 15:46:25 +02:00
parent 92d7120c60
commit fbbd425336
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crypto/pem/pem_pkey.c
View File

@ -55,11 +55,24 @@ static EVP_PKEY *pem_read_bio_key_decoder(BIO *bp, EVP_PKEY **x,
if (!OSSL_DECODER_CTX_set_pem_password_cb(dctx, cb, u))
goto err;
ERR_set_mark();
while (!OSSL_DECODER_from_bio(dctx, bp) || pkey == NULL)
if (BIO_eof(bp) != 0 || (newpos = BIO_tell(bp)) < 0 || newpos <= pos)
if (BIO_eof(bp) != 0 || (newpos = BIO_tell(bp)) < 0 || newpos <= pos) {
ERR_clear_last_mark();
goto err;
else
} else {
if (ERR_GET_REASON(ERR_peek_error()) == ERR_R_UNSUPPORTED) {
/* unsupported PEM data, try again */
ERR_pop_to_mark();
ERR_set_mark();
} else {
/* other error, bail out */
ERR_clear_last_mark();
goto err;
}
pos = newpos;
}
ERR_pop_to_mark();
if (!evp_keymgmt_util_has(pkey, selection)) {
EVP_PKEY_free(pkey);