diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2016-02-29 16:57:11 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-08 11:10:34 -0500 |
| commit | 9b398ef297dd1b74527dd0afee9f59cd3f5bc33d (patch) | |
| tree | 5ec1a81880da831db9dfe73be72e29c64ddc79a5 /crypto/ec/ecp_nistz256.c | |
| parent | 03273d61e742b02485831ce739e4a6c9b197e3f3 (diff) | |
Convert CRYPTO_LOCK_EC_* to new multi-threading API
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/ec/ecp_nistz256.c')
| -rw-r--r-- | crypto/ec/ecp_nistz256.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c index 0f8bd85af6..f2ef9be7f8 100644 --- a/crypto/ec/ecp_nistz256.c +++ b/crypto/ec/ecp_nistz256.c @@ -76,6 +76,7 @@ struct nistz256_pre_comp_st { PRECOMP256_ROW *precomp; void *precomp_storage; int references; + CRYPTO_RWLOCK *lock; }; /* Functions implemented in assembly */ @@ -1396,22 +1397,39 @@ static NISTZ256_PRE_COMP *ecp_nistz256_pre_comp_new(const EC_GROUP *group) ret->group = group; ret->w = 6; /* default */ ret->references = 1; + + ret->lock = CRYPTO_THREAD_lock_new(); + if (ret->lock == NULL) { + ECerr(EC_F_ECP_NISTZ256_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE); + OPENSSL_free(ret); + return NULL; + } return ret; } NISTZ256_PRE_COMP *EC_nistz256_pre_comp_dup(NISTZ256_PRE_COMP *p) { + int i; if (p != NULL) - CRYPTO_add(&p->references, 1, CRYPTO_LOCK_EC_PRE_COMP); + CRYPTO_atomic_add(&p->references, 1, &i, p->lock); return p; } void EC_nistz256_pre_comp_free(NISTZ256_PRE_COMP *pre) { - if (pre == NULL - || CRYPTO_add(&pre->references, -1, CRYPTO_LOCK_EC_PRE_COMP) > 0) + int i; + + if (pre == NULL) return; + + CRYPTO_atomic_add(&pre->references, -1, &i, pre->lock); + REF_PRINT_COUNT("EC_nistz256", x); + if (i > 0) + return; + REF_ASSERT_ISNT(i < 0); + OPENSSL_free(pre->precomp_storage); + CRYPTO_THREAD_lock_free(pre->lock); OPENSSL_free(pre); } |