[Pkg-javascript-commits] [node-diffie-hellman] 24/88: same primes generated
Bastien Roucariès
rouca at moszumanska.debian.org
Thu May 4 10:19:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-diffie-hellman.
commit 1140db5f802d0a69f9c08e479402f2bbb6ed58a4
Author: Calvin Metcalf <calvin.metcalf at state.ma.us>
Date: Sat Nov 8 13:43:18 2014 -0500
same primes generated
---
generatePrime.js | 136 ++++++++++---------------------------------------------
test.js | 31 +++++++------
2 files changed, 39 insertions(+), 128 deletions(-)
diff --git a/generatePrime.js b/generatePrime.js
index d720dca..44a030f 100644
--- a/generatePrime.js
+++ b/generatePrime.js
@@ -1,116 +1,16 @@
module.exports = findPrime;
-// based on find-prime by Kenan Yildirim
-// https://github.com/KenanY/find-prime
-
-//and
-//bigi https://github.com/cryptocoinjs/bigi
-//which is based on jsbn by Tom Wu
-//http://www-cs-students.stanford.edu/~tjw/jsbn/
var BN = require('bn.js');
-var GCD_30_DELTA = [new BN(6), new BN(4), new BN(2), new BN(4), new BN(2), new BN(4), new BN(6), new BN(2)];
-
-
-function getMillerRabinTests(bits) {
- if (bits <= 100) return 27;
- if (bits <= 150) return 18;
- if (bits <= 200) return 15;
- if (bits <= 250) return 12;
- if (bits <= 300) return 9;
- if (bits <= 350) return 8;
- if (bits <= 400) return 7;
- if (bits <= 500) return 6;
- if (bits <= 600) return 5;
- if (bits <= 800) return 4;
- if (bits <= 1250) return 3;
- return 2;
-}
-var lowprimes = [
- 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71,
- 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151,
- 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233,
- 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317,
- 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419,
- 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503,
- 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607,
- 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701,
- 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811,
- 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911,
- 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997
-];
-
-var lplim = (1 << 26) / lowprimes[lowprimes.length - 1];
-
-// (public) test primality with certainty >= 1-.5^t
-function isProbablePrime(n, t) {
- var i, x = n.abs();
- if (x.isEven()) return false;
- i = 1;
- while (i < lowprimes.length) {
- var m = lowprimes[i],
- j = i + 1;
- while (j < lowprimes.length && m < lplim) {
- m *= lowprimes[j++];
- }
- m = x.modn(m);
- while (i < j) {
- if (m % lowprimes[i++] === 0) {
- return false;
- }
- }
- }
- return millerRabin(x, t);
-}
-function getLowestSetBit(n) {
- var i = -1;
- var len = n.bitLength();
- while (++i < len) {
- if (n.testn(i)) {
- return i;
- }
- }
- return -1;
-}
-// (protected) true if probably prime (HAC 4.24, Miller-Rabin)
-function millerRabin(n, t) {
- var n1 = n.sub(new BN(1));
- var mp = BN.mont(n);
- var k = getLowestSetBit(n1);
- if (k <= 0) return false;
- var r = n1.shrn(k);
- t = (t + 1) >> 1;
- if (t > lowprimes.length) {
- t = lowprimes.length;
- }
- var a;
- var j, bases = [];
- for (var i = 0; i < t; ++i) {
- for (;;) {
- j = lowprimes[Math.floor(Math.random() * lowprimes.length)];
- if (bases.indexOf(j) == -1) break;
- }
- bases.push(j);
- a = new BN(j);
- var y = a.toRed(mp).redPow(r).fromRed();
- if (y.cmp(new BN(1)) != 0 && y.cmp(n1) !== 0) {
- j = 1;
- while (j++ < k && y.cmp(n1) !== 0) {
- y = y.toRed(mp).redPow(new BN(2)).fromRed();
- if (y.cmp(new BN(1)) === 0) {
- return false;
- }
- }
- if (y.cmp(n1) !== 0) {
- return false;
- }
- }
- }
- return true;
-}
+var TWENTYFOUR = new BN(24);
+var MillerRabin = require('miller-rabin');
+var millerRabin = new MillerRabin();
+var ONE = new BN(1);
+var TWO = new BN(2);
+var ELEVEN = new BN(11);
function findPrime(bits, crypto) {
- function generateRandom(bits) {
+ function _generateRandom(bits) {
var bytes = bits >> 3;
bytes = bytes || 1;
var out = new BN(crypto.randomBytes(bytes));
@@ -118,26 +18,36 @@ function findPrime(bits, crypto) {
out.ishrn(1);
}
if (out.isEven()) {
- out.iadd(new BN(1));
+ out.iadd(ONE);
+ }
+ if (!out.testn(1)) {
+ out.iadd(TWO);
+ }
+ return out;
+ }
+ function generateRandom(bits) {
+ var out = _generateRandom(bits);
+ while (out.mod(TWENTYFOUR).cmp(ELEVEN)) {
+ out = _generateRandom(bits);
}
return out;
}
var num = generateRandom(bits);
- var deltaIdx = 0;
-
- var mrTests = getMillerRabinTests(num.bitLength());
+ var runs = 0;
while (true) {
+ runs++;
if (num.bitLength() > bits) {
num = generateRandom(bits);
}
- if(isProbablePrime(num, mrTests)) {
+ if(millerRabin.test(num) && millerRabin.test(num.shrn(1))) {
+ console.log('found in', runs);
return num;
}
- num.iadd(GCD_30_DELTA[deltaIdx++ % 8]);
+ num.iadd(TWENTYFOUR);
}
}
\ No newline at end of file
diff --git a/test.js b/test.js
index d8f0fef..5f14f2c 100644
--- a/test.js
+++ b/test.js
@@ -40,7 +40,8 @@ function bylen(t) {
var dh2 = myCrypto.createDiffieHellman(len);
var prime2 = dh2.getPrime();
var p2 = prime2.toString('hex');
- var dh1 = nodeCrypto.createDiffieHellman(prime2);
+ var dh1 = nodeCrypto.createDiffieHellman(prime2, 2);
+ //console.log('error', dh1.verifyError)
var p1 = dh1.getPrime().toString('hex');
t.equals(typeof dh1.setPublicKey, typeof dh2.setPublicKey, 'same methods');
t.equals(typeof dh1.setPrivateKey, typeof dh2.setPrivateKey, 'same methods');
@@ -79,17 +80,17 @@ function bylen2(t) {
});
};
}
-if (process.version && process.version.split('.').length === 3 && parseInt(process.version.split('.')[1], 10) > 10) {
- test('create primes', function (t) {
- var f = bylen(t);
- lens.forEach(f);
- });
-}
-test('create primes other way', function (t) {
- var f = bylen2(t);
- lens.forEach(f);
- });
-var i = 0;
-while (++i < 2) {
- run(i);
-}
\ No newline at end of file
+
+test('create primes', function (t) {
+ var f = bylen(t);
+ lens.forEach(f);
+});
+
+// test('create primes other way', function (t) {
+// var f = bylen2(t);
+// lens.forEach(f);
+// });
+// var i = 0;
+// while (++i < 2) {
+// run(i);
+// }
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-diffie-hellman.git
More information about the Pkg-javascript-commits
mailing list