3 files changed, 108 insertions, 100 deletions
diff --git a/frontend/delta/js/Clipperz/Crypto/PRNG.js b/frontend/delta/js/Clipperz/Crypto/PRNG.js
index c539f06..80d972f 100644
--- a/frontend/delta/js/Clipperz/Crypto/PRNG.js
+++ b/frontend/delta/js/Clipperz/Crypto/PRNG.js
@@ -21,6 +21,8 @@ refer to http://www.clipperz.com.
 */
+"use strict";
 try { if (typeof(Clipperz.ByteArray) == 'undefined') { throw ""; }} catch (e) {
        throw "Clipperz.Crypto.PRNG depends on Clipperz.ByteArray!";
 }  
@@ -197,12 +199,6 @@ Clipperz.Crypto.PRNG.TimeRandomnessSource.prototype = MochiKit.Base.update(new C
        },
        
        //-------------------------------------------------------------------------
-        'pollingFrequency': function() {
-                return 10;
-        },
-        //-------------------------------------------------------------------------
        __syntaxFix__: "syntax fix"
 });
@@ -245,12 +241,12 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new
                var numberOfRandomBitsCollected;
                
                numberOfRandomBitsCollected = this.numberOfRandomBitsCollected();
-                collectetBits = this.randomBitsCollector() | (aValue << numberOfRandomBitsCollected);
+                collectedBits = this.randomBitsCollector() | (aValue << numberOfRandomBitsCollected);
-                this.setRandomBitsCollector(collectetBits);
+                this.setRandomBitsCollector(collectedBits);
                numberOfRandomBitsCollected += this.numberOfBitsToCollectAtEachEvent();
                
                if (numberOfRandomBitsCollected == 8) {
-                        this.updateGeneratorWithValue(collectetBits);
+                        this.updateGeneratorWithValue(collectedBits);
                        numberOfRandomBitsCollected = 0;
                        this.setRandomBitsCollector(0);
                }
@@ -289,96 +285,54 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new
        },
        
        //-------------------------------------------------------------------------
-        'pollingFrequency': function() {
-                return 10;
-        },
-        //-------------------------------------------------------------------------
        __syntaxFix__: "syntax fix"
 });
 //*****************************************************************************
-Clipperz.Crypto.PRNG.KeyboardRandomnessSource = function(args) {
+Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) {
        args = args || {};
-        Clipperz.Crypto.PRNG.RandomnessSource.call(this, args);
-        this._randomBitsCollector = 0;
+        this._intervalTime = args.intervalTime || 1000;
-        this._numberOfRandomBitsCollected = 0;
+        this._browserCrypto = args.browserCrypto;
        
-        MochiKit.Signal.connect(document, 'onkeypress', this, 'collectEntropy');
+        Clipperz.Crypto.PRNG.RandomnessSource.call(this, args);
+        this.collectEntropy();
        return this;
 }
-Clipperz.Crypto.PRNG.KeyboardRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, {
+Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, {
-        //-------------------------------------------------------------------------
+        'intervalTime': function() {
+                return this._intervalTime;
-        'randomBitsCollector': function() {
-                return this._randomBitsCollector;
-        },
-        'setRandomBitsCollector': function(aValue) {
-                this._randomBitsCollector = aValue;
        },
+        
-        'appendRandomBitToRandomBitsCollector': function(aValue) {
+        'browserCrypto': function () {
-                var collectedBits;
+                return this._browserCrypto;
-                var numberOfRandomBitsCollected;
-                
-                numberOfRandomBitsCollected = this.numberOfRandomBitsCollected();
-                collectetBits = this.randomBitsCollector() | (aValue << numberOfRandomBitsCollected);
-                this.setRandomBitsCollector(collectetBits);
-                numberOfRandomBitsCollected ++;
-                
-                if (numberOfRandomBitsCollected == 8) {
-                        this.updateGeneratorWithValue(collectetBits);
-                        numberOfRandomBitsCollected = 0;
-                        this.setRandomBitsCollector(0);
-                }
-                
-                this.setNumberOfRandomBitsCollected(numberOfRandomBitsCollected)
        },
        
        //-------------------------------------------------------------------------
-        'numberOfRandomBitsCollected': function() {
+        'collectEntropy': function() {
-                return this._numberOfRandomBitsCollected;
+                        varbytesToCollect;
-        },
-        'setNumberOfRandomBitsCollected': function(aValue) {
-                this._numberOfRandomBitsCollected = aValue;
-        },
-        //-------------------------------------------------------------------------
+                if (this.boostMode() == true) {
+                        bytesToCollect = 64;
+                } else {
+                        bytesToCollect = 8;
+                }
-        'collectEntropy': function(anEvent) {
+                var randomValuesArray = new Uint8Array(bytesToCollect);
-/*
+                this.browserCrypto().getRandomValues(randomValuesArray);
-                var mouseLocation;
+                for (var i = 0; i < randomValuesArray.length; i++) {
-                var randomBit;
+                        this.updateGeneratorWithValue(randomValuesArray[i]);
-                
+                }
-                mouseLocation = anEvent.mouse().client;
-                        
-                randomBit = ((mouseLocation.x ^ mouseLocation.y) & 0x1);
-                this.appendRandomBitToRandomBitsCollector(randomBit);
-*/
-        },
-        
-        //-------------------------------------------------------------------------
-        'numberOfRandomBits': function() {
+                setTimeout(this.collectEntropy, this.intervalTime());
-                return 1;
        },
        
        //-------------------------------------------------------------------------
-        'pollingFrequency': function() {
-                return 10;
-        },
-        //-------------------------------------------------------------------------
        __syntaxFix__: "syntax fix"
 });
@@ -635,7 +589,7 @@ Clipperz.logWarning("Fortuna generator has not enough entropy, yet!");
        },
        
        //-------------------------------------------------------------------------
+/*
        'dump': function(appendToDoc) {
                var tbl;
                var i,c;
@@ -741,7 +695,7 @@ Clipperz.logWarning("Fortuna generator has not enough entropy, yet!");
                return tbl;
        },
+*/
        //-----------------------------------------------------------------------------
        __syntaxFix__: "syntax fix"
 });
@@ -784,7 +738,7 @@ Clipperz.Crypto.PRNG.Random.prototype = MochiKit.Base.update(null, {
 //#############################################################################
-_clipperz_crypt_prng_defaultPRNG = null;
+var _clipperz_crypt_prng_defaultPRNG = null;
 Clipperz.Crypto.PRNG.defaultRandomGenerator = function() {
        if (_clipperz_crypt_prng_defaultPRNG == null) {
@@ -816,16 +770,26 @@ Clipperz.Crypto.PRNG.defaultRandomGenerator = function() {
                //.............................................................
                //
-                        //      KeyboardRandomnessSource
+                        //      CryptoRandomRandomnessSource
                //
                //.............................................................
                {
                                varnewRandomnessSource;
+                                varbrowserCrypto;
                        
-                        newRandomnessSource = new Clipperz.Crypto.PRNG.KeyboardRandomnessSource();
+                        if (window.crypto && window.crypto.getRandomValues) {
-                        _clipperz_crypt_prng_defaultPRNG.addRandomnessSource(newRandomnessSource);
+                                browserCrypto = window.crypto;
+                        } else if (window.msCrypto && window.msCrypto.getRandomValues) {
+                                browserCrypto = window.msCrypto;
+                        } else {
+                                browserCrypto = null;
+                        }
+        
+                        if (browserCrypto != null) {
+                                newRandomnessSource = new Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource({'browserCrypto':browserCrypto});
+                                _clipperz_crypt_prng_defaultPRNG.addRandomnessSource(newRandomnessSource);
+                        }
                }
        }
        return _clipperz_crypt_prng_defaultPRNG;
diff --git a/frontend/delta/js/Clipperz/Crypto/SRP.js b/frontend/delta/js/Clipperz/Crypto/SRP.js
index 597e72d..6898dfb 100644
--- a/frontend/delta/js/Clipperz/Crypto/SRP.js
+++ b/frontend/delta/js/Clipperz/Crypto/SRP.js
@@ -44,6 +44,8 @@ MochiKit.Base.update(Clipperz.Crypto.SRP, {
        '_n': null,
        '_g': null,
+        '_k': null,
+        
        //-------------------------------------------------------------------------
        'n': function() {
@@ -64,6 +66,15 @@ MochiKit.Base.update(Clipperz.Crypto.SRP, {
                return Clipperz.Crypto.SRP._g;
        },
+        'k': function() {
+                if (Clipperz.Crypto.SRP._k == null) {
+        //              Clipperz.Crypto.SRP._k = new Clipperz.Crypto.BigInt(this.stringHash(this.n().asString() + this.g().asString()), 16);
+                        Clipperz.Crypto.SRP._k = new Clipperz.Crypto.BigInt("64398bff522814e306a97cb9bfc4364b7eed16a8c17c5208a40a2bad2933c8e", 16);
+                }
+                
+                return Clipperz.Crypto.SRP._k;
+        },
+        
        //-----------------------------------------------------------------------------
        'exception': {
@@ -138,10 +149,9 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
        'A': function () {
                if (this._A == null) {
-                                //Warning: this value should be strictly greater than zero: how should we perform this check?
+                                //Warning: this value should be strictly greater than zero
                        this._A = Clipperz.Crypto.SRP.g().powerModule(this.a(), Clipperz.Crypto.SRP.n());
-                        
+                        if (this._A.equals(0) || negative(this._A)) {
-                        if (this._A.equals(0)) {
                                Clipperz.logError("Clipperz.Crypto.SRP.Connection: trying to set 'A' to 0.");
                                throw Clipperz.Crypto.SRP.exception.InvalidValue;
                        }
@@ -167,10 +177,9 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
        },
        'set_B': function(aValue) {
-                        //Warning: this value should be strictly greater than zero: how should we perform this check?
+                        //Warning: this value should be strictly greater than zero
-                if (! aValue.equals(0)) {
+                this._B = aValue;
-                        this._B = aValue;
+                if (this._B.equals(0) || negative(this._B)) {
-                } else {
                        Clipperz.logError("Clipperz.Crypto.SRP.Connection: trying to set 'B' to 0.");
                        throw Clipperz.Crypto.SRP.exception.InvalidValue;
                }
@@ -190,7 +199,7 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
        'u': function () {
                if (this._u == null) {
-                        this._u = new Clipperz.Crypto.BigInt(this.stringHash(this.B().asString()), 16);
+                        this._u = new Clipperz.Crypto.BigInt(this.stringHash(this.A().asString() + this.B().asString()), 16);
                }
                
                return this._u;
@@ -207,9 +216,15 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
                                srp =  Clipperz.Crypto.SRP;
                                this._S =bigint.powerModule(
-                                                                bigint.subtract(this.B(), bigint.powerModule(srp.g(), this.x(), srp.n())),
+                                                        bigint.subtract(
-                                                                bigint.add(this.a(), bigint.multiply(this.u(), this.x())),
+                                                                this.B(),
-                                                                srp.n()
+                                                                bigint.multiply(
+                                                                        Clipperz.Crypto.SRP.k(),
+                                                                        bigint.powerModule(srp.g(), this.x(), srp.n())
+                                                                )
+                                                        ),
+                                                        bigint.add(this.a(), bigint.multiply(this.u(), this.x())),
+                                                        srp.n()
                                                )
                }
                
@@ -230,7 +245,20 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
        'M1': function () {
                if (this._M1 == null) {
-                        this._M1 = this.stringHash(this.A().asString(10) + this.B().asString(10) + this.K());
+        //              this._M1 = this.stringHash(this.A().asString(10) + this.B().asString(10) + this.K());
+                                //http://srp.stanford.edu/design.html
+                                //User -> Host:  M = H(H(N) xor H(g), H(I), s, A, B, K)
+                        this._M1 = this.stringHash(
+                                "597626870978286801440197562148588907434001483655788865609375806439877501869636875571920406529" +
+                                this.stringHash(this.C()) +
+                                this.s().asString() +
+                                this.A().asString() +
+                                this.B().asString() +
+                                this.K()
+                        );
+//console.log("M1", this._M1);
                }
                
                return this._M1;
@@ -241,6 +269,7 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
        'M2': function () {
                if (this._M2 == null) {
                        this._M2 = this.stringHash(this.A().asString(10) + this.M1() + this.K());
+//console.log("M2", this._M2);
                }
                
                return this._M2;
diff --git a/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js b/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js
index 3f16f70..d03f873 100644
--- a/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js
+++ b/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js
@@ -88,7 +88,7 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.LocalStorageDataStore, Clipperz.P
                        randomBytes = Clipperz.Crypto.Base.generateRandomSeed();
                        aConnection['b'] = new Clipperz.Crypto.BigInt(randomBytes, 16);
                        v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);
-                        aConnection['B'] = v.add(Clipperz.Crypto.SRP.g().powerModule(aConnection['b'], Clipperz.Crypto.SRP.n()));
+                        aConnection['B'] = (Clipperz.Crypto.SRP.k().multiply(v)).add(Clipperz.Crypto.SRP.g().powerModule(aConnection['b'], Clipperz.Crypto.SRP.n()));
                        
                        aConnection['A'] = someParameters.parameters.A;
                        
@@ -97,20 +97,35 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.LocalStorageDataStore, Clipperz.P
                        
                        nextTollRequestType = 'CONNECT';
                } else if (someParameters.message == "credentialCheck") {
-                        var v, u, S, A, K, M1;
+                        var v, u, s, S, A, K, M1;
+                        var stringHash = function (aValue) {
+                                return Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aValue)).toHexString().substring(2);
+                        };
                        
                        v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);
-                        u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aConnection['B'].asString(10))).toHexString(), 16);
                        A = new Clipperz.Crypto.BigInt(aConnection['A'], 16);
+                        u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10))).toHexString(), 16);
+                        s = new Clipperz.Crypto.BigInt(aConnection['userData']['s'], 16);
                        S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(aConnection['b'], Clipperz.Crypto.SRP.n());
-                        K = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(S.asString(10))).toHexString().slice(2);
+                        K = stringHash(S.asString(10));
-                        M1 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10) + K)).toHexString().slice(2);
+                        M1 = stringHash(
+                                "597626870978286801440197562148588907434001483655788865609375806439877501869636875571920406529" +
+                                stringHash(aConnection['C']) +
+                                s.asString(10) +
+                                A.asString(10) +
+                                aConnection['B'].asString(10) +
+                                K
+                        );
                        if (someParameters.parameters.M1 == M1) {
                                var M2;
                                
-                                M2 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + someParameters.parameters.M1 + K)).toHexString().slice(2);
+                                M2 = stringHash(
+                                        A.asString(10) +
+                                        someParameters.parameters.M1 +
+                                        K
+                                );
                                result['M2'] = M2;
                        } else {
                                throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error");

diff --git a/frontend/delta/js/Clipperz/Crypto/PRNG.js b/frontend/delta/js/Clipperz/Crypto/PRNG.js index c539f06..80d972f 100644 --- a/frontend/delta/js/Clipperz/Crypto/PRNG.js +++ b/frontend/delta/js/Clipperz/Crypto/PRNG.js
@@ -21,6 +21,8 @@ refer to http://www.clipperz.com.
21		21
22	*/	22	*/
23		23
		24	"use strict";
		25
24	try { if (typeof(Clipperz.ByteArray) == 'undefined') { throw ""; }} catch (e) {	26	try { if (typeof(Clipperz.ByteArray) == 'undefined') { throw ""; }} catch (e) {
25	throw "Clipperz.Crypto.PRNG depends on Clipperz.ByteArray!";	27	throw "Clipperz.Crypto.PRNG depends on Clipperz.ByteArray!";
26	}	28	}
@@ -197,12 +199,6 @@ Clipperz.Crypto.PRNG.TimeRandomnessSource.prototype = MochiKit.Base.update(new C
197	},	199	},
198		200
199	//-------------------------------------------------------------------------	201	//-------------------------------------------------------------------------
200
201	'pollingFrequency': function() {
202	return 10;
203	},
204
205	//-------------------------------------------------------------------------
206	__syntaxFix__: "syntax fix"	202	__syntaxFix__: "syntax fix"
207	});	203	});
208		204
@@ -245,12 +241,12 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new
245	var numberOfRandomBitsCollected;	241	var numberOfRandomBitsCollected;
246		242
247	numberOfRandomBitsCollected = this.numberOfRandomBitsCollected();	243	numberOfRandomBitsCollected = this.numberOfRandomBitsCollected();
248	collectetBits = this.randomBitsCollector() \| (aValue << numberOfRandomBitsCollected);	244	collectedBits = this.randomBitsCollector() \| (aValue << numberOfRandomBitsCollected);
249	this.setRandomBitsCollector(collectetBits);	245	this.setRandomBitsCollector(collectedBits);
250	numberOfRandomBitsCollected += this.numberOfBitsToCollectAtEachEvent();	246	numberOfRandomBitsCollected += this.numberOfBitsToCollectAtEachEvent();
251		247
252	if (numberOfRandomBitsCollected == 8) {	248	if (numberOfRandomBitsCollected == 8) {
253	this.updateGeneratorWithValue(collectetBits);	249	this.updateGeneratorWithValue(collectedBits);
254	numberOfRandomBitsCollected = 0;	250	numberOfRandomBitsCollected = 0;
255	this.setRandomBitsCollector(0);	251	this.setRandomBitsCollector(0);
256	}	252	}
@@ -289,96 +285,54 @@ Clipperz.Crypto.PRNG.MouseRandomnessSource.prototype = MochiKit.Base.update(new
289	},	285	},
290		286
291	//-------------------------------------------------------------------------	287	//-------------------------------------------------------------------------
292
293	'pollingFrequency': function() {
294	return 10;
295	},
296
297	//-------------------------------------------------------------------------
298	__syntaxFix__: "syntax fix"	288	__syntaxFix__: "syntax fix"
299	});	289	});
300		290
301	//*****************************************************************************	291	//*****************************************************************************
302		292
303	Clipperz.Crypto.PRNG.KeyboardRandomnessSource = function(args) {	293	Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource = function(args) {
304	args = args \|\| {};	294	args = args \|\| {};
305	Clipperz.Crypto.PRNG.RandomnessSource.call(this, args);
306		295
307	this._randomBitsCollector = 0;	296	this._intervalTime = args.intervalTime \|\| 1000;
308	this._numberOfRandomBitsCollected = 0;	297	this._browserCrypto = args.browserCrypto;
309		298
310	MochiKit.Signal.connect(document, 'onkeypress', this, 'collectEntropy');	299	Clipperz.Crypto.PRNG.RandomnessSource.call(this, args);
311		300
		301	this.collectEntropy();
312	return this;	302	return this;
313	}	303	}
314		304
315	Clipperz.Crypto.PRNG.KeyboardRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, {	305	Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource.prototype = MochiKit.Base.update(new Clipperz.Crypto.PRNG.RandomnessSource, {
316		306
317	//-------------------------------------------------------------------------	307	'intervalTime': function() {
318		308	return this._intervalTime;
319	'randomBitsCollector': function() {
320	return this._randomBitsCollector;
321	},
322
323	'setRandomBitsCollector': function(aValue) {
324	this._randomBitsCollector = aValue;
325	},	309	},
326		310
327	'appendRandomBitToRandomBitsCollector': function(aValue) {	311	'browserCrypto': function () {
328	var collectedBits;	312	return this._browserCrypto;
329	var numberOfRandomBitsCollected;
330
331	numberOfRandomBitsCollected = this.numberOfRandomBitsCollected();
332	collectetBits = this.randomBitsCollector() \| (aValue << numberOfRandomBitsCollected);
333	this.setRandomBitsCollector(collectetBits);
334	numberOfRandomBitsCollected ++;
335
336	if (numberOfRandomBitsCollected == 8) {
337	this.updateGeneratorWithValue(collectetBits);
338	numberOfRandomBitsCollected = 0;
339	this.setRandomBitsCollector(0);
340	}
341
342	this.setNumberOfRandomBitsCollected(numberOfRandomBitsCollected)
343	},	313	},
344		314
345	//-------------------------------------------------------------------------	315	//-------------------------------------------------------------------------
346		316
347	'numberOfRandomBitsCollected': function() {	317	'collectEntropy': function() {
348	return this._numberOfRandomBitsCollected;	318	varbytesToCollect;
349	},
350
351	'setNumberOfRandomBitsCollected': function(aValue) {
352	this._numberOfRandomBitsCollected = aValue;
353	},
354		319
355	//-------------------------------------------------------------------------	320	if (this.boostMode() == true) {
		321	bytesToCollect = 64;
		322	} else {
		323	bytesToCollect = 8;
		324	}
356		325
357	'collectEntropy': function(anEvent) {	326	var randomValuesArray = new Uint8Array(bytesToCollect);
358	/*	327	this.browserCrypto().getRandomValues(randomValuesArray);
359	var mouseLocation;	328	for (var i = 0; i < randomValuesArray.length; i++) {
360	var randomBit;	329	this.updateGeneratorWithValue(randomValuesArray[i]);
361		330	}
362	mouseLocation = anEvent.mouse().client;
363
364	randomBit = ((mouseLocation.x ^ mouseLocation.y) & 0x1);
365	this.appendRandomBitToRandomBitsCollector(randomBit);
366	*/
367	},
368
369	//-------------------------------------------------------------------------
370		331
371	'numberOfRandomBits': function() {	332	setTimeout(this.collectEntropy, this.intervalTime());
372	return 1;
373	},	333	},
374		334
375	//-------------------------------------------------------------------------	335	//-------------------------------------------------------------------------
376
377	'pollingFrequency': function() {
378	return 10;
379	},
380
381	//-------------------------------------------------------------------------
382	__syntaxFix__: "syntax fix"	336	__syntaxFix__: "syntax fix"
383	});	337	});
384		338
@@ -635,7 +589,7 @@ Clipperz.logWarning("Fortuna generator has not enough entropy, yet!");
635	},	589	},
636		590
637	//-------------------------------------------------------------------------	591	//-------------------------------------------------------------------------
638		592	/*
639	'dump': function(appendToDoc) {	593	'dump': function(appendToDoc) {
640	var tbl;	594	var tbl;
641	var i,c;	595	var i,c;
@@ -741,7 +695,7 @@ Clipperz.logWarning("Fortuna generator has not enough entropy, yet!");
741		695
742	return tbl;	696	return tbl;
743	},	697	},
744		698	*/
745	//-----------------------------------------------------------------------------	699	//-----------------------------------------------------------------------------
746	__syntaxFix__: "syntax fix"	700	__syntaxFix__: "syntax fix"
747	});	701	});
@@ -784,7 +738,7 @@ Clipperz.Crypto.PRNG.Random.prototype = MochiKit.Base.update(null, {
784		738
785	//#############################################################################	739	//#############################################################################
786		740
787	_clipperz_crypt_prng_defaultPRNG = null;	741	var _clipperz_crypt_prng_defaultPRNG = null;
788		742
789	Clipperz.Crypto.PRNG.defaultRandomGenerator = function() {	743	Clipperz.Crypto.PRNG.defaultRandomGenerator = function() {
790	if (_clipperz_crypt_prng_defaultPRNG == null) {	744	if (_clipperz_crypt_prng_defaultPRNG == null) {
@@ -816,16 +770,26 @@ Clipperz.Crypto.PRNG.defaultRandomGenerator = function() {
816		770
817	//.............................................................	771	//.............................................................
818	//	772	//
819	// KeyboardRandomnessSource	773	// CryptoRandomRandomnessSource
820	//	774	//
821	//.............................................................	775	//.............................................................
822	{	776	{
823	varnewRandomnessSource;	777	varnewRandomnessSource;
		778	varbrowserCrypto;
824		779
825	newRandomnessSource = new Clipperz.Crypto.PRNG.KeyboardRandomnessSource();	780	if (window.crypto && window.crypto.getRandomValues) {
826	_clipperz_crypt_prng_defaultPRNG.addRandomnessSource(newRandomnessSource);	781	browserCrypto = window.crypto;
		782	} else if (window.msCrypto && window.msCrypto.getRandomValues) {
		783	browserCrypto = window.msCrypto;
		784	} else {
		785	browserCrypto = null;
		786	}
		787
		788	if (browserCrypto != null) {
		789	newRandomnessSource = new Clipperz.Crypto.PRNG.CryptoRandomRandomnessSource({'browserCrypto':browserCrypto});
		790	_clipperz_crypt_prng_defaultPRNG.addRandomnessSource(newRandomnessSource);
		791	}
827	}	792	}
828
829	}	793	}
830		794
831	return _clipperz_crypt_prng_defaultPRNG;	795	return _clipperz_crypt_prng_defaultPRNG;


diff --git a/frontend/delta/js/Clipperz/Crypto/SRP.js b/frontend/delta/js/Clipperz/Crypto/SRP.js index 597e72d..6898dfb 100644 --- a/frontend/delta/js/Clipperz/Crypto/SRP.js +++ b/frontend/delta/js/Clipperz/Crypto/SRP.js
@@ -44,6 +44,8 @@ MochiKit.Base.update(Clipperz.Crypto.SRP, {
44		44
45	'_n': null,	45	'_n': null,
46	'_g': null,	46	'_g': null,
		47	'_k': null,
		48
47	//-------------------------------------------------------------------------	49	//-------------------------------------------------------------------------
48		50
49	'n': function() {	51	'n': function() {
@@ -64,6 +66,15 @@ MochiKit.Base.update(Clipperz.Crypto.SRP, {
64	return Clipperz.Crypto.SRP._g;	66	return Clipperz.Crypto.SRP._g;
65	},	67	},
66		68
		69	'k': function() {
		70	if (Clipperz.Crypto.SRP._k == null) {
		71	// Clipperz.Crypto.SRP._k = new Clipperz.Crypto.BigInt(this.stringHash(this.n().asString() + this.g().asString()), 16);
		72	Clipperz.Crypto.SRP._k = new Clipperz.Crypto.BigInt("64398bff522814e306a97cb9bfc4364b7eed16a8c17c5208a40a2bad2933c8e", 16);
		73	}
		74
		75	return Clipperz.Crypto.SRP._k;
		76	},
		77
67	//-----------------------------------------------------------------------------	78	//-----------------------------------------------------------------------------
68		79
69	'exception': {	80	'exception': {
@@ -138,10 +149,9 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
138		149
139	'A': function () {	150	'A': function () {
140	if (this._A == null) {	151	if (this._A == null) {
141	//Warning: this value should be strictly greater than zero: how should we perform this check?	152	//Warning: this value should be strictly greater than zero
142	this._A = Clipperz.Crypto.SRP.g().powerModule(this.a(), Clipperz.Crypto.SRP.n());	153	this._A = Clipperz.Crypto.SRP.g().powerModule(this.a(), Clipperz.Crypto.SRP.n());
143		154	if (this._A.equals(0) \|\| negative(this._A)) {
144	if (this._A.equals(0)) {
145	Clipperz.logError("Clipperz.Crypto.SRP.Connection: trying to set 'A' to 0.");	155	Clipperz.logError("Clipperz.Crypto.SRP.Connection: trying to set 'A' to 0.");
146	throw Clipperz.Crypto.SRP.exception.InvalidValue;	156	throw Clipperz.Crypto.SRP.exception.InvalidValue;
147	}	157	}
@@ -167,10 +177,9 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
167	},	177	},
168		178
169	'set_B': function(aValue) {	179	'set_B': function(aValue) {
170	//Warning: this value should be strictly greater than zero: how should we perform this check?	180	//Warning: this value should be strictly greater than zero
171	if (! aValue.equals(0)) {	181	this._B = aValue;
172	this._B = aValue;	182	if (this._B.equals(0) \|\| negative(this._B)) {
173	} else {
174	Clipperz.logError("Clipperz.Crypto.SRP.Connection: trying to set 'B' to 0.");	183	Clipperz.logError("Clipperz.Crypto.SRP.Connection: trying to set 'B' to 0.");
175	throw Clipperz.Crypto.SRP.exception.InvalidValue;	184	throw Clipperz.Crypto.SRP.exception.InvalidValue;
176	}	185	}
@@ -190,7 +199,7 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
190		199
191	'u': function () {	200	'u': function () {
192	if (this._u == null) {	201	if (this._u == null) {
193	this._u = new Clipperz.Crypto.BigInt(this.stringHash(this.B().asString()), 16);	202	this._u = new Clipperz.Crypto.BigInt(this.stringHash(this.A().asString() + this.B().asString()), 16);
194	}	203	}
195		204
196	return this._u;	205	return this._u;
@@ -207,9 +216,15 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
207	srp = Clipperz.Crypto.SRP;	216	srp = Clipperz.Crypto.SRP;
208		217
209	this._S =bigint.powerModule(	218	this._S =bigint.powerModule(
210	bigint.subtract(this.B(), bigint.powerModule(srp.g(), this.x(), srp.n())),	219	bigint.subtract(
211	bigint.add(this.a(), bigint.multiply(this.u(), this.x())),	220	this.B(),
212	srp.n()	221	bigint.multiply(
		222	Clipperz.Crypto.SRP.k(),
		223	bigint.powerModule(srp.g(), this.x(), srp.n())
		224	)
		225	),
		226	bigint.add(this.a(), bigint.multiply(this.u(), this.x())),
		227	srp.n()
213	)	228	)
214	}	229	}
215		230
@@ -230,7 +245,20 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
230		245
231	'M1': function () {	246	'M1': function () {
232	if (this._M1 == null) {	247	if (this._M1 == null) {
233	this._M1 = this.stringHash(this.A().asString(10) + this.B().asString(10) + this.K());	248	// this._M1 = this.stringHash(this.A().asString(10) + this.B().asString(10) + this.K());
		249
		250	//http://srp.stanford.edu/design.html
		251	//User -> Host: M = H(H(N) xor H(g), H(I), s, A, B, K)
		252
		253	this._M1 = this.stringHash(
		254	"597626870978286801440197562148588907434001483655788865609375806439877501869636875571920406529" +
		255	this.stringHash(this.C()) +
		256	this.s().asString() +
		257	this.A().asString() +
		258	this.B().asString() +
		259	this.K()
		260	);
		261	//console.log("M1", this._M1);
234	}	262	}
235		263
236	return this._M1;	264	return this._M1;
@@ -241,6 +269,7 @@ Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
241	'M2': function () {	269	'M2': function () {
242	if (this._M2 == null) {	270	if (this._M2 == null) {
243	this._M2 = this.stringHash(this.A().asString(10) + this.M1() + this.K());	271	this._M2 = this.stringHash(this.A().asString(10) + this.M1() + this.K());
		272	//console.log("M2", this._M2);
244	}	273	}
245		274
246	return this._M2;	275	return this._M2;


diff --git a/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js b/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js index 3f16f70..d03f873 100644 --- a/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js +++ b/frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.LocalStorageDataStore.js
@@ -88,7 +88,7 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.LocalStorageDataStore, Clipperz.P
88	randomBytes = Clipperz.Crypto.Base.generateRandomSeed();	88	randomBytes = Clipperz.Crypto.Base.generateRandomSeed();
89	aConnection['b'] = new Clipperz.Crypto.BigInt(randomBytes, 16);	89	aConnection['b'] = new Clipperz.Crypto.BigInt(randomBytes, 16);
90	v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);	90	v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);
91	aConnection['B'] = v.add(Clipperz.Crypto.SRP.g().powerModule(aConnection['b'], Clipperz.Crypto.SRP.n()));	91	aConnection['B'] = (Clipperz.Crypto.SRP.k().multiply(v)).add(Clipperz.Crypto.SRP.g().powerModule(aConnection['b'], Clipperz.Crypto.SRP.n()));
92		92
93	aConnection['A'] = someParameters.parameters.A;	93	aConnection['A'] = someParameters.parameters.A;
94		94
@@ -97,20 +97,35 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.LocalStorageDataStore, Clipperz.P
97		97
98	nextTollRequestType = 'CONNECT';	98	nextTollRequestType = 'CONNECT';
99	} else if (someParameters.message == "credentialCheck") {	99	} else if (someParameters.message == "credentialCheck") {
100	var v, u, S, A, K, M1;	100	var v, u, s, S, A, K, M1;
		101	var stringHash = function (aValue) {
		102	return Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aValue)).toHexString().substring(2);
		103	};
101		104
102	v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);	105	v = new Clipperz.Crypto.BigInt(aConnection['userData']['v'], 16);
103	u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(aConnection['B'].asString(10))).toHexString(), 16);
104	A = new Clipperz.Crypto.BigInt(aConnection['A'], 16);	106	A = new Clipperz.Crypto.BigInt(aConnection['A'], 16);
		107	u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10))).toHexString(), 16);
		108	s = new Clipperz.Crypto.BigInt(aConnection['userData']['s'], 16);
105	S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(aConnection['b'], Clipperz.Crypto.SRP.n());	109	S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(aConnection['b'], Clipperz.Crypto.SRP.n());
106		110
107	K = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(S.asString(10))).toHexString().slice(2);	111	K = stringHash(S.asString(10));
108		112
109	M1 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10) + K)).toHexString().slice(2);	113	M1 = stringHash(
		114	"597626870978286801440197562148588907434001483655788865609375806439877501869636875571920406529" +
		115	stringHash(aConnection['C']) +
		116	s.asString(10) +
		117	A.asString(10) +
		118	aConnection['B'].asString(10) +
		119	K
		120	);
110	if (someParameters.parameters.M1 == M1) {	121	if (someParameters.parameters.M1 == M1) {
111	var M2;	122	var M2;
112		123
113	M2 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + someParameters.parameters.M1 + K)).toHexString().slice(2);	124	M2 = stringHash(
		125	A.asString(10) +
		126	someParameters.parameters.M1 +
		127	K
		128	);
114	result['M2'] = M2;	129	result['M2'] = M2;
115	} else {	130	} else {
116	throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error");	131	throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error");