Merge pull request travist#38 from markharding/master

resolves issue with OpenSSL private keys travist#37
kubz · Jan 26, 2015 · f583fc6 · f583fc6
2 parents 6c0ac57 + 9e43644
commit f583fc6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/bin/jsencrypt.js b/bin/jsencrypt.js
@@ -3866,6 +3866,11 @@ RSAKey.prototype.parseKey = function (pem) {
     var reHex = /^\s*(?:[0-9A-Fa-f][0-9A-Fa-f]\s*)+$/;
     var der = reHex.test(pem) ? Hex.decode(pem) : Base64.unarmor(pem);
     var asn1 = ASN1.decode(der);
+
+    //Fixes a bug with OpenSSL 1.0+ private keys
+    if(asn1.sub.length === 3){
+        asn1 = asn1.sub[2].sub[0];
+    }
     if (asn1.sub.length === 9) {
 
       // Parse the private key.