Commit 094c6aa5 authored by Bodo Möller's avatar Bodo Möller
Browse files

Thread-safety fixes

parent c098e8b6

crypto/bn/bn_mont.c

+25 −11
Original line number Diff line number Diff line
@@ -403,18 +403,32 @@ BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from) 
BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,

					const BIGNUM *mod, BN_CTX *ctx)

	{

	if (*pmont)

		return *pmont;

	int got_write_lock = 0;

	BN_MONT_CTX *ret;



	CRYPTO_r_lock(lock);

	if (!*pmont)

		{

		CRYPTO_r_unlock(lock);

		CRYPTO_w_lock(lock);

		got_write_lock = 1;



		if (!*pmont)

			{

		BN_MONT_CTX *mtmp;

		mtmp = BN_MONT_CTX_new();

		if (mtmp && !BN_MONT_CTX_set(mtmp, mod, ctx))

			BN_MONT_CTX_free(mtmp);

			ret = BN_MONT_CTX_new();

			if (ret && !BN_MONT_CTX_set(ret, mod, ctx))

				BN_MONT_CTX_free(ret);

			else

			*pmont = mtmp;

				*pmont = ret;

			}

		}

	

	ret = *pmont;

	

	if (got_write_lock)

		CRYPTO_w_unlock(lock);

	return *pmont;

	else

		CRYPTO_r_unlock(lock);

		

	return ret;

	}

crypto/rsa/rsa_eay.c

+7 −0
Original line number Diff line number Diff line
@@ -287,6 +287,13 @@ static BN_BLINDING *setup_blinding(RSA *rsa, BN_CTX *ctx) 
		}

	if ((Ai=BN_mod_inverse(NULL,A,rsa->n,ctx)) == NULL) goto err;



	if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)

		{

		if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n,

					CRYPTO_LOCK_RSA, rsa->n, ctx))

			goto err;

		}



	if (!rsa->meth->bn_mod_exp(A,A,rsa->e,rsa->n,ctx,rsa->_method_mod_n))

		goto err;

	ret = BN_BLINDING_new(A,Ai,rsa->n);