diff options
| author | Jon Spillett <jon.spillett@oracle.com> | 2021-03-15 14:26:09 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-06-01 12:16:27 +0200 |
| commit | 169eca602c67f37abf0a44e1605998d5e7f04fa6 (patch) | |
| tree | 221d3097ca04a1549d0cb93442c1c2d00f954928 /include | |
| parent | 8ee66a092c07e618191ef49c8912f8235b08bb95 (diff) | |
Enhance the encoder/decoder tests to allow testing with a non-default library context and configurable providers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14587)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/pem.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/openssl/pem.h b/include/openssl/pem.h index aaf4e262af..80940dfa96 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -524,8 +524,13 @@ EVP_PKEY *b2i_PublicKey_bio(BIO *in); int i2b_PrivateKey_bio(BIO *out, const EVP_PKEY *pk); int i2b_PublicKey_bio(BIO *out, const EVP_PKEY *pk); EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u); +EVP_PKEY *b2i_PVK_bio_ex(BIO *in, pem_password_cb *cb, void *u, + OSSL_LIB_CTX *libctx, const char *propq); int i2b_PVK_bio(BIO *out, const EVP_PKEY *pk, int enclevel, pem_password_cb *cb, void *u); +int i2b_PVK_bio_ex(BIO *out, const EVP_PKEY *pk, int enclevel, + pem_password_cb *cb, void *u, + OSSL_LIB_CTX *libctx, const char *propq); # ifdef __cplusplus } |