diff options
Diffstat (limited to 'crypto/obj/obj.c')
| -rw-r--r-- | crypto/obj/obj.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/obj/obj.c b/crypto/obj/obj.c index 94f739ce..16d964c5 100644 --- a/crypto/obj/obj.c +++ b/crypto/obj/obj.c @@ -87,7 +87,7 @@ static int obj_next_nid(void) { CRYPTO_STATIC_MUTEX_lock_write(&global_next_nid_lock); ret = global_next_nid++; - CRYPTO_STATIC_MUTEX_unlock(&global_next_nid_lock); + CRYPTO_STATIC_MUTEX_unlock_write(&global_next_nid_lock); return ret; } @@ -200,11 +200,11 @@ int OBJ_obj2nid(const ASN1_OBJECT *obj) { match = lh_ASN1_OBJECT_retrieve(global_added_by_data, obj); if (match != NULL) { - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_read(&global_added_lock); return match->nid; } } - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_read(&global_added_lock); nid_ptr = bsearch(obj, kNIDsInOIDOrder, NUM_OBJ, sizeof(unsigned), obj_cmp); if (nid_ptr == NULL) { @@ -243,11 +243,11 @@ int OBJ_sn2nid(const char *short_name) { template.sn = short_name; match = lh_ASN1_OBJECT_retrieve(global_added_by_short_name, &template); if (match != NULL) { - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_read(&global_added_lock); return match->nid; } } - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_read(&global_added_lock); nid_ptr = bsearch(short_name, kNIDsInShortNameOrder, NUM_SN, sizeof(unsigned), short_name_cmp); if (nid_ptr == NULL) { @@ -277,11 +277,11 @@ int OBJ_ln2nid(const char *long_name) { template.ln = long_name; match = lh_ASN1_OBJECT_retrieve(global_added_by_long_name, &template); if (match != NULL) { - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_read(&global_added_lock); return match->nid; } } - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_read(&global_added_lock); nid_ptr = bsearch(long_name, kNIDsInLongNameOrder, NUM_LN, sizeof(unsigned), long_name_cmp); if (nid_ptr == NULL) { @@ -330,11 +330,11 @@ const ASN1_OBJECT *OBJ_nid2obj(int nid) { template.nid = nid; match = lh_ASN1_OBJECT_retrieve(global_added_by_nid, &template); if (match != NULL) { - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_read(&global_added_lock); return match; } } - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_read(&global_added_lock); err: OPENSSL_PUT_ERROR(OBJ, OBJ_R_UNKNOWN_NID); @@ -618,7 +618,7 @@ static int obj_add_object(ASN1_OBJECT *obj) { if (obj->ln != NULL) { ok &= lh_ASN1_OBJECT_insert(global_added_by_long_name, &old_object, obj); } - CRYPTO_STATIC_MUTEX_unlock(&global_added_lock); + CRYPTO_STATIC_MUTEX_unlock_write(&global_added_lock); return ok; } |