diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-08-18 21:38:56 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-08-20 12:37:35 +0200 |
| commit | 6e5ccd58c85f05f8d47a1682125a207dbc694768 (patch) | |
| tree | 505b0058ebf662bbd75ac103b35227175b9c0759 /crypto/pem/pem_all.c | |
| parent | 2274d22d39fd65b83c9c969cba86c8f03b3e0bec (diff) | |
PEM: Add more library context aware PEM readers
PEM_read_bio_PUBKEY_ex() and PEM_read_bio_Parameters_ex() are added to
complete PEM_read_bio_PrivateKey_ex(). They are all refactored to be
wrappers around the same internal function.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12673)
Diffstat (limited to 'crypto/pem/pem_all.c')
| -rw-r--r-- | crypto/pem/pem_all.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index 9b803082c6..bf7159a6ad 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -181,4 +181,3 @@ IMPLEMENT_PEM_write(DHparams, DH, PEM_STRING_DHPARAMS, DHparams) IMPLEMENT_PEM_write(DHxparams, DH, PEM_STRING_DHXPARAMS, DHxparams) #endif IMPLEMENT_PEM_provided_write(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY) -IMPLEMENT_PEM_read(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY) |