diff options
Diffstat (limited to 'crypto/engine/eng_list.c')
| -rw-r--r-- | crypto/engine/eng_list.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index 11db858056..5a6238daf4 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -77,7 +77,7 @@ static int engine_list_add(ENGINE *e) /* * Having the engine in the list assumes a structural reference. */ - if (!CRYPTO_UP_REF(&e->struct_ref, &ref, e->refcnt_lock)) { + if (!CRYPTO_UP_REF(&e->struct_ref, &ref)) { ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR); return 0; } @@ -85,7 +85,7 @@ static int engine_list_add(ENGINE *e) if (engine_list_head == NULL) { /* We are adding to an empty list. */ if (engine_list_tail != NULL) { - CRYPTO_DOWN_REF(&e->struct_ref, &ref, e->refcnt_lock); + CRYPTO_DOWN_REF(&e->struct_ref, &ref); ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR); return 0; } @@ -98,7 +98,7 @@ static int engine_list_add(ENGINE *e) } else { /* We are adding to the tail of an existing list. */ if ((engine_list_tail == NULL) || (engine_list_tail->next != NULL)) { - CRYPTO_DOWN_REF(&e->struct_ref, &ref, e->refcnt_lock); + CRYPTO_DOWN_REF(&e->struct_ref, &ref); ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR); return 0; } @@ -238,7 +238,7 @@ ENGINE *ENGINE_get_first(void) if (ret) { int ref; - if (!CRYPTO_UP_REF(&ret->struct_ref, &ref, ret->refcnt_lock)) { + if (!CRYPTO_UP_REF(&ret->struct_ref, &ref)) { ERR_raise(ERR_LIB_ENGINE, ERR_R_CRYPTO_LIB); return NULL; } @@ -264,7 +264,7 @@ ENGINE *ENGINE_get_last(void) if (ret) { int ref; - if (!CRYPTO_UP_REF(&ret->struct_ref, &ref, ret->refcnt_lock)) { + if (!CRYPTO_UP_REF(&ret->struct_ref, &ref)) { ERR_raise(ERR_LIB_ENGINE, ERR_R_CRYPTO_LIB); return NULL; } @@ -289,7 +289,7 @@ ENGINE *ENGINE_get_next(ENGINE *e) int ref; /* Return a valid structural reference to the next ENGINE */ - if (!CRYPTO_UP_REF(&ret->struct_ref, &ref, ret->refcnt_lock)) { + if (!CRYPTO_UP_REF(&ret->struct_ref, &ref)) { ERR_raise(ERR_LIB_ENGINE, ERR_R_CRYPTO_LIB); return NULL; } @@ -315,7 +315,7 @@ ENGINE *ENGINE_get_prev(ENGINE *e) int ref; /* Return a valid structural reference to the next ENGINE */ - if (!CRYPTO_UP_REF(&ret->struct_ref, &ref, ret->refcnt_lock)) { + if (!CRYPTO_UP_REF(&ret->struct_ref, &ref)) { ERR_raise(ERR_LIB_ENGINE, ERR_R_CRYPTO_LIB); return NULL; } @@ -435,8 +435,7 @@ ENGINE *ENGINE_by_id(const char *id) } else { int ref; - if (!CRYPTO_UP_REF(&iterator->struct_ref, &ref, - iterator->refcnt_lock)) { + if (!CRYPTO_UP_REF(&iterator->struct_ref, &ref)) { CRYPTO_THREAD_unlock(global_engine_lock); ERR_raise(ERR_LIB_ENGINE, ERR_R_CRYPTO_LIB); return NULL; @@ -477,6 +476,6 @@ int ENGINE_up_ref(ENGINE *e) ERR_raise(ERR_LIB_ENGINE, ERR_R_PASSED_NULL_PARAMETER); return 0; } - CRYPTO_UP_REF(&e->struct_ref, &i, global_engine_lock); + CRYPTO_UP_REF(&e->struct_ref, &i); return 1; } |