diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-08-02 08:59:48 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-08-03 09:00:11 +0200 |
| commit | 4e7ade969944a9e6923a48471efb910dfb5f4a3a (patch) | |
| tree | 3a3526195100f192b6cdf929955f2ee5b2613261 | |
| parent | 24233a0f3c491919ee3a38e2567271ccc041ee1d (diff) | |
Revert "asn1/tasn_utl.c: fix logical error in and overhaul asn1_do_lock."
This reverts commit 24233a0f3c491919ee3a38e2567271ccc041ee1d.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/6843)
| -rw-r--r-- | crypto/asn1/tasn_utl.c | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c index 22e853df46..f79d7d6b44 100644 --- a/crypto/asn1/tasn_utl.c +++ b/crypto/asn1/tasn_utl.c @@ -57,10 +57,8 @@ int asn1_set_choice_selector(ASN1_VALUE **pval, int value, int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it) { const ASN1_AUX *aux; - CRYPTO_REF_COUNT *lck; + int *lck, ret; CRYPTO_RWLOCK **lock; - int ret = -1; - if ((it->itype != ASN1_ITYPE_SEQUENCE) && (it->itype != ASN1_ITYPE_NDEF_SEQUENCE)) return 0; @@ -69,34 +67,25 @@ int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it) return 0; lck = offset2ptr(*pval, aux->ref_offset); lock = offset2ptr(*pval, aux->ref_lock); - - switch (op) { - case 0: - *lck = ret = 1; + if (op == 0) { + *lck = 1; *lock = CRYPTO_THREAD_lock_new(); if (*lock == NULL) { ASN1err(ASN1_F_ASN1_DO_LOCK, ERR_R_MALLOC_FAILURE); return -1; } - break; - case 1: - if (!CRYPTO_UP_REF(lck, &ret, *lock)) - return -1; - break; - case -1: - if (!CRYPTO_DOWN_REF(lck, &ret, *lock)) - return -1; /* failed */ + return 1; + } + if (CRYPTO_atomic_add(lck, op, &ret, *lock) < 0) + return -1; /* failed */ #ifdef REF_PRINT - fprintf(stderr, "%p:%4d:%s\n", it, ret, it->sname); + fprintf(stderr, "%p:%4d:%s\n", it, *lck, it->sname); #endif - REF_ASSERT_ISNT(ret < 0); - if (ret == 0) { - CRYPTO_THREAD_lock_free(*lock); - *lock = NULL; - } - break; + REF_ASSERT_ISNT(ret < 0); + if (ret == 0) { + CRYPTO_THREAD_lock_free(*lock); + *lock = NULL; } - return ret; } |