|
@@ -10,58 +10,33 @@
|
|
|
#include "internal/cryptlib_int.h"
|
|
|
#include "internal/thread_once.h"
|
|
|
|
|
|
-/*
|
|
|
- * Each structure type (sometimes called a class), that supports
|
|
|
- * exdata has a stack of callbacks for each instance.
|
|
|
- */
|
|
|
-struct ex_callback_st {
|
|
|
- long argl; /* Arbitrary long */
|
|
|
- void *argp; /* Arbitrary void * */
|
|
|
- CRYPTO_EX_new *new_func;
|
|
|
- CRYPTO_EX_free *free_func;
|
|
|
- CRYPTO_EX_dup *dup_func;
|
|
|
-};
|
|
|
-
|
|
|
-/*
|
|
|
- * The state for each class. This could just be a typedef, but
|
|
|
- * a structure allows future changes.
|
|
|
- */
|
|
|
-typedef struct ex_callbacks_st {
|
|
|
- STACK_OF(EX_CALLBACK) *meth;
|
|
|
-} EX_CALLBACKS;
|
|
|
-
|
|
|
-static EX_CALLBACKS ex_data[CRYPTO_EX_INDEX__COUNT];
|
|
|
-
|
|
|
-static CRYPTO_RWLOCK *ex_data_lock = NULL;
|
|
|
-static CRYPTO_ONCE ex_data_init = CRYPTO_ONCE_STATIC_INIT;
|
|
|
-
|
|
|
-DEFINE_RUN_ONCE_STATIC(do_ex_data_init)
|
|
|
+int do_ex_data_init(OPENSSL_CTX *ctx)
|
|
|
{
|
|
|
- if (!OPENSSL_init_crypto(0, NULL))
|
|
|
+ OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx);
|
|
|
+
|
|
|
+ if (global == NULL)
|
|
|
return 0;
|
|
|
- ex_data_lock = CRYPTO_THREAD_lock_new();
|
|
|
- return ex_data_lock != NULL;
|
|
|
+
|
|
|
+ global->ex_data_lock = CRYPTO_THREAD_lock_new();
|
|
|
+ return global->ex_data_lock != NULL;
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
* Return the EX_CALLBACKS from the |ex_data| array that corresponds to
|
|
|
* a given class. On success, *holds the lock.*
|
|
|
*/
|
|
|
-static EX_CALLBACKS *get_and_lock(int class_index)
|
|
|
+static EX_CALLBACKS *get_and_lock(OPENSSL_CTX *ctx, int class_index)
|
|
|
{
|
|
|
EX_CALLBACKS *ip;
|
|
|
+ OSSL_EX_DATA_GLOBAL *global = NULL;
|
|
|
|
|
|
if (class_index < 0 || class_index >= CRYPTO_EX_INDEX__COUNT) {
|
|
|
CRYPTOerr(CRYPTO_F_GET_AND_LOCK, ERR_R_PASSED_INVALID_ARGUMENT);
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
- if (!RUN_ONCE(&ex_data_init, do_ex_data_init)) {
|
|
|
- CRYPTOerr(CRYPTO_F_GET_AND_LOCK, ERR_R_MALLOC_FAILURE);
|
|
|
- return NULL;
|
|
|
- }
|
|
|
-
|
|
|
- if (ex_data_lock == NULL) {
|
|
|
+ global = openssl_ctx_get_ex_data_global(ctx);
|
|
|
+ if (global->ex_data_lock == NULL) {
|
|
|
/*
|
|
|
* This can happen in normal operation when using CRYPTO_mem_leaks().
|
|
|
* The CRYPTO_mem_leaks() function calls OPENSSL_cleanup() which cleans
|
|
@@ -74,8 +49,8 @@ static EX_CALLBACKS *get_and_lock(int class_index)
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
- ip = &ex_data[class_index];
|
|
|
- CRYPTO_THREAD_write_lock(ex_data_lock);
|
|
|
+ ip = &global->ex_data[class_index];
|
|
|
+ CRYPTO_THREAD_write_lock(global->ex_data_lock);
|
|
|
return ip;
|
|
|
}
|
|
|
|
|
@@ -90,19 +65,23 @@ 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(void)
|
|
|
+void crypto_cleanup_all_ex_data_int(OPENSSL_CTX *ctx)
|
|
|
{
|
|
|
int i;
|
|
|
+ OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx);
|
|
|
+
|
|
|
+ if (global == NULL)
|
|
|
+ return;
|
|
|
|
|
|
for (i = 0; i < CRYPTO_EX_INDEX__COUNT; ++i) {
|
|
|
- EX_CALLBACKS *ip = &ex_data[i];
|
|
|
+ EX_CALLBACKS *ip = &global->ex_data[i];
|
|
|
|
|
|
sk_EX_CALLBACK_pop_free(ip->meth, cleanup_cb);
|
|
|
ip->meth = NULL;
|
|
|
}
|
|
|
|
|
|
- CRYPTO_THREAD_lock_free(ex_data_lock);
|
|
|
- ex_data_lock = NULL;
|
|
|
+ CRYPTO_THREAD_lock_free(global->ex_data_lock);
|
|
|
+ global->ex_data_lock = NULL;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -127,12 +106,17 @@ static int dummy_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-int CRYPTO_free_ex_index(int class_index, int idx)
|
|
|
+int crypto_free_ex_index_ex(OPENSSL_CTX *ctx, int class_index, int idx)
|
|
|
{
|
|
|
- EX_CALLBACKS *ip = get_and_lock(class_index);
|
|
|
+ EX_CALLBACKS *ip = get_and_lock(ctx, class_index);
|
|
|
EX_CALLBACK *a;
|
|
|
int toret = 0;
|
|
|
+ OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx);
|
|
|
+
|
|
|
+ if (global == NULL)
|
|
|
+ goto err;
|
|
|
|
|
|
+ ip = get_and_lock(ctx, class_index);
|
|
|
if (ip == NULL)
|
|
|
return 0;
|
|
|
if (idx < 0 || idx >= sk_EX_CALLBACK_num(ip->meth))
|
|
@@ -145,21 +129,32 @@ int CRYPTO_free_ex_index(int class_index, int idx)
|
|
|
a->free_func = dummy_free;
|
|
|
toret = 1;
|
|
|
err:
|
|
|
- CRYPTO_THREAD_unlock(ex_data_lock);
|
|
|
+ CRYPTO_THREAD_unlock(global->ex_data_lock);
|
|
|
return toret;
|
|
|
}
|
|
|
|
|
|
+int CRYPTO_free_ex_index(int class_index, int idx)
|
|
|
+{
|
|
|
+ return crypto_free_ex_index_ex(NULL, class_index, idx);
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Register a new index.
|
|
|
*/
|
|
|
-int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
|
|
|
- CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
|
|
|
- CRYPTO_EX_free *free_func)
|
|
|
+int crypto_get_ex_new_index_ex(OPENSSL_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 toret = -1;
|
|
|
EX_CALLBACK *a;
|
|
|
- EX_CALLBACKS *ip = get_and_lock(class_index);
|
|
|
+ EX_CALLBACKS *ip;
|
|
|
+ OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx);
|
|
|
|
|
|
+ if (global == NULL)
|
|
|
+ goto err;
|
|
|
+
|
|
|
+ ip = get_and_lock(ctx, class_index);
|
|
|
if (ip == NULL)
|
|
|
return -1;
|
|
|
|
|
@@ -169,14 +164,14 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
|
|
|
* "app_data" routines use ex_data index zero. See RT 3710. */
|
|
|
if (ip->meth == NULL
|
|
|
|| !sk_EX_CALLBACK_push(ip->meth, NULL)) {
|
|
|
- CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX, ERR_R_MALLOC_FAILURE);
|
|
|
+ CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX_EX, ERR_R_MALLOC_FAILURE);
|
|
|
goto err;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
a = (EX_CALLBACK *)OPENSSL_malloc(sizeof(*a));
|
|
|
if (a == NULL) {
|
|
|
- CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX, ERR_R_MALLOC_FAILURE);
|
|
|
+ CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX_EX, ERR_R_MALLOC_FAILURE);
|
|
|
goto err;
|
|
|
}
|
|
|
a->argl = argl;
|
|
@@ -186,7 +181,7 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
|
|
|
a->free_func = free_func;
|
|
|
|
|
|
if (!sk_EX_CALLBACK_push(ip->meth, NULL)) {
|
|
|
- CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX, ERR_R_MALLOC_FAILURE);
|
|
|
+ CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX_EX, ERR_R_MALLOC_FAILURE);
|
|
|
OPENSSL_free(a);
|
|
|
goto err;
|
|
|
}
|
|
@@ -194,10 +189,18 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
|
|
|
(void)sk_EX_CALLBACK_set(ip->meth, toret, a);
|
|
|
|
|
|
err:
|
|
|
- CRYPTO_THREAD_unlock(ex_data_lock);
|
|
|
+ CRYPTO_THREAD_unlock(global->ex_data_lock);
|
|
|
return toret;
|
|
|
}
|
|
|
|
|
|
+int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
|
|
|
+ CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
|
|
|
+ CRYPTO_EX_free *free_func)
|
|
|
+{
|
|
|
+ return crypto_get_ex_new_index_ex(NULL, class_index, argl, argp, new_func,
|
|
|
+ dup_func, free_func);
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Initialise a new CRYPTO_EX_DATA for use in a particular class - including
|
|
|
* calling new() callbacks for each index in the class used by this variable
|
|
@@ -205,17 +208,24 @@ 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(int class_index, void *obj, CRYPTO_EX_DATA *ad)
|
|
|
+int crypto_new_ex_data_ex(OPENSSL_CTX *ctx, int class_index, void *obj,
|
|
|
+ CRYPTO_EX_DATA *ad)
|
|
|
{
|
|
|
int mx, i;
|
|
|
void *ptr;
|
|
|
EX_CALLBACK **storage = NULL;
|
|
|
EX_CALLBACK *stack[10];
|
|
|
- EX_CALLBACKS *ip = get_and_lock(class_index);
|
|
|
+ EX_CALLBACKS *ip;
|
|
|
+ OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx);
|
|
|
+
|
|
|
+ if (global == NULL)
|
|
|
+ return 0;
|
|
|
|
|
|
+ ip = get_and_lock(ctx, class_index);
|
|
|
if (ip == NULL)
|
|
|
return 0;
|
|
|
|
|
|
+ ad->ctx = ctx;
|
|
|
ad->sk = NULL;
|
|
|
|
|
|
mx = sk_EX_CALLBACK_num(ip->meth);
|
|
@@ -228,10 +238,10 @@ int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
|
|
|
for (i = 0; i < mx; i++)
|
|
|
storage[i] = sk_EX_CALLBACK_value(ip->meth, i);
|
|
|
}
|
|
|
- CRYPTO_THREAD_unlock(ex_data_lock);
|
|
|
+ CRYPTO_THREAD_unlock(global->ex_data_lock);
|
|
|
|
|
|
if (mx > 0 && storage == NULL) {
|
|
|
- CRYPTOerr(CRYPTO_F_CRYPTO_NEW_EX_DATA, ERR_R_MALLOC_FAILURE);
|
|
|
+ CRYPTOerr(CRYPTO_F_CRYPTO_NEW_EX_DATA_EX, ERR_R_MALLOC_FAILURE);
|
|
|
return 0;
|
|
|
}
|
|
|
for (i = 0; i < mx; i++) {
|
|
@@ -246,6 +256,11 @@ int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
|
|
|
+{
|
|
|
+ return crypto_new_ex_data_ex(NULL, class_index, obj, ad);
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Duplicate a CRYPTO_EX_DATA variable - including calling dup() callbacks
|
|
|
* for each index in the class used by this variable
|
|
@@ -259,11 +274,16 @@ int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
|
|
|
EX_CALLBACK **storage = NULL;
|
|
|
EX_CALLBACKS *ip;
|
|
|
int toret = 0;
|
|
|
+ OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(from->ctx);
|
|
|
+
|
|
|
+ if (global == NULL)
|
|
|
+ return 0;
|
|
|
|
|
|
+ to->ctx = from->ctx;
|
|
|
if (from->sk == NULL)
|
|
|
/* Nothing to copy over */
|
|
|
return 1;
|
|
|
- if ((ip = get_and_lock(class_index)) == NULL)
|
|
|
+ if ((ip = get_and_lock(from->ctx, class_index)) == NULL)
|
|
|
return 0;
|
|
|
|
|
|
mx = sk_EX_CALLBACK_num(ip->meth);
|
|
@@ -279,7 +299,7 @@ int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
|
|
|
for (i = 0; i < mx; i++)
|
|
|
storage[i] = sk_EX_CALLBACK_value(ip->meth, i);
|
|
|
}
|
|
|
- CRYPTO_THREAD_unlock(ex_data_lock);
|
|
|
+ CRYPTO_THREAD_unlock(global->ex_data_lock);
|
|
|
|
|
|
if (mx == 0)
|
|
|
return 1;
|
|
@@ -325,8 +345,12 @@ 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;
|
|
|
|
|
|
- if ((ip = get_and_lock(class_index)) == NULL)
|
|
|
+ if ((ip = get_and_lock(ad->ctx, class_index)) == NULL)
|
|
|
+ goto err;
|
|
|
+ global = openssl_ctx_get_ex_data_global(ad->ctx);
|
|
|
+ if (global == NULL)
|
|
|
goto err;
|
|
|
|
|
|
mx = sk_EX_CALLBACK_num(ip->meth);
|
|
@@ -339,15 +363,15 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
|
|
|
for (i = 0; i < mx; i++)
|
|
|
storage[i] = sk_EX_CALLBACK_value(ip->meth, i);
|
|
|
}
|
|
|
- CRYPTO_THREAD_unlock(ex_data_lock);
|
|
|
+ CRYPTO_THREAD_unlock(global->ex_data_lock);
|
|
|
|
|
|
for (i = 0; i < mx; i++) {
|
|
|
if (storage != NULL)
|
|
|
f = storage[i];
|
|
|
else {
|
|
|
- CRYPTO_THREAD_write_lock(ex_data_lock);
|
|
|
+ CRYPTO_THREAD_write_lock(global->ex_data_lock);
|
|
|
f = sk_EX_CALLBACK_value(ip->meth, i);
|
|
|
- CRYPTO_THREAD_unlock(ex_data_lock);
|
|
|
+ CRYPTO_THREAD_unlock(global->ex_data_lock);
|
|
|
}
|
|
|
if (f != NULL && f->free_func != NULL) {
|
|
|
ptr = CRYPTO_get_ex_data(ad, i);
|
|
@@ -360,6 +384,7 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
|
|
|
err:
|
|
|
sk_void_free(ad->sk);
|
|
|
ad->sk = NULL;
|
|
|
+ ad->ctx = NULL;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -372,6 +397,10 @@ int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad,
|
|
|
EX_CALLBACK *f;
|
|
|
EX_CALLBACKS *ip;
|
|
|
void *curval;
|
|
|
+ OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ad->ctx);
|
|
|
+
|
|
|
+ if (global == NULL)
|
|
|
+ return 0;
|
|
|
|
|
|
curval = CRYPTO_get_ex_data(ad, idx);
|
|
|
|
|
@@ -379,11 +408,11 @@ int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad,
|
|
|
if (curval != NULL)
|
|
|
return 1;
|
|
|
|
|
|
- ip = get_and_lock(class_index);
|
|
|
+ ip = get_and_lock(ad->ctx, class_index);
|
|
|
if (ip == NULL)
|
|
|
return 0;
|
|
|
f = sk_EX_CALLBACK_value(ip->meth, idx);
|
|
|
- CRYPTO_THREAD_unlock(ex_data_lock);
|
|
|
+ CRYPTO_THREAD_unlock(global->ex_data_lock);
|
|
|
|
|
|
/*
|
|
|
* This should end up calling CRYPTO_set_ex_data(), which allocates
|
|
@@ -432,3 +461,8 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx)
|
|
|
return NULL;
|
|
|
return sk_void_value(ad->sk, idx);
|
|
|
}
|
|
|
+
|
|
|
+OPENSSL_CTX *crypto_ex_data_get_openssl_ctx(const CRYPTO_EX_DATA *ad)
|
|
|
+{
|
|
|
+ return ad->ctx;
|
|
|
+}
|