-rw-r--r-- | frontend/beta/js/Clipperz/Crypto/PRNG.js | 4 |
1 files changed, 2 insertions, 2 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 | |||
@@ -223,195 +223,195 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new | |||
223 | 'numberOfBitsToCollectAtEachEvent': function() { | 223 | 'numberOfBitsToCollectAtEachEvent': function() { |
224 | return this._numberOfBitsToCollectAtEachEvent; | 224 | return this._numberOfBitsToCollectAtEachEvent; |
225 | }, | 225 | }, |
226 | 226 | ||
227 | //------------------------------------------------------------------------- | 227 | //------------------------------------------------------------------------- |
228 | 228 | ||
229 | 'randomBitsCollector': function() { | 229 | 'randomBitsCollector': function() { |
230 | return this._randomBitsCollector; | 230 | return this._randomBitsCollector; |
231 | }, | 231 | }, |
232 | 232 | ||
233 | 'setRandomBitsCollector': function(aValue) { | 233 | 'setRandomBitsCollector': function(aValue) { |
234 | this._randomBitsCollector = aValue; | 234 | this._randomBitsCollector = aValue; |
235 | }, | 235 | }, |
236 | 236 | ||
237 | 'appendRandomBitsToRandomBitsCollector': function(aValue) { | 237 | 'appendRandomBitsToRandomBitsCollector': function(aValue) { |
238 | var collectedBits; | 238 | var collectedBits; |
239 | var numberOfRandomBitsCollected; | 239 | var numberOfRandomBitsCollected; |
240 | 240 | ||
241 | numberOfRandomBitsCollected = this.numberOfRandomBitsCollected(); | 241 | numberOfRandomBitsCollected = this.numberOfRandomBitsCollected(); |
242 | collectedBits = this.randomBitsCollector() | (aValue << numberOfRandomBitsCollected); | 242 | collectedBits = this.randomBitsCollector() | (aValue << numberOfRandomBitsCollected); |
243 | this.setRandomBitsCollector(collectedBits); | 243 | this.setRandomBitsCollector(collectedBits); |
244 | numberOfRandomBitsCollected += this.numberOfBitsToCollectAtEachEvent(); | 244 | numberOfRandomBitsCollected += this.numberOfBitsToCollectAtEachEvent(); |
245 | 245 | ||
246 | if (numberOfRandomBitsCollected == 8) { | 246 | if (numberOfRandomBitsCollected == 8) { |
247 | this.updateGeneratorWithValue(collectedBits); | 247 | this.updateGeneratorWithValue(collectedBits); |
248 | numberOfRandomBitsCollected = 0; | 248 | numberOfRandomBitsCollected = 0; |
249 | this.setRandomBitsCollector(0); | 249 | this.setRandomBitsCollector(0); |
250 | } | 250 | } |
251 | 251 | ||
252 | this.setNumberOfRandomBitsCollected(numberOfRandomBitsCollected) | 252 | this.setNumberOfRandomBitsCollected(numberOfRandomBitsCollected) |
253 | }, | 253 | }, |
254 | 254 | ||
255 | //------------------------------------------------------------------------- | 255 | //------------------------------------------------------------------------- |
256 | 256 | ||
257 | 'numberOfRandomBitsCollected': function() { | 257 | 'numberOfRandomBitsCollected': function() { |
258 | return this._numberOfRandomBitsCollected; | 258 | return this._numberOfRandomBitsCollected; |
259 | }, | 259 | }, |
260 | 260 | ||
261 | 'setNumberOfRandomBitsCollected': function(aValue) { | 261 | 'setNumberOfRandomBitsCollected': function(aValue) { |
262 | this._numberOfRandomBitsCollected = aValue; | 262 | this._numberOfRandomBitsCollected = aValue; |
263 | }, | 263 | }, |
264 | 264 | ||
265 | //------------------------------------------------------------------------- | 265 | //------------------------------------------------------------------------- |
266 | 266 | ||
267 | 'collectEntropy': function(anEvent) { | 267 | 'collectEntropy': function(anEvent) { |
268 | var mouseLocation; | 268 | var mouseLocation; |
269 | var randomBit; | 269 | var randomBit; |
270 | var mask; | 270 | var mask; |
271 | 271 | ||
272 | mask = 0xffffffff >>> (32 - this.numberOfBitsToCollectAtEachEvent()); | 272 | mask = 0xffffffff >>> (32 - this.numberOfBitsToCollectAtEachEvent()); |
273 | 273 | ||
274 | mouseLocation = anEvent.mouse().client; | 274 | mouseLocation = anEvent.mouse().client; |
275 | randomBit = ((mouseLocation.x ^ mouseLocation.y) & mask); | 275 | randomBit = ((mouseLocation.x ^ mouseLocation.y) & mask); |
276 | this.appendRandomBitsToRandomBitsCollector(randomBit) | 276 | this.appendRandomBitsToRandomBitsCollector(randomBit) |
277 | }, | 277 | }, |
278 | 278 | ||
279 | //------------------------------------------------------------------------- | 279 | //------------------------------------------------------------------------- |
280 | 280 | ||
281 | 'numberOfRandomBits': function() { | 281 | 'numberOfRandomBits': function() { |
282 | return 1; | 282 | return 1; |
283 | }, | 283 | }, |
284 | 284 | ||
285 | //------------------------------------------------------------------------- | 285 | //------------------------------------------------------------------------- |
286 | __syntaxFix__: "syntax fix" | 286 | __syntaxFix__: "syntax fix" |
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 | ||
354 | this._firstPoolReseedLevel = args.firstPoolReseedLevel || 32 || 64; | 354 | this._firstPoolReseedLevel = args.firstPoolReseedLevel || 32 || 64; |
355 | this._numberOfEntropyAccumulators = args.numberOfEntropyAccumulators || 32; | 355 | this._numberOfEntropyAccumulators = args.numberOfEntropyAccumulators || 32; |
356 | 356 | ||
357 | this._accumulators = []; | 357 | this._accumulators = []; |
358 | c = this.numberOfEntropyAccumulators(); | 358 | c = this.numberOfEntropyAccumulators(); |
359 | for (i=0; i<c; i++) { | 359 | for (i=0; i<c; i++) { |
360 | this._accumulators.push(new Clipperz.Crypto.PRNG.EntropyAccumulator()); | 360 | this._accumulators.push(new Clipperz.Crypto.PRNG.EntropyAccumulator()); |
361 | } | 361 | } |
362 | 362 | ||
363 | this._randomnessSources = []; | 363 | this._randomnessSources = []; |
364 | this._reseedCounter = 0; | 364 | this._reseedCounter = 0; |
365 | 365 | ||
366 | return this; | 366 | return this; |
367 | } | 367 | } |
368 | 368 | ||
369 | Clipperz.Crypto.PRNG.Fortuna.prototype = MochiKit.Base.update(null, { | 369 | Clipperz.Crypto.PRNG.Fortuna.prototype = MochiKit.Base.update(null, { |
370 | 370 | ||
371 | 'toString': function() { | 371 | 'toString': function() { |
372 | return "Clipperz.Crypto.PRNG.Fortuna"; | 372 | return "Clipperz.Crypto.PRNG.Fortuna"; |
373 | }, | 373 | }, |
374 | 374 | ||
375 | //------------------------------------------------------------------------- | 375 | //------------------------------------------------------------------------- |
376 | 376 | ||
377 | 'key': function() { | 377 | 'key': function() { |
378 | return this._key; | 378 | return this._key; |
379 | }, | 379 | }, |
380 | 380 | ||
381 | 'setKey': function(aValue) { | 381 | 'setKey': function(aValue) { |
382 | this._key = aValue; | 382 | this._key = aValue; |
383 | this._aesKey = null; | 383 | this._aesKey = null; |
384 | }, | 384 | }, |
385 | 385 | ||
386 | 'aesKey': function() { | 386 | 'aesKey': function() { |
387 | if (this._aesKey == null) { | 387 | if (this._aesKey == null) { |
388 | this._aesKey = new Clipperz.Crypto.AES.Key({key:this.key()}); | 388 | this._aesKey = new Clipperz.Crypto.AES.Key({key:this.key()}); |
389 | } | 389 | } |
390 | 390 | ||
391 | return this._aesKey; | 391 | return this._aesKey; |
392 | }, | 392 | }, |
393 | 393 | ||
394 | 'accumulators': function() { | 394 | 'accumulators': function() { |
395 | return this._accumulators; | 395 | return this._accumulators; |
396 | }, | 396 | }, |
397 | 397 | ||
398 | 'firstPoolReseedLevel': function() { | 398 | 'firstPoolReseedLevel': function() { |
399 | return this._firstPoolReseedLevel; | 399 | return this._firstPoolReseedLevel; |
400 | }, | 400 | }, |
401 | 401 | ||
402 | //------------------------------------------------------------------------- | 402 | //------------------------------------------------------------------------- |
403 | 403 | ||
404 | 'reseedCounter': function() { | 404 | 'reseedCounter': function() { |
405 | return this._reseedCounter; | 405 | return this._reseedCounter; |
406 | }, | 406 | }, |
407 | 407 | ||
408 | 'incrementReseedCounter': function() { | 408 | 'incrementReseedCounter': function() { |
409 | this._reseedCounter = this._reseedCounter +1; | 409 | this._reseedCounter = this._reseedCounter +1; |
410 | }, | 410 | }, |
411 | 411 | ||
412 | //------------------------------------------------------------------------- | 412 | //------------------------------------------------------------------------- |
413 | 413 | ||
414 | 'reseed': function() { | 414 | 'reseed': function() { |
415 | varnewKeySeed; | 415 | varnewKeySeed; |
416 | var reseedCounter; | 416 | var reseedCounter; |
417 | varreseedCounterMask; | 417 | varreseedCounterMask; |