diff options
| author | Matt Caswell <matt@openssl.org> | 2020-04-06 18:21:50 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-04-15 11:24:13 +0100 |
| commit | 1531241c54b36be74967753cdea78c16831f7aa5 (patch) | |
| tree | fdb87950cae868810cb58c3efbc6743f32c23561 /include/openssl/pem.h | |
| parent | 8755b085244c792bc8a78b38984b0f4061bc9f91 (diff) | |
| download | openssl-1531241c54b36be74967753cdea78c16831f7aa5.zip openssl-1531241c54b36be74967753cdea78c16831f7aa5.tar.gz openssl-1531241c54b36be74967753cdea78c16831f7aa5.tar.bz2 | |
Teach PEM_read_bio_PrivateKey about libctx
Now that d2i_PrivateKey_ex() and other similar functions exist we should
use it when loading a PEM PrivateKey.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11494)
Diffstat (limited to 'include/openssl/pem.h')
| -rw-r--r-- | include/openssl/pem.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/openssl/pem.h b/include/openssl/pem.h index e48d247..b811d5e 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -347,6 +347,14 @@ DECLARE_PEM_rw(DHparams, DH) DECLARE_PEM_write(DHxparams, DH) # endif DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) +EVP_PKEY *PEM_read_bio_PrivateKey_ex(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, + void *u, OPENSSL_CTX *libctx, + const char *propq); +# ifndef OPENSSL_NO_STDIO +EVP_PKEY *PEM_read_PrivateKey_ex(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, + void *u, OPENSSL_CTX *libctx, + const char *propq); +# endif DECLARE_PEM_rw(PUBKEY, EVP_PKEY) int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x, |