Split out BN_div and BN_mod into ct and nonct versions for Internal use.

ok jsing@

3 files changed, 9 insertions, 9 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_ameth.c b/src/lib/libcrypto/dsa/dsa_ameth.c
index 92ad02e187..b589d39892 100644
--- a/src/lib/libcrypto/dsa/dsa_ameth.c
+++ b/src/lib/libcrypto/dsa/dsa_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_ameth.c,v 1.21 2017/01/21 09:38:59 beck Exp $ */
+/* $OpenBSD: dsa_ameth.c,v 1.22 2017/01/21 10:38:29 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -501,7 +501,7 @@ old_dsa_priv_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
         if (BN_sub(p1, dsa->p, BN_value_one()) == 0)
                 goto err;
         /* j = (p - 1) / q */
-        if (BN_div(j, NULL, p1, dsa->q, ctx) == 0)
+        if (BN_div_ct(j, NULL, p1, dsa->q, ctx) == 0)
                 goto err;
         /* q * j should == p - 1 */
         if (BN_mul(newp1, dsa->q, j, ctx) == 0)
diff --git a/src/lib/libcrypto/dsa/dsa_gen.c b/src/lib/libcrypto/dsa/dsa_gen.c
index d627e5ae9c..b6bbb8ab08 100644
--- a/src/lib/libcrypto/dsa/dsa_gen.c
+++ b/src/lib/libcrypto/dsa/dsa_gen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_gen.c,v 1.23 2017/01/21 09:38:59 beck Exp $ */
+/* $OpenBSD: dsa_gen.c,v 1.24 2017/01/21 10:38:29 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -271,7 +271,7 @@ dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, const EVP_MD *evpmd,
                         /* step 9 */
                         if (!BN_lshift1(r0, q))
                                 goto err;
-                        if (!BN_mod(c, X, r0, ctx))
+                        if (!BN_mod_ct(c, X, r0, ctx))
                                 goto err;
                         if (!BN_sub(r0, c, BN_value_one()))
                                 goto err;
@@ -306,7 +306,7 @@ end:
         /* Set r0=(p-1)/q */
         if (!BN_sub(test, p, BN_value_one()))
                 goto err;
-        if (!BN_div(r0, NULL, test, q, ctx))
+        if (!BN_div_ct(r0, NULL, test, q, ctx))
                 goto err;
 
         if (!BN_set_word(test, h))
diff --git a/src/lib/libcrypto/dsa/dsa_ossl.c b/src/lib/libcrypto/dsa/dsa_ossl.c
index 3f01a83a44..4177557d0e 100644
--- a/src/lib/libcrypto/dsa/dsa_ossl.c
+++ b/src/lib/libcrypto/dsa/dsa_ossl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_ossl.c,v 1.27 2017/01/21 09:38:59 beck Exp $ */
+/* $OpenBSD: dsa_ossl.c,v 1.28 2017/01/21 10:38:29 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -244,7 +244,7 @@ dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
                         goto err;
         }
 
-        if (!BN_mod(r,r,dsa->q,ctx))
+        if (!BN_mod_ct(r,r,dsa->q,ctx))
                 goto err;
 
         /* Compute  part of 's = inv(k) (m + xr) mod q' */
@@ -351,10 +351,10 @@ dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa)
                                                 mont))
                         goto err;
         }
-                
+
         /* BN_copy(&u1,&t1); */
         /* let u1 = u1 mod q */
-        if (!BN_mod(&u1, &t1, dsa->q, ctx))
+        if (!BN_mod_ct(&u1, &t1, dsa->q, ctx))
                 goto err;
 
         /* V is now in u1.  If the signature is correct, it will be