94 lines
3.4 KiB
Diff
94 lines
3.4 KiB
Diff
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
|
|
index b876edbfac36e..af52e2ced6914 100644
|
|
--- a/crypto/bn/bn_exp.c
|
|
+++ b/crypto/bn/bn_exp.c
|
|
@@ -606,7 +606,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
|
|
* out by Colin Percival,
|
|
* http://www.daemonology.net/hyperthreading-considered-harmful/)
|
|
*/
|
|
-int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
|
|
+int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
|
|
const BIGNUM *m, BN_CTX *ctx,
|
|
BN_MONT_CTX *in_mont)
|
|
{
|
|
@@ -623,10 +623,6 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
|
|
unsigned int t4 = 0;
|
|
#endif
|
|
|
|
- bn_check_top(a);
|
|
- bn_check_top(p);
|
|
- bn_check_top(m);
|
|
-
|
|
if (!BN_is_odd(m)) {
|
|
ERR_raise(ERR_LIB_BN, BN_R_CALLED_WITH_EVEN_MODULUS);
|
|
return 0;
|
|
@@ -1146,7 +1142,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
|
|
goto err;
|
|
} else
|
|
#endif
|
|
- if (!BN_from_montgomery(rr, &tmp, mont, ctx))
|
|
+ if (!bn_from_mont_fixed_top(rr, &tmp, mont, ctx))
|
|
goto err;
|
|
ret = 1;
|
|
err:
|
|
@@ -1160,6 +1156,19 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
|
|
return ret;
|
|
}
|
|
|
|
+int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
|
|
+ const BIGNUM *m, BN_CTX *ctx,
|
|
+ BN_MONT_CTX *in_mont)
|
|
+{
|
|
+ bn_check_top(a);
|
|
+ bn_check_top(p);
|
|
+ bn_check_top(m);
|
|
+ if (!bn_mod_exp_mont_fixed_top(rr, a, p, m, ctx, in_mont))
|
|
+ return 0;
|
|
+ bn_correct_top(rr);
|
|
+ return 1;
|
|
+}
|
|
+
|
|
int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
|
|
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
|
|
{
|
|
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
|
|
index 19384eba186b5..3f8d65c1bf1a1 100644
|
|
--- a/crypto/ec/ec_lib.c
|
|
+++ b/crypto/ec/ec_lib.c
|
|
@@ -21,6 +21,7 @@
|
|
#include <openssl/opensslv.h>
|
|
#include <openssl/param_build.h>
|
|
#include "crypto/ec.h"
|
|
+#include "crypto/bn.h"
|
|
#include "internal/nelem.h"
|
|
#include "ec_local.h"
|
|
|
|
@@ -1265,10 +1266,10 @@ static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r,
|
|
if (!BN_sub(e, group->order, e))
|
|
goto err;
|
|
/*-
|
|
- * Exponent e is public.
|
|
- * No need for scatter-gather or BN_FLG_CONSTTIME.
|
|
+ * Although the exponent is public we want the result to be
|
|
+ * fixed top.
|
|
*/
|
|
- if (!BN_mod_exp_mont(r, x, e, group->order, ctx, group->mont_data))
|
|
+ if (!bn_mod_exp_mont_fixed_top(r, x, e, group->order, ctx, group->mont_data))
|
|
goto err;
|
|
|
|
ret = 1;
|
|
diff --git a/include/crypto/bn.h b/include/crypto/bn.h
|
|
index 47d9b44f879f0..bdee28625ce60 100644
|
|
--- a/include/crypto/bn.h
|
|
+++ b/include/crypto/bn.h
|
|
@@ -73,6 +73,9 @@ int bn_set_words(BIGNUM *a, const BN_ULONG *words, int num_words);
|
|
*/
|
|
int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
|
|
BN_MONT_CTX *mont, BN_CTX *ctx);
|
|
+int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
|
|
+ const BIGNUM *m, BN_CTX *ctx,
|
|
+ BN_MONT_CTX *in_mont);
|
|
int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
|
|
BN_CTX *ctx);
|
|
int bn_from_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
|