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

Merge pull request #52 from onovy/16-bit-mouse

Browse source 
Seed mouse movements as 16-bit numbers.
This commit is contained in:
pointbiz 2014-01-09 17:39:49 -08:00
commit fcfa7a0f16
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bitaddress.org.html
View file

@ -1562,6 +1562,12 @@ if (typeof Crypto == "undefined" || !Crypto.util) {
sr.seedInt8((x >> 24)); sr.seedInt8((x >> 24));
} }
// Mix in a 16-bit integer into the pool
sr.seedInt16 = function (x) {
sr.seedInt8(x);
sr.seedInt8((x >> 8));
}
// Mix in a 8-bit integer into the pool // Mix in a 8-bit integer into the pool
sr.seedInt8 = function (x) { sr.seedInt8 = function (x) {
sr.pool[sr.pptr++] ^= x & 255; sr.pool[sr.pptr++] ^= x & 255;
@ -6641,7 +6647,7 @@ ninja.seeder = {
// number of mouse movements to wait for // number of mouse movements to wait for
seedLimit: (function () { seedLimit: (function () {
var num = Crypto.util.randomBytes(12)[11]; var num = Crypto.util.randomBytes(12)[11];
return 100 + Math.floor(num); return 200 + Math.floor(num);
})(), })(),
seedCount: 0, // counter seedCount: 0, // counter
@ -6653,7 +6659,7 @@ ninja.seeder = {
// seed a bunch (minimum seedLimit) of times based on mouse moves // seed a bunch (minimum seedLimit) of times based on mouse moves
SecureRandom.seedTime(); SecureRandom.seedTime();
// seed mouse position X and Y // seed mouse position X and Y
if (evt) SecureRandom.seedInt((evt.clientX * evt.clientY)); if (evt) SecureRandom.seedInt16((evt.clientX * evt.clientY));
ninja.seeder.seedCount++; ninja.seeder.seedCount++;
// seeding is over now we generate and display the address // seeding is over now we generate and display the address

4
src/ninja.misc.js
View file

@ -2,7 +2,7 @@ ninja.seeder = {
// number of mouse movements to wait for // number of mouse movements to wait for
seedLimit: (function () { seedLimit: (function () {
var num = Crypto.util.randomBytes(12)[11]; var num = Crypto.util.randomBytes(12)[11];
return 100 + Math.floor(num); return 200 + Math.floor(num);
})(), })(),
seedCount: 0, // counter seedCount: 0, // counter
@ -14,7 +14,7 @@ ninja.seeder = {
// seed a bunch (minimum seedLimit) of times based on mouse moves // seed a bunch (minimum seedLimit) of times based on mouse moves
SecureRandom.seedTime(); SecureRandom.seedTime();
// seed mouse position X and Y // seed mouse position X and Y
if (evt) SecureRandom.seedInt((evt.clientX * evt.clientY)); if (evt) SecureRandom.seedInt16((evt.clientX * evt.clientY));
ninja.seeder.seedCount++; ninja.seeder.seedCount++;
// seeding is over now we generate and display the address // seeding is over now we generate and display the address

6
src/securerandom.js
View file

@ -75,6 +75,12 @@
sr.seedInt8((x >> 24)); sr.seedInt8((x >> 24));
} }
// Mix in a 16-bit integer into the pool
sr.seedInt16 = function (x) {
sr.seedInt8(x);
sr.seedInt8((x >> 8));
}
// Mix in a 8-bit integer into the pool // Mix in a 8-bit integer into the pool
sr.seedInt8 = function (x) { sr.seedInt8 = function (x) {
sr.pool[sr.pptr++] ^= x & 255; sr.pool[sr.pptr++] ^= x & 255;