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

Merge e82e6fcedb into da89fc1f93

Browse source
This commit is contained in:
Ondrej Novy 2014-01-09 18:19:13 -08:00
commit a3a94ff545
2 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bitaddress.org.html
View file

@ -1619,21 +1619,24 @@ if (typeof Crypto == "undefined" || !Crypto.util) {
if (sr.pool == null) {
sr.pool = new Array();
sr.pptr = 0;
var t;
// Use webcrypto if available
if (window.crypto && window.crypto.getRandomValues) {
try {
// Use webcrypto if available
var ua = new Uint8Array(32);
var ua = new Uint8Array(sr.poolSize);
window.crypto.getRandomValues(ua);
for (t = 0; t < 32; ++t)
sr.pool[sr.pptr++] = ua[t];
for (var i = 0 ; i < sr.poolSize ; i++) {
sr.pool[i] = ua[i];
}
} catch (e) { alert(e); }
} else {
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;
}
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;
}
sr.pptr = 0;
sr.seedTime();
// entropy

21
src/securerandom.js
View file

@ -132,21 +132,24 @@
if (sr.pool == null) {
sr.pool = new Array();
sr.pptr = 0;
var t;
// Use webcrypto if available
if (window.crypto && window.crypto.getRandomValues) {
try {
// Use webcrypto if available
var ua = new Uint8Array(32);
var ua = new Uint8Array(sr.poolSize);
window.crypto.getRandomValues(ua);
for (t = 0; t < 32; ++t)
sr.pool[sr.pptr++] = ua[t];
for (var i = 0 ; i < sr.poolSize ; i++) {
sr.pool[i] = ua[i];
}
} catch (e) { alert(e); }
} else {
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;
}
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;
}
sr.pptr = 0;
sr.seedTime();
// entropy