Infra-Mirrors/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2024-12-25 23:39:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from Sc00bz/master

Browse Source 
sjcl.random.addEntropy() and sjcl.random._loadTimeCollector() are broken
This commit is contained in:
bitwiseshiftleft 2012-07-24 21:59:20 -07:00
commit 45d99e5dd9
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/random.js
View File

@ -79,10 +79,10 @@ sjcl.random = {
source = source || "user"; source = source || "user";
var id, var id,
i, ty = 0, tmp, i, tmp,
t = (new Date()).valueOf(), t = (new Date()).valueOf(),
robin = this._robins[source], robin = this._robins[source],
oldReady = this.isReady(); oldReady = this.isReady(), err = 0;
id = this._collectorIds[source]; id = this._collectorIds[source];
if (id === undefined) { id = this._collectorIds[source] = this._collectorIdNext ++; } if (id === undefined) { id = this._collectorIds[source] = this._collectorIdNext ++; }
@ -93,11 +93,31 @@ sjcl.random = {
switch(typeof(data)) { switch(typeof(data)) {
case "number": case "number":
data=[data]; if (estimatedEntropy === undefined) {
ty=1; estimatedEntropy = 1;
}
this._pools[robin].update([id,this._eventId++,1,estimatedEntropy,t,1,data|0]);
break; break;
case "object": case "object":
var objName = Object.prototype.toString.call(data);
if (objName === "[object Uint32Array]") {
tmp = [];
for (i = 0; i < data.length; i++) {
tmp.push(data[i]);
}
data = tmp;
} else {
if (objName !== "[object Array]") {
err = 1;
}
for (i=0; i<data.length && !err; i++) {
if (typeof(data[i]) != "number") {
err = 1;
}
}
}
if (!err) {
if (estimatedEntropy === undefined) { if (estimatedEntropy === undefined) {
/* horrible entropy estimator */ /* horrible entropy estimator */
estimatedEntropy = 0; estimatedEntropy = 0;
@ -109,7 +129,8 @@ sjcl.random = {
} }
} }
} }
this._pools[robin].update([id,this._eventId++,ty||2,estimatedEntropy,t,data.length].concat(data)); this._pools[robin].update([id,this._eventId++,2,estimatedEntropy,t,data.length].concat(data));
}
break; break;
case "string": case "string":
@ -125,8 +146,10 @@ sjcl.random = {
break; break;
default: default:
err=1;
throw new sjcl.exception.bug("random: addEntropy only supports number, array or string"); }
if (err) {
throw new sjcl.exception.bug("random: addEntropy only supports number, array of numbers or string");
} }
/* record the new strength */ /* record the new strength */
@ -342,8 +365,7 @@ sjcl.random = {
}, },
_loadTimeCollector: function (ev) { _loadTimeCollector: function (ev) {
var d = new Date(); sjcl.random.addEntropy((new Date()).valueOf(), 2, "loadtime");
sjcl.random.addEntropy(d, 2, "loadtime");
}, },
_fireEvent: function (name, arg) { _fireEvent: function (name, arg) {