| 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) (unidiff) | |
| 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 | |||
| @@ -287,67 +287,67 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new | |||
| 287 | }); | 287 | }); |
| 288 | 288 | ||
| 289 | //***************************************************************************** | 289 | //***************************************************************************** |
| 290 | 290 | ||
| 291 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { | 291 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { |
| 292 | args = args || {}; | 292 | args = args || {}; |
| 293 | 293 | ||
| 294 | this._intervalTime = args.intervalTime || 1000; | 294 | this._intervalTime = args.intervalTime || 1000; |
| 295 | this._browserCrypto = args.browserCrypto; | 295 | this._browserCrypto = args.browserCrypto; |
| 296 | 296 | ||
| 297 | Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); | 297 | Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); |
| 298 | 298 | ||
| 299 | this.collectEntropy(); | 299 | this.collectEntropy(); |
| 300 | return this; | 300 | return this; |
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { | 303 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { |
| 304 | 304 | ||
| 305 | 'intervalTime': function() { | 305 | 'intervalTime': function() { |
| 306 | return this._intervalTime; | 306 | return this._intervalTime; |
| 307 | }, | 307 | }, |
| 308 | 308 | ||
| 309 | 'browserCrypto': function () { | 309 | 'browserCrypto': function () { |
| 310 | return this._browserCrypto; | 310 | return this._browserCrypto; |
| 311 | }, | 311 | }, |
| 312 | 312 | ||
| 313 | //------------------------------------------------------------------------- | 313 | //------------------------------------------------------------------------- |
| 314 | 314 | ||
| 315 | 'collectEntropy': function() { | 315 | 'collectEntropy': function() { |
| 316 | varbytesToCollect; | 316 | varbytesToCollect; |
| 317 | 317 | ||
| 318 | if (this.boostMode() == true) { | 318 | if (this.boostMode() == true) { |
| 319 | bytesToCollect = 8; | 319 | bytesToCollect = 64; |
| 320 | } else { | 320 | } else { |
| 321 | bytesToCollect = 32; | 321 | bytesToCollect = 8; |
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | var randomValuesArray = new Uint8Array(bytesToCollect); | 324 | var randomValuesArray = new Uint8Array(bytesToCollect); |
| 325 | this.browserCrypto().getRandomValues(randomValuesArray); | 325 | this.browserCrypto().getRandomValues(randomValuesArray); |
| 326 | for (var i = 0; i < randomValuesArray.length; i++) { | 326 | for (var i = 0; i < randomValuesArray.length; i++) { |
| 327 | this.updateGeneratorWithValue(randomValuesArray[i]); | 327 | this.updateGeneratorWithValue(randomValuesArray[i]); |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | setTimeout(this.collectEntropy, this.intervalTime()); | 330 | setTimeout(this.collectEntropy, this.intervalTime()); |
| 331 | }, | 331 | }, |
| 332 | 332 | ||
| 333 | //------------------------------------------------------------------------- | 333 | //------------------------------------------------------------------------- |
| 334 | __syntaxFix__: "syntax fix" | 334 | __syntaxFix__: "syntax fix" |
| 335 | }); | 335 | }); |
| 336 | 336 | ||
| 337 | //############################################################################# | 337 | //############################################################################# |
| 338 | 338 | ||
| 339 | Clipperz.Crypto.PRNG.Fortuna = function(args) { | 339 | Clipperz.Crypto.PRNG.Fortuna = function(args) { |
| 340 | vari,c; | 340 | vari,c; |
| 341 | 341 | ||
| 342 | args = args || {}; | 342 | args = args || {}; |
| 343 | 343 | ||
| 344 | this._key = args.seed || null; | 344 | this._key = args.seed || null; |
| 345 | if (this._key == null) { | 345 | if (this._key == null) { |
| 346 | this._counter = 0; | 346 | this._counter = 0; |
| 347 | this._key = new Clipperz.ByteArray(); | 347 | this._key = new Clipperz.ByteArray(); |
| 348 | } else { | 348 | } else { |
| 349 | this._counter = 1; | 349 | this._counter = 1; |
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | this._aesKey = null; | 352 | this._aesKey = null; |
| 353 | 353 | ||
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 | |||
| @@ -289,67 +289,67 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new | |||
| 289 | }); | 289 | }); |
| 290 | 290 | ||
| 291 | //***************************************************************************** | 291 | //***************************************************************************** |
| 292 | 292 | ||
| 293 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { | 293 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { |
| 294 | args = args || {}; | 294 | args = args || {}; |
| 295 | 295 | ||
| 296 | this._intervalTime = args.intervalTime || 1000; | 296 | this._intervalTime = args.intervalTime || 1000; |
| 297 | this._browserCrypto = args.browserCrypto; | 297 | this._browserCrypto = args.browserCrypto; |
| 298 | 298 | ||
| 299 | Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); | 299 | Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); |
| 300 | 300 | ||
| 301 | this.collectEntropy(); | 301 | this.collectEntropy(); |
| 302 | return this; | 302 | return this; |
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { | 305 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { |
| 306 | 306 | ||
| 307 | 'intervalTime': function() { | 307 | 'intervalTime': function() { |
| 308 | return this._intervalTime; | 308 | return this._intervalTime; |
| 309 | }, | 309 | }, |
| 310 | 310 | ||
| 311 | 'browserCrypto': function () { | 311 | 'browserCrypto': function () { |
| 312 | return this._browserCrypto; | 312 | return this._browserCrypto; |
| 313 | }, | 313 | }, |
| 314 | 314 | ||
| 315 | //------------------------------------------------------------------------- | 315 | //------------------------------------------------------------------------- |
| 316 | 316 | ||
| 317 | 'collectEntropy': function() { | 317 | 'collectEntropy': function() { |
| 318 | varbytesToCollect; | 318 | varbytesToCollect; |
| 319 | 319 | ||
| 320 | if (this.boostMode() == true) { | 320 | if (this.boostMode() == true) { |
| 321 | bytesToCollect = 8; | 321 | bytesToCollect = 64; |
| 322 | } else { | 322 | } else { |
| 323 | bytesToCollect = 32; | 323 | bytesToCollect = 8; |
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | var randomValuesArray = new Uint8Array(bytesToCollect); | 326 | var randomValuesArray = new Uint8Array(bytesToCollect); |
| 327 | this.browserCrypto().getRandomValues(randomValuesArray); | 327 | this.browserCrypto().getRandomValues(randomValuesArray); |
| 328 | for (var i = 0; i < randomValuesArray.length; i++) { | 328 | for (var i = 0; i < randomValuesArray.length; i++) { |
| 329 | this.updateGeneratorWithValue(randomValuesArray[i]); | 329 | this.updateGeneratorWithValue(randomValuesArray[i]); |
| 330 | } | 330 | } |
| 331 | 331 | ||
| 332 | setTimeout(this.collectEntropy, this.intervalTime()); | 332 | setTimeout(this.collectEntropy, this.intervalTime()); |
| 333 | }, | 333 | }, |
| 334 | 334 | ||
| 335 | //------------------------------------------------------------------------- | 335 | //------------------------------------------------------------------------- |
| 336 | __syntaxFix__: "syntax fix" | 336 | __syntaxFix__: "syntax fix" |
| 337 | }); | 337 | }); |
| 338 | 338 | ||
| 339 | //############################################################################# | 339 | //############################################################################# |
| 340 | 340 | ||
| 341 | Clipperz.Crypto.PRNG.Fortuna = function(args) { | 341 | Clipperz.Crypto.PRNG.Fortuna = function(args) { |
| 342 | vari,c; | 342 | vari,c; |
| 343 | 343 | ||
| 344 | args = args || {}; | 344 | args = args || {}; |
| 345 | 345 | ||
| 346 | this._key = args.seed || null; | 346 | this._key = args.seed || null; |
| 347 | if (this._key == null) { | 347 | if (this._key == null) { |
| 348 | this._counter = 0; | 348 | this._counter = 0; |
| 349 | this._key = new Clipperz.ByteArray(); | 349 | this._key = new Clipperz.ByteArray(); |
| 350 | } else { | 350 | } else { |
| 351 | this._counter = 1; | 351 | this._counter = 1; |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | this._aesKey = null; | 354 | this._aesKey = null; |
| 355 | 355 | ||
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 | |||
| @@ -289,67 +289,67 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new | |||
| 289 | }); | 289 | }); |
| 290 | 290 | ||
| 291 | //***************************************************************************** | 291 | //***************************************************************************** |
| 292 | 292 | ||
| 293 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { | 293 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) { |
| 294 | args = args || {}; | 294 | args = args || {}; |
| 295 | 295 | ||
| 296 | this._intervalTime = args.intervalTime || 1000; | 296 | this._intervalTime = args.intervalTime || 1000; |
| 297 | this._browserCrypto = args.browserCrypto; | 297 | this._browserCrypto = args.browserCrypto; |
| 298 | 298 | ||
| 299 | Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); | 299 | Clipperz.Crypto.PRNG.RandomnessSource.call(this, args); |
| 300 | 300 | ||
| 301 | this.collectEntropy(); | 301 | this.collectEntropy(); |
| 302 | return this; | 302 | return this; |
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { | 305 | Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, { |
| 306 | 306 | ||
| 307 | 'intervalTime': function() { | 307 | 'intervalTime': function() { |
| 308 | return this._intervalTime; | 308 | return this._intervalTime; |
| 309 | }, | 309 | }, |
| 310 | 310 | ||
| 311 | 'browserCrypto': function () { | 311 | 'browserCrypto': function () { |
| 312 | return this._browserCrypto; | 312 | return this._browserCrypto; |
| 313 | }, | 313 | }, |
| 314 | 314 | ||
| 315 | //------------------------------------------------------------------------- | 315 | //------------------------------------------------------------------------- |
| 316 | 316 | ||
| 317 | 'collectEntropy': function() { | 317 | 'collectEntropy': function() { |
| 318 | varbytesToCollect; | 318 | varbytesToCollect; |
| 319 | 319 | ||
| 320 | if (this.boostMode() == true) { | 320 | if (this.boostMode() == true) { |
| 321 | bytesToCollect = 8; | 321 | bytesToCollect = 64; |
| 322 | } else { | 322 | } else { |
| 323 | bytesToCollect = 32; | 323 | bytesToCollect = 8; |
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | var randomValuesArray = new Uint8Array(bytesToCollect); | 326 | var randomValuesArray = new Uint8Array(bytesToCollect); |
| 327 | this.browserCrypto().getRandomValues(randomValuesArray); | 327 | this.browserCrypto().getRandomValues(randomValuesArray); |
| 328 | for (var i = 0; i < randomValuesArray.length; i++) { | 328 | for (var i = 0; i < randomValuesArray.length; i++) { |
| 329 | this.updateGeneratorWithValue(randomValuesArray[i]); | 329 | this.updateGeneratorWithValue(randomValuesArray[i]); |
| 330 | } | 330 | } |
| 331 | 331 | ||
| 332 | setTimeout(this.collectEntropy, this.intervalTime()); | 332 | setTimeout(this.collectEntropy, this.intervalTime()); |
| 333 | }, | 333 | }, |
| 334 | 334 | ||
| 335 | //------------------------------------------------------------------------- | 335 | //------------------------------------------------------------------------- |
| 336 | __syntaxFix__: "syntax fix" | 336 | __syntaxFix__: "syntax fix" |
| 337 | }); | 337 | }); |
| 338 | 338 | ||
| 339 | //############################################################################# | 339 | //############################################################################# |
| 340 | 340 | ||
| 341 | Clipperz.Crypto.PRNG.Fortuna = function(args) { | 341 | Clipperz.Crypto.PRNG.Fortuna = function(args) { |
| 342 | vari,c; | 342 | vari,c; |
| 343 | 343 | ||
| 344 | args = args || {}; | 344 | args = args || {}; |
| 345 | 345 | ||
| 346 | this._key = args.seed || null; | 346 | this._key = args.seed || null; |
| 347 | if (this._key == null) { | 347 | if (this._key == null) { |
| 348 | this._counter = 0; | 348 | this._counter = 0; |
| 349 | this._key = new Clipperz.ByteArray(); | 349 | this._key = new Clipperz.ByteArray(); |
| 350 | } else { | 350 | } else { |
| 351 | this._counter = 1; | 351 | this._counter = 1; |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | this._aesKey = null; | 354 | this._aesKey = null; |
| 355 | 355 | ||