author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2014-06-21 08:50:00 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2014-06-21 09:20:16 (UTC) |
commit | 6dd16d9359e3a4dc306802588b09acd43947a606 (patch) (side-by-side diff) | |
tree | f3ab7778e037e42cb47c810f9d435d40de5adf15 /frontend | |
parent | a6852c93138f3c4596fb4df8bce5b7d19ef50478 (diff) | |
download | clipperz-6dd16d9359e3a4dc306802588b09acd43947a606.zip clipperz-6dd16d9359e3a4dc306802588b09acd43947a606.tar.gz clipperz-6dd16d9359e3a4dc306802588b09acd43947a606.tar.bz2 |
Inproved PRNG configuration
-rw-r--r-- | frontend/beta/js/Clipperz/Crypto/PRNG.js | 4 | ||||
-rw-r--r-- | frontend/delta/js/Clipperz/Crypto/PRNG.js | 4 | ||||
-rw-r--r-- | frontend/gamma/js/Clipperz/Crypto/PRNG.js | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/frontend/beta/js/Clipperz/Crypto/PRNG.js b/frontend/beta/js/Clipperz/Crypto/PRNG.js index 92966d0..6fdeca4 100644 --- a/frontend/beta/js/Clipperz/Crypto/PRNG.js +++ b/frontend/beta/js/Clipperz/Crypto/PRNG.js @@ -271,99 +271,99 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new mask = 0xffffffff >>> (32 - this.numberOfBitsToCollectAtEachEvent()); mouseLocation = anEvent.mouse().client; randomBit = ((mouseLocation.x ^ mouseLocation.y) & mask); this.appendRandomBitsToRandomBitsCollector(randomBit) }, //------------------------------------------------------------------------- 'numberOfRandomBits': function() { return 1; }, //------------------------------------------------------------------------- __syntaxFix__: "syntax fix" }); //***************************************************************************** Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { args = args || {}; this._intervalTime = args.intervalTime || 1000; this._browserCrypto = args.browserCrypto; Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); this.collectEntropy(); return this; } Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { 'intervalTime': function() { return this._intervalTime; }, 'browserCrypto': function () { return this._browserCrypto; }, //------------------------------------------------------------------------- 'collectEntropy': function() { var bytesToCollect; if (this.boostMode() == true) { - bytesToCollect = 8; + bytesToCollect = 64; } else { - bytesToCollect = 32; + bytesToCollect = 8; } var randomValuesArray = new Uint8Array(bytesToCollect); this.browserCrypto().getRandomValues(randomValuesArray); for (var i = 0; i < randomValuesArray.length; i++) { this.updateGeneratorWithValue(randomValuesArray[i]); } setTimeout(this.collectEntropy, this.intervalTime()); }, //------------------------------------------------------------------------- __syntaxFix__: "syntax fix" }); //############################################################################# Clipperz.Crypto.PRNG.Fortuna = function(args) { var i,c; args = args || {}; this._key = args.seed || null; if (this._key == null) { this._counter = 0; this._key = new Clipperz.ByteArray(); } else { this._counter = 1; } this._aesKey = null; this._firstPoolReseedLevel = args.firstPoolReseedLevel || 32 || 64; this._numberOfEntropyAccumulators = args.numberOfEntropyAccumulators || 32; this._accumulators = []; c = this.numberOfEntropyAccumulators(); for (i=0; i<c; i++) { this._accumulators.push(new Clipperz.Crypto.PRNG.EntropyAccumulator()); } this._randomnessSources = []; this._reseedCounter = 0; return this; } Clipperz.Crypto.PRNG.Fortuna.prototype = MochiKit.Base.update(null, { diff --git a/frontend/delta/js/Clipperz/Crypto/PRNG.js b/frontend/delta/js/Clipperz/Crypto/PRNG.js index 7885429..80d972f 100644 --- a/frontend/delta/js/Clipperz/Crypto/PRNG.js +++ b/frontend/delta/js/Clipperz/Crypto/PRNG.js @@ -273,99 +273,99 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new mask = 0xffffffff >>> (32 - this.numberOfBitsToCollectAtEachEvent()); mouseLocation = anEvent.mouse().client; randomBit = ((mouseLocation.x ^ mouseLocation.y) & mask); this.appendRandomBitsToRandomBitsCollector(randomBit) }, //------------------------------------------------------------------------- 'numberOfRandomBits': function() { return 1; }, //------------------------------------------------------------------------- __syntaxFix__: "syntax fix" }); //***************************************************************************** Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { args = args || {}; this._intervalTime = args.intervalTime || 1000; this._browserCrypto = args.browserCrypto; Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); this.collectEntropy(); return this; } Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { 'intervalTime': function() { return this._intervalTime; }, 'browserCrypto': function () { return this._browserCrypto; }, //------------------------------------------------------------------------- 'collectEntropy': function() { var bytesToCollect; if (this.boostMode() == true) { - bytesToCollect = 8; + bytesToCollect = 64; } else { - bytesToCollect = 32; + bytesToCollect = 8; } var randomValuesArray = new Uint8Array(bytesToCollect); this.browserCrypto().getRandomValues(randomValuesArray); for (var i = 0; i < randomValuesArray.length; i++) { this.updateGeneratorWithValue(randomValuesArray[i]); } setTimeout(this.collectEntropy, this.intervalTime()); }, //------------------------------------------------------------------------- __syntaxFix__: "syntax fix" }); //############################################################################# Clipperz.Crypto.PRNG.Fortuna = function(args) { var i,c; args = args || {}; this._key = args.seed || null; if (this._key == null) { this._counter = 0; this._key = new Clipperz.ByteArray(); } else { this._counter = 1; } this._aesKey = null; this._firstPoolReseedLevel = args.firstPoolReseedLevel || 32 || 64; this._numberOfEntropyAccumulators = args.numberOfEntropyAccumulators || 32; this._accumulators = []; c = this.numberOfEntropyAccumulators(); for (i=0; i<c; i++) { this._accumulators.push(new Clipperz.Crypto.PRNG.EntropyAccumulator()); } this._randomnessSources = []; this._reseedCounter = 0; return this; } Clipperz.Crypto.PRNG.Fortuna.prototype = MochiKit.Base.update(null, { diff --git a/frontend/gamma/js/Clipperz/Crypto/PRNG.js b/frontend/gamma/js/Clipperz/Crypto/PRNG.js index 7885429..80d972f 100644 --- a/frontend/gamma/js/Clipperz/Crypto/PRNG.js +++ b/frontend/gamma/js/Clipperz/Crypto/PRNG.js @@ -273,99 +273,99 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new mask = 0xffffffff >>> (32 - this.numberOfBitsToCollectAtEachEvent()); mouseLocation = anEvent.mouse().client; randomBit = ((mouseLocation.x ^ mouseLocation.y) & mask); this.appendRandomBitsToRandomBitsCollector(randomBit) }, //------------------------------------------------------------------------- 'numberOfRandomBits': function() { return 1; }, //------------------------------------------------------------------------- __syntaxFix__: "syntax fix" }); //***************************************************************************** Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { args = args || {}; this._intervalTime = args.intervalTime || 1000; this._browserCrypto = args.browserCrypto; Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); this.collectEntropy(); return this; } Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { 'intervalTime': function() { return this._intervalTime; }, 'browserCrypto': function () { return this._browserCrypto; }, //------------------------------------------------------------------------- 'collectEntropy': function() { var bytesToCollect; if (this.boostMode() == true) { - bytesToCollect = 8; + bytesToCollect = 64; } else { - bytesToCollect = 32; + bytesToCollect = 8; } var randomValuesArray = new Uint8Array(bytesToCollect); this.browserCrypto().getRandomValues(randomValuesArray); for (var i = 0; i < randomValuesArray.length; i++) { this.updateGeneratorWithValue(randomValuesArray[i]); } setTimeout(this.collectEntropy, this.intervalTime()); }, //------------------------------------------------------------------------- __syntaxFix__: "syntax fix" }); //############################################################################# Clipperz.Crypto.PRNG.Fortuna = function(args) { var i,c; args = args || {}; this._key = args.seed || null; if (this._key == null) { this._counter = 0; this._key = new Clipperz.ByteArray(); } else { this._counter = 1; } this._aesKey = null; this._firstPoolReseedLevel = args.firstPoolReseedLevel || 32 || 64; this._numberOfEntropyAccumulators = args.numberOfEntropyAccumulators || 32; this._accumulators = []; c = this.numberOfEntropyAccumulators(); for (i=0; i<c; i++) { this._accumulators.push(new Clipperz.Crypto.PRNG.EntropyAccumulator()); } this._randomnessSources = []; this._reseedCounter = 0; return this; } Clipperz.Crypto.PRNG.Fortuna.prototype = MochiKit.Base.update(null, { |