From 104bc734f6e2e63fa76e61c1906b305c5c1e6120 Mon Sep 17 00:00:00 2001
From: Tankred Hase <mail@tankredhase.de>
Date: Fri, 5 Apr 2013 16:51:47 +0200
Subject: [PATCH] created portable version of util

---
 src/js/crypto/util.js | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/js/crypto/util.js b/src/js/crypto/util.js
index 9678e73..bae431b 100644
--- a/src/js/crypto/util.js
+++ b/src/js/crypto/util.js
@@ -1,7 +1,9 @@
+var crypt = crypt;
+
 /**
  * Various utitity methods for crypto, encoding & decoding
  */
-app.crypto.Util = function(window, uuid) {
+var Util = function(window, uuid) {
 	'use strict';
 
 	/**
@@ -19,10 +21,15 @@ app.crypto.Util = function(window, uuid) {
 	this.random = function(keySize) {
 		var keyBase64, keyBuf;
 
-		if (window.crypto && window.crypto.getRandomValues) {
+		if (typeof module !== 'undefined' && module.exports) {
+			keyBuf = crypt.randomBytes(keySize / 8);
+			keyBase64 = new Buffer(keyBuf).toString('base64');
+
+		} else if (window.crypto && window.crypto.getRandomValues) {
 			keyBuf = new Uint8Array(keySize / 8);
 			window.crypto.getRandomValues(keyBuf);
 			keyBase64 = window.btoa(this.uint8Arr2BinStr(keyBuf));
+
 		} else {
 			// add an additional peace of entropy to the pot and stir with the sjcl prng
 			sjcl.random.addEntropy((new Date()).valueOf(), 2, "calltime");
@@ -165,4 +172,33 @@ app.crypto.Util = function(window, uuid) {
 		return str;
 	};
 
-};
\ No newline at end of file
+	/**
+	 * Convert a str to base64 in a browser and in node.js
+	 */
+	this.str2Base64 = function(str) {
+		if (typeof module !== 'undefined' && module.exports) {
+			return new Buffer(str, 'binary').toString('base64');
+		} else {
+			return window.btoa(str);
+		}
+	};
+
+	/**
+	 * Convert a base64 encoded string in a browser and in node.js
+	 */
+	this.base642Str = function(str) {
+		if (typeof module !== 'undefined' && module.exports) {
+			return new Buffer(str, 'base64').toString('binary');
+		} else {
+			return window.atob(str);
+		}
+	};
+
+};
+
+if (typeof module !== 'undefined' && module.exports) {
+	crypt = require('crypto');
+	module.exports = Util;
+} else {
+	app.crypto.Util = Util;
+}
\ No newline at end of file