aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/math/numbertheory/numthry.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/math/numbertheory/numthry.cpp b/src/lib/math/numbertheory/numthry.cpp
index e3c673ea5..5946aa994 100644
--- a/src/lib/math/numbertheory/numthry.cpp
+++ b/src/lib/math/numbertheory/numthry.cpp
@@ -54,10 +54,7 @@ bool MillerRabin_Test::is_witness(const BigInt& a)
return false;
}
- if(y != n_minus_1) // fails Fermat test
- return true;
-
- return false;
+ return true; // fails Fermat test
}
/*
@@ -392,17 +389,21 @@ bool primality_test(const BigInt& n,
MillerRabin_Test mr(n);
+ if(mr.is_witness(2))
+ return false;
+
const size_t tests = miller_rabin_test_iterations(n.bits(), level);
- BigInt nonce;
for(size_t i = 0; i != tests; ++i)
{
+ BigInt nonce;
while(nonce < 2 || nonce >= (n-1))
nonce.randomize(rng, NONCE_BITS);
if(mr.is_witness(nonce))
return false;
}
+
return true;
}