diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-12 17:12:03 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 10:00:28 +0100 |
| commit | 29000e43ea257bf54f6ccb2064b3744853b821b2 (patch) | |
| tree | 37790003f0f3683ec8cc8836499afb2844b90fa9 /include | |
| parent | 0d30e15a57fdd9c27a9148c17289a1005345f0c7 (diff) | |
| download | openssl-29000e43ea257bf54f6ccb2064b3744853b821b2.zip openssl-29000e43ea257bf54f6ccb2064b3744853b821b2.tar.gz openssl-29000e43ea257bf54f6ccb2064b3744853b821b2.tar.bz2 | |
Make evp_pkey_ctx_get0_libctx/propq public API
These were previously added as an internal API. But since the CMS code
needs them, other code might do too.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13088)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/evp.h | 2 | ||||
| -rw-r--r-- | include/openssl/evp.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 86b8596..ac20b5b 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -835,8 +835,6 @@ int evp_pkey_ctx_get1_id_len_prov(EVP_PKEY_CTX *ctx, size_t *id_len); int evp_pkey_ctx_use_cached_data(EVP_PKEY_CTX *ctx); #endif /* !defined(FIPS_MODULE) */ -OPENSSL_CTX *evp_pkey_ctx_get0_libctx(EVP_PKEY_CTX *ctx); -const char *evp_pkey_ctx_get0_propq(EVP_PKEY_CTX *ctx); void evp_method_store_flush(OPENSSL_CTX *libctx); int evp_set_default_properties_int(OPENSSL_CTX *libctx, const char *propq, int loadconfig); diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 8c2d008..5527709 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1966,6 +1966,9 @@ int EVP_hex2ctrl(int (*cb)(void *ctx, int cmd, void *buf, size_t buflen), int EVP_PKEY_CTX_set_group_name(EVP_PKEY_CTX *ctx, const char *name); int EVP_PKEY_CTX_get_group_name(EVP_PKEY_CTX *ctx, char *name, size_t namelen); +OPENSSL_CTX *EVP_PKEY_CTX_get0_libctx(EVP_PKEY_CTX *ctx); +const char *EVP_PKEY_CTX_get0_propq(EVP_PKEY_CTX *ctx); + # ifdef __cplusplus } # endif |