diff options
Diffstat (limited to 'crypto/ex_data.c')
| -rw-r--r-- | crypto/ex_data.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/crypto/ex_data.c b/crypto/ex_data.c index c1467a51dc..3b06c0b90e 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -10,9 +10,9 @@ #include "crypto/cryptlib.h" #include "internal/thread_once.h" -int do_ex_data_init(OPENSSL_CTX *ctx) +int do_ex_data_init(OSSL_LIB_CTX *ctx) { - OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx); + OSSL_EX_DATA_GLOBAL *global = ossl_lib_ctx_get_ex_data_global(ctx); if (global == NULL) return 0; @@ -59,10 +59,10 @@ static void cleanup_cb(EX_CALLBACK *funcs) * called under potential race-conditions anyway (it's for program shutdown * after all). */ -void crypto_cleanup_all_ex_data_int(OPENSSL_CTX *ctx) +void crypto_cleanup_all_ex_data_int(OSSL_LIB_CTX *ctx) { int i; - OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx); + OSSL_EX_DATA_GLOBAL *global = ossl_lib_ctx_get_ex_data_global(ctx); if (global == NULL) return; @@ -100,12 +100,12 @@ static int dummy_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, return 1; } -int crypto_free_ex_index_ex(OPENSSL_CTX *ctx, int class_index, int idx) +int crypto_free_ex_index_ex(OSSL_LIB_CTX *ctx, int class_index, int idx) { EX_CALLBACKS *ip; EX_CALLBACK *a; int toret = 0; - OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx); + OSSL_EX_DATA_GLOBAL *global = ossl_lib_ctx_get_ex_data_global(ctx); if (global == NULL) return 0; @@ -136,7 +136,7 @@ int CRYPTO_free_ex_index(int class_index, int idx) /* * Register a new index. */ -int crypto_get_ex_new_index_ex(OPENSSL_CTX *ctx, int class_index, long argl, +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) @@ -144,7 +144,7 @@ int crypto_get_ex_new_index_ex(OPENSSL_CTX *ctx, int class_index, long argl, int toret = -1; EX_CALLBACK *a; EX_CALLBACKS *ip; - OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx); + OSSL_EX_DATA_GLOBAL *global = ossl_lib_ctx_get_ex_data_global(ctx); if (global == NULL) return -1; @@ -203,7 +203,7 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, * in the lock, then using them outside the lock. Note this only applies * to the global "ex_data" state (ie. class definitions), not 'ad' itself. */ -int crypto_new_ex_data_ex(OPENSSL_CTX *ctx, int class_index, void *obj, +int crypto_new_ex_data_ex(OSSL_LIB_CTX *ctx, int class_index, void *obj, CRYPTO_EX_DATA *ad) { int mx, i; @@ -211,7 +211,7 @@ int crypto_new_ex_data_ex(OPENSSL_CTX *ctx, int class_index, void *obj, EX_CALLBACK **storage = NULL; EX_CALLBACK *stack[10]; EX_CALLBACKS *ip; - OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx); + OSSL_EX_DATA_GLOBAL *global = ossl_lib_ctx_get_ex_data_global(ctx); if (global == NULL) return 0; @@ -275,7 +275,7 @@ int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, /* Nothing to copy over */ return 1; - global = openssl_ctx_get_ex_data_global(from->ctx); + global = ossl_lib_ctx_get_ex_data_global(from->ctx); if (global == NULL) return 0; @@ -342,7 +342,7 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad) EX_CALLBACK *f; EX_CALLBACK *stack[10]; EX_CALLBACK **storage = NULL; - OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ad->ctx); + OSSL_EX_DATA_GLOBAL *global = ossl_lib_ctx_get_ex_data_global(ad->ctx); if (global == NULL) goto err; @@ -402,7 +402,7 @@ int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad, if (curval != NULL) return 1; - global = openssl_ctx_get_ex_data_global(ad->ctx); + global = ossl_lib_ctx_get_ex_data_global(ad->ctx); if (global == NULL) return 0; @@ -464,7 +464,7 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx) return sk_void_value(ad->sk, idx); } -OPENSSL_CTX *crypto_ex_data_get_openssl_ctx(const CRYPTO_EX_DATA *ad) +OSSL_LIB_CTX *crypto_ex_data_get_ossl_lib_ctx(const CRYPTO_EX_DATA *ad) { return ad->ctx; } |