refactored crypto libto use different namespace

src/js/crypto/aes-batch-worker.js

@@ -15,8 +15,8 @@
 
 		var i = e.data,
 			output = null,
-			aes = new app.crypto.AesCBC(forge),
+			aes = new cryptoLib.AesCBC(forge),
-			batch = new app.crypto.CryptoBatch(aes);
+			batch = new cryptoLib.CryptoBatch(aes);
 
 		if (i.type === 'encrypt' && i.list) {
 			// start encryption

src/js/crypto/aes-cbc.js

@@ -1,8 +1,10 @@
+(function() {
+	'use strict';
+
 	/**
 	 * A Wrapper for Forge's AES-CBC encryption
 	 */
 	var AesCBC = function(forge) {
-	'use strict';
 
 		var utl = forge.util;
 
@@ -47,5 +49,9 @@ var AesCBC = function(forge) {
 	if (typeof module !== 'undefined' && module.exports) {
 		module.exports = AesCBC;
 	} else {
-	app.crypto.AesCBC = AesCBC;
+		var that = (typeof window !== 'undefined') ? window : self;
+		that.cryptoLib = that.cryptoLib || {};
+		that.cryptoLib.AesCBC = AesCBC;
 	}
+
+})();

src/js/crypto/aes-worker.js

@@ -14,7 +14,7 @@
 
 		var i = e.data,
 			output = null,
-			aes = new app.crypto.AesCBC(forge);
+			aes = new cryptoLib.AesCBC(forge);
 
 		if (i.type === 'encrypt' && i.plaintext && i.key && i.iv) {
 			// start encryption

src/js/crypto/crypto-batch-worker.js

@@ -17,10 +17,10 @@
 
 		var i = e.data,
 			output = null,
-			aes = new app.crypto.AesCBC(forge),
+			aes = new cryptoLib.AesCBC(forge),
-			rsa = new app.crypto.RSA(forge),
+			rsa = new cryptoLib.RSA(forge),
-			util = new app.crypto.Util(),
+			util = new cryptoLib.Util(),
-			batch = new app.crypto.CryptoBatch(aes, rsa, util);
+			batch = new cryptoLib.CryptoBatch(aes, rsa, util);
 
 		// pass RSA keys to module
 		rsa.init(i.pubkeyPem, i.privkeyPem);

src/js/crypto/crypto-batch.js

@@ -1,8 +1,10 @@
+(function() {
+	'use strict';
+
 	/**
 	 * Crypto batch library for processing large sets of data
 	 */
 	var CryptoBatch = function(aes, rsa, util) {
-	'use strict';
 
 		/**
 		 * Encrypt a list of items using AES
@@ -87,5 +89,9 @@ var CryptoBatch = function(aes, rsa, util) {
 	if (typeof module !== 'undefined' && module.exports) {
 		module.exports = CryptoBatch;
 	} else {
-	app.crypto.CryptoBatch = CryptoBatch;
+		var that = (typeof window !== 'undefined') ? window : self;
+		that.cryptoLib = that.cryptoLib || {};
+		that.cryptoLib.CryptoBatch = CryptoBatch;
 	}
+
+})();

src/js/crypto/crypto.js

@@ -5,8 +5,8 @@
 app.crypto.Crypto = function(window, util) {
 	'use strict';
 
-	var aes = new app.crypto.AesCBC(forge); // use AES-CBC mode by default
+	var aes = new cryptoLib.AesCBC(forge); // use AES-CBC mode by default
-	var rsa = new app.crypto.RSA(forge, util); // use RSA for asym. crypto
+	var rsa = new cryptoLib.RSA(forge, util); // use RSA for asym. crypto
 	var keyStore = new app.dao.LocalStorageDAO(window);
 
 	var storageId; // storage id for the encrypted keypair in local storage
@@ -232,7 +232,7 @@ app.crypto.Crypto = function(window, util) {
 			});
 
 		} else {
-			var batch = new app.crypto.CryptoBatch(aes);
+			var batch = new cryptoLib.CryptoBatch(aes);
 			var encryptedList = batch.encryptList(list);
 			callback(encryptedList);
 		}
@@ -251,7 +251,7 @@ app.crypto.Crypto = function(window, util) {
 			});
 
 		} else {
-			var batch = new app.crypto.CryptoBatch(aes);
+			var batch = new cryptoLib.CryptoBatch(aes);
 			var decryptedList = batch.decryptList(list);
 			callback(decryptedList);
 		}
@@ -292,7 +292,7 @@ app.crypto.Crypto = function(window, util) {
 			});
 
 		} else {
-			var batch = new app.crypto.CryptoBatch(aes, rsa, util);
+			var batch = new cryptoLib.CryptoBatch(aes, rsa, util);
 			var encryptedList = batch.encryptListForUser(envelopes);
 			callback(null, encryptedList);
 		}
@@ -315,7 +315,7 @@ app.crypto.Crypto = function(window, util) {
 			});
 
 		} else {
-			var batch = new app.crypto.CryptoBatch(aes, rsa, util);
+			var batch = new cryptoLib.CryptoBatch(aes, rsa, util);
 			var decryptedList = batch.decryptListForUser(list);
 			callback(null, decryptedList);
 		}

src/js/crypto/rsa.js

@@ -1,8 +1,10 @@
+(function() {
+	'use strict';
+
 	/**
 	 * A Wrapper for Forge's RSA encryption
 	 */
 	var RSA = function(forge, util) {
-	'use strict';
 
 		var utl = forge.util;
 
@@ -128,5 +130,9 @@ var RSA = function(forge, util) {
 	if (typeof module !== 'undefined' && module.exports) {
 		module.exports = RSA;
 	} else {
-	app.crypto.RSA = RSA;
+		var that = (typeof window !== 'undefined') ? window : self;
+		that.cryptoLib = that.cryptoLib || {};
+		that.cryptoLib.RSA = RSA;
 	}
+
+})();

src/js/crypto/util.js

@@ -1,8 +1,10 @@
+(function() {
+	'use strict';
+
 	/**
 	 * Various utitity methods for crypto, encoding & decoding
 	 */
 	var Util = function(window, uuid, crypt) {
-	'use strict';
 
 		/**
 		 * Generates a new RFC 4122 version 4 compliant random UUID
@@ -199,5 +201,9 @@ var Util = function(window, uuid, crypt) {
 	if (typeof module !== 'undefined' && module.exports) {
 		module.exports = Util;
 	} else {
-	app.crypto.Util = Util;
+		var that = (typeof window !== 'undefined') ? window : self;
+		that.cryptoLib = that.cryptoLib || {};
+		that.cryptoLib.Util = Util;
 	}
+
+})();

src/js/dao/email-dao.js

@@ -15,7 +15,7 @@ app.dao.EmailDAO = function(_, crypto, devicestorage, cloudstorage, util) {
 		var storedKey = crypto.getEncryptedPrivateKey(account.get('emailAddress'));
 		cloudstorage.syncPrivateKey(account.get('emailAddress'), storedKey, function(err) {
 			if (err) {
-				console.log('Error syncing secret key to cloud: ' + err);
+				console.log('Error syncing private key to cloud: ' + err);
 			}
 			// init crypto
 			initCrypto();

test/test-data.js

@@ -1,6 +1,6 @@
 var TestData = function() {
 
-	var util = new app.crypto.Util(window, uuid);
+	var util = new cryptoLib.Util(window, uuid);
 
 	this.getEmailCollection = function(size) {
 		// create test data

test/unit/aes-test.js

@@ -2,12 +2,12 @@ module("AES Crypto");
 
 var aes_test = {
 	keySize: 128,
-	util: new app.crypto.Util(window, uuid),
+	util: new cryptoLib.Util(window, uuid),
 	test_message: new TestData().generateBigString(1000)
 };
 
 test("CBC mode", 4, function() {
-	var aes = new app.crypto.AesCBC(forge);
+	var aes = new cryptoLib.AesCBC(forge);
 
 	var plaintext = aes_test.test_message;
 	var key = aes_test.util.random(aes_test.keySize);
@@ -21,17 +21,3 @@ test("CBC mode", 4, function() {
 	var decrypted = aes.decrypt(ciphertext, key, iv);
 	equal(decrypted, plaintext, 'Decryption correct' + decrypted);
 });
-
-// test("CCM mode", 2, function() {
-// 	var aes = new app.crypto.AesCCM(sjcl);
-
-// 	var plaintext = aes_test.test_message;
-// 	var key = aes_test.util.random(aes_test.keySize);
-// 	var iv = aes_test.util.random(104);
-
-// 	var ciphertext = aes.encrypt(plaintext, key, iv);
-// 	ok(ciphertext, 'Ciphertext length: ' + ciphertext.length);
-
-// 	var decrypted = aes.decrypt(ciphertext, key, iv);
-// 	equal(decrypted, plaintext, 'Decryption correct: ' + decrypted);
-// });

test/unit/crypto-test.js

@@ -10,7 +10,7 @@ var crypto_test = {
 
 asyncTest("Init", 2, function() {
 	// init dependencies
-	crypto_test.util = new app.crypto.Util(window, uuid);
+	crypto_test.util = new cryptoLib.Util(window, uuid);
 	crypto_test.crypto = new app.crypto.Crypto(window, crypto_test.util);
 	ok(crypto_test.crypto, 'Crypto');
 

test/unit/devicestorage-test.js

@@ -10,7 +10,7 @@ var devicestorage_test = {
 
 asyncTest("Init", 3, function() {
 	// init dependencies
-	devicestorage_test.util = new app.crypto.Util(window, uuid);
+	devicestorage_test.util = new cryptoLib.Util(window, uuid);
 	devicestorage_test.jsonDao = new app.dao.LawnchairDAO(window);
 	devicestorage_test.crypto = new app.crypto.Crypto(window, devicestorage_test.util);
 	devicestorage_test.storage = new app.dao.DeviceStorage(devicestorage_test.util, devicestorage_test.crypto, devicestorage_test.jsonDao, null);

test/unit/email-dao-test.js

@@ -10,7 +10,7 @@ var emaildao_test = {
 
 asyncTest("Init", 3, function() {
 	// init dependencies	
-	var util = new app.crypto.Util(window, uuid);
+	var util = new cryptoLib.Util(window, uuid);
 	var jsonDao = new app.dao.LawnchairDAO(window);
 	emaildao_test.crypto = new app.crypto.Crypto(window, util);
 	emaildao_test.storage = new app.dao.DeviceStorage(util, emaildao_test.crypto, jsonDao, null);

test/unit/forge-test.js

@@ -25,7 +25,7 @@ test("SHA-256 Hash", 1, function() {
 });
 
 test("HMAC SHA-256", 1, function() {
-	var util = new app.crypto.Util(window, uuid);
+	var util = new cryptoLib.Util(window, uuid);
 
 	var key = util.base642Str(util.random(forge_aes_test.keySize));
 	var iv = util.base642Str(util.random(forge_aes_test.keySize));

test/unit/rsa-test.js

@@ -2,7 +2,7 @@ module("RSA Crypto");
 
 var rsa_test = {
 	keySize: 1024,
-	rsa: new app.crypto.RSA(forge, new app.crypto.Util(window, uuid)),
+	rsa: new cryptoLib.RSA(forge, new cryptoLib.Util(window, uuid)),
 	test_message: '06a9214036b8a15b512e03d534120006'
 };
 

test/unit/util-test.js

@@ -11,14 +11,14 @@ test("JQuery and basic requirements", 7, function() {
 });
 
 test("UUID", 2, function() {
-	var util = new app.crypto.Util(window, uuid);
+	var util = new cryptoLib.Util(window, uuid);
 	var id = util.UUID();
 	ok(id, "UUID: " + id);
 	ok(id.length === 36, "UUID length");
 });
 
 test("random", 3, function() {
-	var util = new app.crypto.Util(window, uuid);
+	var util = new cryptoLib.Util(window, uuid);
 	var base64 = util.random(128);
 	var str = window.atob(base64);
 	ok(base64, "Random base64: " + base64);
@@ -27,7 +27,7 @@ test("random", 3, function() {
 });
 
 test("Parse Date", 1, function() {
-	var util = new app.crypto.Util(window, uuid);
+	var util = new cryptoLib.Util(window, uuid);
 	var str = '1900-01-31 18:17:53';
 	var date = util.parseDate(str);
 	var formated = util.formatDate(date);
@@ -35,7 +35,7 @@ test("Parse Date", 1, function() {
 });
 
 test("String -> Uint8Array -> String", 3, function() {
-	var util = new app.crypto.Util(window);
+	var util = new cryptoLib.Util(window);
 
 	var input = "asdf";
 	var buf = util.binStr2Uint8Arr(input);