diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-11-14 09:52:32 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-11-14 09:52:32 +0100 |
commit | b28828796ad6d65ac463b41bba153f74e4531a6b (patch) | |
tree | 154b9f7436ae575e324f3374a5145e451bf649a8 /main/openssl/crypto/bn/bn_exp.c | |
parent | e7a6c1a987ebee1ddb2f908ca028d613a5c52490 (diff) |
Update OpenSSL version
Diffstat (limited to 'main/openssl/crypto/bn/bn_exp.c')
-rw-r--r-- | main/openssl/crypto/bn/bn_exp.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/main/openssl/crypto/bn/bn_exp.c b/main/openssl/crypto/bn/bn_exp.c index 2abf6fd6..611fa326 100644 --- a/main/openssl/crypto/bn/bn_exp.c +++ b/main/openssl/crypto/bn/bn_exp.c @@ -680,7 +680,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, /* Dedicated window==4 case improves 512-bit RSA sign by ~15%, but as * 512-bit RSA is hardly relevant, we omit it to spare size... */ - if (window==5) + if (window==5 && top>1) { void bn_mul_mont_gather5(BN_ULONG *rp,const BN_ULONG *ap, const void *table,const BN_ULONG *np, @@ -874,7 +874,14 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, bits = BN_num_bits(p); if (bits == 0) { - ret = BN_one(rr); + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) + { + ret = 1; + BN_zero(rr); + } + else + ret = BN_one(rr); return ret; } if (a == 0) |