diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-24 18:07:52 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:35:10 +1000 |
| commit | e4bec869104cf4ba51cbb1effb0f5437e327ecd8 (patch) | |
| tree | 7b80aadaea2dce5e0aad42d37abc345d464995e0 /include | |
| parent | 63b64f19c13d59d68dc2e525f454aea62a739842 (diff) | |
Fix external symbols for crypto_*
Partial fix for #12964
This adds ossl_ names for symbols related to crypto_*
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/cryptlib.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index 5145178dee..663c3ef808 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -92,8 +92,8 @@ void OPENSSL_cpuid_setup(void); extern unsigned int OPENSSL_ia32cap_P[]; #endif void OPENSSL_showfatal(const char *fmta, ...); -int do_ex_data_init(OSSL_LIB_CTX *ctx); -void crypto_cleanup_all_ex_data_int(OSSL_LIB_CTX *ctx); +int ossl_do_ex_data_init(OSSL_LIB_CTX *ctx); +void ossl_crypto_cleanup_all_ex_data_int(OSSL_LIB_CTX *ctx); int openssl_init_fork_handlers(void); int openssl_get_fork_id(void); @@ -187,15 +187,15 @@ int ossl_lib_ctx_run_once(OSSL_LIB_CTX *ctx, unsigned int idx, int ossl_lib_ctx_onfree(OSSL_LIB_CTX *ctx, ossl_lib_ctx_onfree_fn onfreefn); const char *ossl_lib_ctx_get_descriptor(OSSL_LIB_CTX *libctx); -OSSL_LIB_CTX *crypto_ex_data_get_ossl_lib_ctx(const CRYPTO_EX_DATA *ad); -int crypto_new_ex_data_ex(OSSL_LIB_CTX *ctx, int class_index, void *obj, - CRYPTO_EX_DATA *ad); -int crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index, - long argl, void *argp, - CRYPTO_EX_new *new_func, - CRYPTO_EX_dup *dup_func, - CRYPTO_EX_free *free_func); -int crypto_free_ex_index_ex(OSSL_LIB_CTX *ctx, int class_index, int idx); +OSSL_LIB_CTX *ossl_crypto_ex_data_get_ossl_lib_ctx(const CRYPTO_EX_DATA *ad); +int ossl_crypto_new_ex_data_ex(OSSL_LIB_CTX *ctx, int class_index, void *obj, + CRYPTO_EX_DATA *ad); +int ossl_crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index, + long argl, void *argp, + CRYPTO_EX_new *new_func, + CRYPTO_EX_dup *dup_func, + CRYPTO_EX_free *free_func); +int ossl_crypto_free_ex_index_ex(OSSL_LIB_CTX *ctx, int class_index, int idx); /* Function for simple binary search */ |