projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae6412f
)
Remove another lock from e_chil
author
Matt Caswell
<matt@openssl.org>
Wed, 9 Mar 2016 01:07:26 +0000
(
01:07
+0000)
committer
Richard Levitte
<levitte@openssl.org>
Wed, 9 Mar 2016 10:04:27 +0000
(11:04 +0100)
Reviewed-by: Richard Levitte <levitte@openssl.org>
engines/e_chil.c
patch
|
blob
|
history
diff --git
a/engines/e_chil.c
b/engines/e_chil.c
index c6ae800069f3444ac1b809ec9798bb9559b1a613..a748e59686ee63d5b016656051c2e7c8cb9e1509 100644
(file)
--- a/
engines/e_chil.c
+++ b/
engines/e_chil.c
@@
-870,14
+870,14
@@
static EVP_PKEY *hwcrhk_load_pubkey(ENGINE *eng, const char *key_id,
{
RSA *rsa = NULL;
- CRYPTO_
w_lock(CRYPTO_LOCK_EVP_PKEY
);
+ CRYPTO_
THREAD_write_lock(chil_lock
);
rsa = res->pkey.rsa;
res->pkey.rsa = RSA_new();
res->pkey.rsa->n = rsa->n;
res->pkey.rsa->e = rsa->e;
rsa->n = NULL;
rsa->e = NULL;
- CRYPTO_
w_unlock(CRYPTO_LOCK_EVP_PKEY
);
+ CRYPTO_
THREAD_unlock(chil_lock
);
RSA_free(rsa);
}
break;