diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-11-18 01:44:23 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-29 20:55:16 +0100 |
| commit | f864a9396a690958d26c87827ba6f26e7b010caf (patch) | |
| tree | eaefc07122a5280e455a1f93d4dcee66de402a35 /crypto/pem/pem_all.c | |
| parent | 866234ac35e665f20c646059b1d92c5e9eb0c7ab (diff) | |
SERIALIZER: add hooks in PEM_write_bio_ and PEM_write_fp_ routines
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10394)
Diffstat (limited to 'crypto/pem/pem_all.c')
| -rw-r--r-- | crypto/pem/pem_all.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index 975e62e9f7..2e8eb2e183 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -17,6 +17,7 @@ #include <openssl/rsa.h> #include <openssl/dsa.h> #include <openssl/dh.h> +#include "pem_local.h" #ifndef OPENSSL_NO_RSA static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa); @@ -172,4 +173,5 @@ EC_KEY *PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, IMPLEMENT_PEM_write(DHparams, DH, PEM_STRING_DHPARAMS, DHparams) IMPLEMENT_PEM_write(DHxparams, DH, PEM_STRING_DHXPARAMS, DHxparams) #endif -IMPLEMENT_PEM_rw(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY) +IMPLEMENT_PEM_provided_write(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY) +IMPLEMENT_PEM_read(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY) |