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

Clean-up code for whole seed pool randomness initialization.

Browse source
This commit is contained in:
onovy 2014-01-09 06:28:08 +01:00
parent 68ce15d078
commit e82e6fcedb
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bitaddress.org.html
View file

@ -1617,19 +1617,17 @@ if (typeof Crypto == "undefined" || !Crypto.util) {
// Use webcrypto if available
if (window.crypto && window.crypto.getRandomValues) {
try {
var ua = new Uint8Array(sr.poolSize - sr.pptr);
var ua = new Uint8Array(sr.poolSize);
window.crypto.getRandomValues(ua);
var i = 0;
while (sr.pptr < sr.poolSize) {
sr.pool[sr.pptr++] = ua[i++];
for (var i = 0 ; i < sr.poolSize ; i++) {
sr.pool[i] = ua[i];
}
} catch (e) { alert(e); }
} else {
var t;
while (sr.pptr < sr.poolSize) { // extract some randomness from Math.random()
t = Math.floor(65536 * Math.random());
sr.pool[sr.pptr++] = t >>> 8;
sr.pool[sr.pptr++] = t & 255;
for (var i = 0 ; i < sr.poolSize ; i++) { // extract some randomness from Math.random()
var t = Math.floor(65536 * Math.random());
sr.pool[i] = t >>> 8;
sr.pool[i] = t & 255;
}
}

16
src/securerandom.js
View file

@ -130,19 +130,17 @@
// Use webcrypto if available
if (window.crypto && window.crypto.getRandomValues) {
try {
var ua = new Uint8Array(sr.poolSize - sr.pptr);
var ua = new Uint8Array(sr.poolSize);
window.crypto.getRandomValues(ua);
var i = 0;
while (sr.pptr < sr.poolSize) {
sr.pool[sr.pptr++] = ua[i++];
for (var i = 0 ; i < sr.poolSize ; i++) {
sr.pool[i] = ua[i];
}
} catch (e) { alert(e); }
} else {
var t;
while (sr.pptr < sr.poolSize) { // extract some randomness from Math.random()
t = Math.floor(65536 * Math.random());
sr.pool[sr.pptr++] = t >>> 8;
sr.pool[sr.pptr++] = t & 255;
for (var i = 0 ; i < sr.poolSize ; i++) { // extract some randomness from Math.random()
var t = Math.floor(65536 * Math.random());
sr.pool[i] = t >>> 8;
sr.pool[i] = t & 255;
}
}