mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-09 05:51:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimise locking in rsa_get_blinding()

Browse Source 
We optimise locking in rsa_get_blinding() so that we normally take a
read lock, and only fallback to a write lock if we need to. This will
be very slightly slower in the case of single use RSA objects, but should
be significantly better when an RSA object is reused in a multi-threaded
environment. It's probably worth the trade off.

Partially fixes #20286

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20953)
This commit is contained in:
Matt Caswell 2023-05-12 17:06:10 +01:00
parent 6d15357aeb
commit f53479f98a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/rsa/rsa_ossl.c
View File

@ -186,11 +186,21 @@ static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
{
BN_BLINDING *ret;
if (!CRYPTO_THREAD_write_lock(rsa->lock))
if (!CRYPTO_THREAD_read_lock(rsa->lock))
return NULL;
if (rsa->blinding == NULL) {
rsa->blinding = RSA_setup_blinding(rsa, ctx);
/*
* This dance with upgrading the lock from read to write will be
* slower in cases of a single use RSA object, but should be
* significantly better in multi-thread cases (e.g. servers). It's
* probably worth it.
*/
CRYPTO_THREAD_unlock(rsa->lock);
if (!CRYPTO_THREAD_write_lock(rsa->lock))
return NULL;
if (rsa->blinding == NULL)
rsa->blinding = RSA_setup_blinding(rsa, ctx);
}
ret = rsa->blinding;
@ -212,7 +222,11 @@ static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
*local = 0;
if (rsa->mt_blinding == NULL) {
rsa->mt_blinding = RSA_setup_blinding(rsa, ctx);
CRYPTO_THREAD_unlock(rsa->lock);
if (!CRYPTO_THREAD_write_lock(rsa->lock))
return NULL;
if (rsa->mt_blinding == NULL)
rsa->mt_blinding = RSA_setup_blinding(rsa, ctx);
}
ret = rsa->mt_blinding;
}