From 4a080eed268b2bc583410359b17aec89b42bfdc7 Mon Sep 17 00:00:00 2001
From: Tankred Hase <mail@tankredhase.de>
Date: Thu, 16 May 2013 16:54:56 +0200
Subject: [PATCH] added git submodule deps in npm

---
 package.json             |  6 +++++-
 res/copy-deps.sh         |  9 +++++++++
 src/js/crypto/aes-cbc.js | 10 ++++++++--
 src/js/crypto/rsa.js     | 12 +++++++++---
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100755 res/copy-deps.sh

diff --git a/package.json b/package.json
index 184bcab..e283414 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,11 @@
 	"engines": {
 		"node": ">=0.8"
 	},
+	"scripts": {
+		"postinstall": "./res/copy-deps.sh"
+	},
 	"dependencies": {
-		"express": "latest"
+		"express": "latest",
+		"crypto-lib": "git://github.com/whiteout-io/crypto-lib.git#master"
 	}
 }
\ No newline at end of file
diff --git a/res/copy-deps.sh b/res/copy-deps.sh
new file mode 100755
index 0000000..25da4d8
--- /dev/null
+++ b/res/copy-deps.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+echo "--> copying dependencies to src\n"
+
+# go to root
+cd `dirname $0`
+cd ..
+
+cp ./node_modules/crypto-lib/src/*.js ./src/js/crypto/
\ No newline at end of file
diff --git a/src/js/crypto/aes-cbc.js b/src/js/crypto/aes-cbc.js
index 1464a23..e297a5c 100644
--- a/src/js/crypto/aes-cbc.js
+++ b/src/js/crypto/aes-cbc.js
@@ -1,7 +1,7 @@
 /**
  * A Wrapper for Forge's AES-CBC encryption
  */
-app.crypto.AesCBC = function(forge) {
+var AesCBC = function(forge) {
 	'use strict';
 
 	var utl = forge.util;
@@ -42,4 +42,10 @@ app.crypto.AesCBC = function(forge) {
 		return utl.decodeUtf8(cipher.output.getBytes());
 	};
 
-};
\ No newline at end of file
+};
+
+if (typeof module !== 'undefined' && module.exports) {
+	module.exports = AesCBC;
+} else {
+	app.crypto.AesCBC = AesCBC;
+}
\ No newline at end of file
diff --git a/src/js/crypto/rsa.js b/src/js/crypto/rsa.js
index 26b0128..ecf2e05 100644
--- a/src/js/crypto/rsa.js
+++ b/src/js/crypto/rsa.js
@@ -1,7 +1,7 @@
 /**
  * A Wrapper for Forge's RSA encryption
  */
-app.crypto.RSA = function(forge, util) {
+var RSA = function(forge, util) {
 	'use strict';
 
 	var utl = forge.util;
@@ -29,7 +29,7 @@ app.crypto.RSA = function(forge, util) {
 	this.generateKeypair = function(keySize, callback) {
 		forge.rsa.generateKeyPair({
 			bits: keySize,
-			workerScript: app.config.workerPath + '/../../lib/forge/prime.worker.js'
+			workerScript: (typeof app !== 'undefined') ? (app.config.workerPath + '/../../lib/forge/prime.worker.js') : undefined
 		}, function(err, newKeypair) {
 			if (err || !newKeypair || !newKeypair.publicKey || !newKeypair.privateKey) {
 				callback({
@@ -117,4 +117,10 @@ app.crypto.RSA = function(forge, util) {
 		return keypair.publicKey.verify(sha.digest().getBytes(), sigUtf8);
 	};
 
-};
\ No newline at end of file
+};
+
+if (typeof module !== 'undefined' && module.exports) {
+	module.exports = RSA;
+} else {
+	app.crypto.RSA = RSA;
+}
\ No newline at end of file