From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 1 Sep 2011 14:23:41 +0000 (+0000)
Subject: make timing attack protection unconditional
X-Git-Tag: OpenSSL_0_9_8s~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a0bf2c86abcbb1e6659816b9ca97ca81c154eb41;p=oweals%2Fopenssl.git

make timing attack protection unconditional
---

diff --git a/crypto/ecdsa/ecs_ossl.c b/crypto/ecdsa/ecs_ossl.c
index bbb5588cbe..1bbf328de5 100644
--- a/crypto/ecdsa/ecs_ossl.c
+++ b/crypto/ecdsa/ecs_ossl.c
@@ -144,7 +144,6 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
 			}
 		while (BN_is_zero(k));
 
-#ifdef ECDSA_POINT_MUL_NO_CONSTTIME
 		/* We do not want timing information to leak the length of k,
 		 * so we compute G*k using an equivalent scalar of fixed
 		 * bit-length. */
@@ -152,7 +151,6 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
 		if (!BN_add(k, k, order)) goto err;
 		if (BN_num_bits(k) <= BN_num_bits(order))
 			if (!BN_add(k, k, order)) goto err;
-#endif /* def(ECDSA_POINT_MUL_NO_CONSTTIME) */
 
 		/* compute r the x-coordinate of generator * k */
 		if (!EC_POINT_mul(group, tmp_point, k, NULL, NULL, ctx))