From 18790acc901dc8578f1c6f8f1ad1bf6d11bd1e0b Mon Sep 17 00:00:00 2001 From: Golo Roden Date: Sat, 28 Jun 2014 22:13:07 +0200 Subject: [PATCH] Fixes loading PEM files with trailing line-break. rzcoder/node-rsa#7 --- src/NodeRSA.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NodeRSA.js b/src/NodeRSA.js index 2b0cfb4..7ab4dae 100644 --- a/src/NodeRSA.js +++ b/src/NodeRSA.js @@ -61,9 +61,9 @@ module.exports = (function() { * @param pem {string} */ NodeRSA.prototype.loadFromPEM = function(pem) { - if (/^-----BEGIN RSA PRIVATE KEY-----\s([A-Za-z0-9+/=]+\s)+-----END RSA PRIVATE KEY-----$/g.test(pem)) { + if (/^-----BEGIN RSA PRIVATE KEY-----\s([A-Za-z0-9+/=]+\s)+-----END RSA PRIVATE KEY-----\s*$/g.test(pem)) { this.$loadFromPrivatePEM(pem, 'base64'); - } else if (/^-----BEGIN PUBLIC KEY-----\s([A-Za-z0-9+/=]+\s)+-----END PUBLIC KEY-----$/g.test(pem)) { + } else if (/^-----BEGIN PUBLIC KEY-----\s([A-Za-z0-9+/=]+\s)+-----END PUBLIC KEY-----\s*$/g.test(pem)) { this.$loadFromPublicPEM(pem, 'base64'); } else throw Error('Invalid PEM format'); @@ -365,4 +365,4 @@ module.exports = (function() { }; return NodeRSA; -})(); \ No newline at end of file +})();