zervo/bitaddress.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SecureRandom: remove the weird copy of the entropy pool

Browse source
This commit is contained in:
Michael Muré 2014-07-02 21:14:21 +02:00
parent 5058838237
commit 125d9d8997
3 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
index.html
View file

@ -1508,7 +1508,6 @@ if (typeof Crypto == "undefined" || !Crypto.util) {
sr.state; sr.state;
sr.pool; sr.pool;
sr.pptr; sr.pptr;
sr.poolCopyOnInit;
// Pool size must be a multiple of 4 and greater than 32. // Pool size must be a multiple of 4 and greater than 32.
// An array of bytes the size of the pool will be passed to init() // An array of bytes the size of the pool will be passed to init()
@ -1548,9 +1547,6 @@ if (typeof Crypto == "undefined" || !Crypto.util) {
sr.seedTime(); sr.seedTime();
sr.state = sr.ArcFour(); // Plug in your RNG constructor here sr.state = sr.ArcFour(); // Plug in your RNG constructor here
sr.state.init(sr.pool); sr.state.init(sr.pool);
sr.poolCopyOnInit = [];
for (sr.pptr = 0; sr.pptr < sr.pool.length; ++sr.pptr)
sr.poolCopyOnInit[sr.pptr] = sr.pool[sr.pptr];
sr.pptr = 0; sr.pptr = 0;
} }
// TODO: allow reseeding after first request // TODO: allow reseeding after first request
@ -10756,17 +10752,9 @@ ninja.publicKey = {
}, },
showPool: function () { showPool: function () {
var poolHex; var poolHex = Crypto.util.bytesToHex(SecureRandom.pool);
if (SecureRandom.poolCopyOnInit != null) {
poolHex = Crypto.util.bytesToHex(SecureRandom.poolCopyOnInit);
document.getElementById("seedpool").innerHTML = poolHex; document.getElementById("seedpool").innerHTML = poolHex;
document.getElementById("seedpooldisplay").innerHTML = poolHex; document.getElementById("seedpooldisplay").innerHTML = poolHex;
}
else {
poolHex = Crypto.util.bytesToHex(SecureRandom.pool);
document.getElementById("seedpool").innerHTML = poolHex;
document.getElementById("seedpooldisplay").innerHTML = poolHex;
}
document.getElementById("mousemovelimit").innerHTML = (ninja.seeder.seedLimit - ninja.seeder.seedCount); document.getElementById("mousemovelimit").innerHTML = (ninja.seeder.seedLimit - ninja.seeder.seedCount);
}, },

10
src/ninja.misc.js
View file

@ -62,17 +62,9 @@
}, },
showPool: function () { showPool: function () {
var poolHex; var poolHex = Crypto.util.bytesToHex(SecureRandom.pool);
if (SecureRandom.poolCopyOnInit != null) {
poolHex = Crypto.util.bytesToHex(SecureRandom.poolCopyOnInit);
document.getElementById("seedpool").innerHTML = poolHex; document.getElementById("seedpool").innerHTML = poolHex;
document.getElementById("seedpooldisplay").innerHTML = poolHex; document.getElementById("seedpooldisplay").innerHTML = poolHex;
}
else {
poolHex = Crypto.util.bytesToHex(SecureRandom.pool);
document.getElementById("seedpool").innerHTML = poolHex;
document.getElementById("seedpooldisplay").innerHTML = poolHex;
}
document.getElementById("mousemovelimit").innerHTML = (ninja.seeder.seedLimit - ninja.seeder.seedCount); document.getElementById("mousemovelimit").innerHTML = (ninja.seeder.seedLimit - ninja.seeder.seedCount);
}, },

4
src/securerandom.js
View file

@ -17,7 +17,6 @@
sr.state; sr.state;
sr.pool; sr.pool;
sr.pptr; sr.pptr;
sr.poolCopyOnInit;
// Pool size must be a multiple of 4 and greater than 32. // Pool size must be a multiple of 4 and greater than 32.
// An array of bytes the size of the pool will be passed to init() // An array of bytes the size of the pool will be passed to init()
@ -57,9 +56,6 @@
sr.seedTime(); sr.seedTime();
sr.state = sr.ArcFour(); // Plug in your RNG constructor here sr.state = sr.ArcFour(); // Plug in your RNG constructor here
sr.state.init(sr.pool); sr.state.init(sr.pool);
sr.poolCopyOnInit = [];
for (sr.pptr = 0; sr.pptr < sr.pool.length; ++sr.pptr)
sr.poolCopyOnInit[sr.pptr] = sr.pool[sr.pptr];
sr.pptr = 0; sr.pptr = 0;
} }
// TODO: allow reseeding after first request // TODO: allow reseeding after first request