projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
evp: update to structure based atomics
[openssl.git]
/
crypto
/
evp
/
evp_enc.c
diff --git
a/crypto/evp/evp_enc.c
b/crypto/evp/evp_enc.c
index 3187ba35c997d185075cb8e8ca8966d3d9fccefe..6b6d65163f9cc1e53baee4adf756dcdde41cc9ba 100644
(file)
--- a/
crypto/evp/evp_enc.c
+++ b/
crypto/evp/evp_enc.c
@@
-1483,13
+1483,9
@@
EVP_CIPHER *evp_cipher_new(void)
{
EVP_CIPHER *cipher = OPENSSL_zalloc(sizeof(EVP_CIPHER));
{
EVP_CIPHER *cipher = OPENSSL_zalloc(sizeof(EVP_CIPHER));
- if (cipher != NULL) {
- cipher->lock = CRYPTO_THREAD_lock_new();
- if (cipher->lock == NULL) {
- OPENSSL_free(cipher);
- return NULL;
- }
- cipher->refcnt = 1;
+ if (cipher != NULL && !CRYPTO_NEW_REF(&cipher->refcnt, 1)) {
+ OPENSSL_free(cipher);
+ return NULL;
}
return cipher;
}
}
return cipher;
}
@@
-1689,7
+1685,7
@@
int EVP_CIPHER_up_ref(EVP_CIPHER *cipher)
int ref = 0;
if (cipher->origin == EVP_ORIG_DYNAMIC)
int ref = 0;
if (cipher->origin == EVP_ORIG_DYNAMIC)
- CRYPTO_UP_REF(&cipher->refcnt, &ref
, cipher->lock
);
+ CRYPTO_UP_REF(&cipher->refcnt, &ref);
return 1;
}
return 1;
}
@@
-1697,7
+1693,7
@@
void evp_cipher_free_int(EVP_CIPHER *cipher)
{
OPENSSL_free(cipher->type_name);
ossl_provider_free(cipher->prov);
{
OPENSSL_free(cipher->type_name);
ossl_provider_free(cipher->prov);
- CRYPTO_
THREAD_lock_free(cipher->lock
);
+ CRYPTO_
FREE_REF(&cipher->refcnt
);
OPENSSL_free(cipher);
}
OPENSSL_free(cipher);
}
@@
-1708,7
+1704,7
@@
void EVP_CIPHER_free(EVP_CIPHER *cipher)
if (cipher == NULL || cipher->origin != EVP_ORIG_DYNAMIC)
return;
if (cipher == NULL || cipher->origin != EVP_ORIG_DYNAMIC)
return;
- CRYPTO_DOWN_REF(&cipher->refcnt, &i
, cipher->lock
);
+ CRYPTO_DOWN_REF(&cipher->refcnt, &i);
if (i > 0)
return;
evp_cipher_free_int(cipher);
if (i > 0)
return;
evp_cipher_free_int(cipher);