Skip to content

pkey: do not retry OSSL_DECODER_from_bio() for DER encoding #1146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhenium merged 1 commit into from
Nov 10, 2026
Merged

pkey: do not retry OSSL_DECODER_from_bio() for DER encoding #1146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ext/openssl/ossl_pkey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ ossl_pkey_wrap(EVP_PKEY *pkey)
# include <openssl/decoder.h>

static EVP_PKEY *
ossl_pkey_read(BIO *bio, const char *input_type, int selection, VALUE pass)
ossl_pkey_read(BIO *bio, int from_pem, int selection, VALUE pass)
{
const char *input_type = from_pem ? "PEM" : "DER";
void *ppass = (void *)pass;
OSSL_DECODER_CTX *dctx;
EVP_PKEY *pkey = NULL;
Expand All @@ -101,7 +102,7 @@ ossl_pkey_read(BIO *bio, const char *input_type, int selection, VALUE pass)
while (1) {
if (OSSL_DECODER_from_bio(dctx, bio) == 1)
goto out;
if (BIO_eof(bio))
if (!from_pem || BIO_eof(bio))
break;
pos2 = BIO_tell(bio);
if (pos2 < 0 || pos2 <= pos)
Expand All @@ -119,9 +120,6 @@ EVP_PKEY *
ossl_pkey_read_generic(BIO *bio, VALUE pass)
{
EVP_PKEY *pkey = NULL;
/* First check DER, then check PEM. */
const char *input_types[] = {"DER", "PEM"};
int input_type_num = (int)(sizeof(input_types) / sizeof(char *));
/*
* Non-zero selections to try to decode.
*
Expand Down Expand Up @@ -169,9 +167,10 @@ ossl_pkey_read_generic(BIO *bio, VALUE pass)
int selection_num = (int)(sizeof(selections) / sizeof(int));
int i, j;

for (i = 0; i < input_type_num; i++) {
/* First check DER, then check PEM. */
for (i = 0; i <= 1; i++) {
for (j = 0; j < selection_num; j++) {
pkey = ossl_pkey_read(bio, input_types[i], selections[j], pass);
pkey = ossl_pkey_read(bio, i, selections[j], pass);
if (pkey) {
goto out;
}
Expand Down
Loading