diff --git a/bitaddress.org.html b/bitaddress.org.html index c3dde7e..fcd34b1 100644 --- a/bitaddress.org.html +++ b/bitaddress.org.html @@ -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; } } diff --git a/src/securerandom.js b/src/securerandom.js index 2d9b3be..6b70d20 100644 --- a/src/securerandom.js +++ b/src/securerandom.js @@ -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; } }