Skip to content
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

pkey: use OSSL_DECODER to load encrypted PEM on OpenSSL 3.0 #479

Merged
merged 2 commits into from
Dec 12, 2021
Merged

pkey: use OSSL_DECODER to load encrypted PEM on OpenSSL 3.0 #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c185e0
pkey: test parsing concatenated PEM string
rhenium Nov 3, 2021
a84ea53
pkey: use OSSL_DECODER to load encrypted PEM on OpenSSL 3.0
rhenium Mar 20, 2021
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
40 changes: 40 additions & 0 deletions ext/openssl/ossl_pkey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,45 @@ ossl_pkey_new(EVP_PKEY *pkey)
return obj;
}

#if OSSL_OPENSSL_PREREQ(3, 0, 0)
# include <openssl/decoder.h>

EVP_PKEY *
ossl_pkey_read_generic(BIO *bio, VALUE pass)
{
void *ppass = (void *)pass;
OSSL_DECODER_CTX *dctx;
EVP_PKEY *pkey = NULL;
int pos = 0, pos2;

dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, NULL, 0, NULL, NULL);
if (!dctx)
goto out;
if (OSSL_DECODER_CTX_set_pem_password_cb(dctx, ossl_pem_passwd_cb, ppass) != 1)
goto out;

/* First check DER */
if (OSSL_DECODER_from_bio(dctx, bio) == 1)
goto out;

/* Then check PEM; multiple OSSL_DECODER_from_bio() calls may be needed */
OSSL_BIO_reset(bio);
if (OSSL_DECODER_CTX_set_input_type(dctx, "PEM") != 1)
goto out;
while (OSSL_DECODER_from_bio(dctx, bio) != 1) {
if (BIO_eof(bio))
goto out;
pos2 = BIO_tell(bio);
if (pos2 < 0 || pos2 <= pos)
goto out;
pos = pos2;
}

out:
OSSL_DECODER_CTX_free(dctx);
return pkey;
}
#else
EVP_PKEY *
ossl_pkey_read_generic(BIO *bio, VALUE pass)
{
Expand Down Expand Up @@ -107,6 +146,7 @@ ossl_pkey_read_generic(BIO *bio, VALUE pass)
out:
return pkey;
}
#endif

/*
* call-seq:
Expand Down
6 changes: 6 additions & 0 deletions test/openssl/test_pkey_rsa.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@ def test_RSAPrivateKey

assert_equal asn1.to_der, rsa1024.to_der
assert_equal pem, rsa1024.export

# Unknown PEM prepended
cert = issue_cert(OpenSSL::X509::Name.new([["CN", "nobody"]]), rsa1024, 1, [], nil, nil)
str = cert.to_text + cert.to_pem + rsa1024.to_pem
key = OpenSSL::PKey::RSA.new(str)
assert_same_rsa rsa1024, key
end

def test_RSAPrivateKey_encrypted
Expand Down