Merge pull request travist#4 from zoloft/master

Removed atob function for IE compatibility
kripod · Aug 9, 2013 · 6e4f410 · 6e4f410
2 parents 2e6ab65 + e69e798
commit 6e4f410
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+project.properties
+project.xml
diff --git a/src/jsencrypt.js b/src/jsencrypt.js
@@ -42,14 +42,7 @@ RSAKey.prototype.parseKey = function(keyString) {
  * Add a char64toHex method.
  */
 RSAKey.prototype.char64ToHex = function(str) {
-  var hex = '';
-  str = atob(str);
-  for (var i = 0; i < str.length; ++i) {
-    var tmp = str.charCodeAt(i).toString(16);
-    if (tmp.length === 1) tmp = "0" + tmp;
-    hex += tmp;
-  }
-  return hex;
+  return b64tohex(str);
 };
 
 /**
@@ -362,4 +355,4 @@ JSEncrypt.prototype.getPublicKey = function() {
 
   // Return the private representation of this key.
   return this.pubkey.getPublicKey();
-};
+};