summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-08-18 21:38:56 +0200
committerRichard Levitte <levitte@openssl.org>2020-08-20 12:37:35 +0200
commit6e5ccd58c85f05f8d47a1682125a207dbc694768 (patch)
tree505b0058ebf662bbd75ac103b35227175b9c0759 /util
parent2274d22d39fd65b83c9c969cba86c8f03b3e0bec (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 'util')
-rw-r--r--util/libcrypto.num3
1 files changed, 3 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 762e3cc17a..a9b914839a 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -5266,3 +5266,6 @@ d2i_PUBKEY_ex ? 3_0_0 EXIST::FUNCTION:
OSSL_STORE_INFO_new_PUBKEY ? 3_0_0 EXIST::FUNCTION:
OSSL_STORE_INFO_get0_PUBKEY ? 3_0_0 EXIST::FUNCTION:
OSSL_STORE_INFO_get1_PUBKEY ? 3_0_0 EXIST::FUNCTION:
+PEM_read_bio_PUBKEY_ex ? 3_0_0 EXIST::FUNCTION:
+PEM_read_PUBKEY_ex ? 3_0_0 EXIST::FUNCTION:STDIO
+PEM_read_bio_Parameters_ex ? 3_0_0 EXIST::FUNCTION: