From 05f043f97f593cc83b2178d7ea751f4d5cbf6b6f Mon Sep 17 00:00:00 2001
From: Enver Cicak <enver@digi.me>
Date: Wed, 23 Jan 2019 16:33:08 +0100
Subject: [PATCH] Allow keys without BEGIN/END boundaries to be loaded

---
 src/utils.js  | 13 ++++++++-----
 test/tests.js | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/utils.js b/src/utils.js
index 4e047da..a9062f2 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -91,15 +91,18 @@ module.exports._ = {
  * themselves.
  */
 module.exports.trimSurroundingText = function (data, opening, closing) {
+    let trimStartIndex = 0;
+    let trimEndIndex = data.length;
+
     let openingBoundaryIndex = data.indexOf(opening);
-    if (openingBoundaryIndex < 0) {
-        throw Error('Missing BEGIN line');
+    if (openingBoundaryIndex >= 0) {
+        trimStartIndex = openingBoundaryIndex + opening.length;
     }
 
     let closingBoundaryIndex = data.indexOf(closing, openingBoundaryIndex);
-    if (closingBoundaryIndex < 0) {
-        throw Error('Missing END line');
+    if (closingBoundaryIndex >= 0) {
+        trimEndIndex = closingBoundaryIndex;
     }
 
-    return data.substring(openingBoundaryIndex + opening.length, closingBoundaryIndex);
+    return data.substring(trimStartIndex, trimEndIndex);
 }
\ No newline at end of file
diff --git a/test/tests.js b/test/tests.js
index ecaa14a..ad67fa1 100644
--- a/test/tests.js
+++ b/test/tests.js
@@ -366,6 +366,40 @@ describe('NodeRSA', function () {
                         assert(!publicNodeRSA.isPrivate());
                     });
 
+                    it('should handle data without begin/end encapsulation boundaries for pkcs1 private keys', function () {
+                        let privateFile = fs.readFileSync(keysFolder + 'private_pkcs1.pem', "utf8");
+                        let privateFileNoBoundaries = privateFile.substring("-----BEGIN RSA PRIVATE KEY-----".length, privateFile.indexOf("-----END RSA PRIVATE KEY-----"));
+                        let key = new NodeRSA(privateFileNoBoundaries, "pkcs1-private-pem");
+                        assert.equal(key.exportKey(), fileKeyPKCS1);
+                    });
+
+                    it('should handle data without begin/end encapsulation boundaries for pkcs1 public keys', function () {
+                        let publicFile = fs.readFileSync(keysFolder + 'public_pkcs1.pem', "utf8");
+                        let publicFileNoBoundaries = publicFile.substring("-----BEGIN RSA PUBLIC KEY-----".length, publicFile.indexOf("-----END RSA PUBLIC KEY-----"));
+                        let publicNodeRSA = new NodeRSA(publicFileNoBoundaries, "pkcs1-public-pem");
+                        assert.instanceOf(publicNodeRSA.keyPair, Object);
+                        assert(publicNodeRSA.isPublic());
+                        assert(publicNodeRSA.isPublic(true));
+                        assert(!publicNodeRSA.isPrivate());
+                    });
+
+                    it('should handle data without begin/end encapsulation boundaries for pkcs8 private keys', function () {
+                        let privateFile = fs.readFileSync(keysFolder + 'private_pkcs8.pem', "utf8");
+                        let privateFileNoBoundaries = privateFile.substring('-----BEGIN PRIVATE KEY-----'.length, privateFile.indexOf('-----END PRIVATE KEY-----'));
+                        let key = new NodeRSA(privateFileNoBoundaries, "pkcs8-private-pem");
+                        assert.equal(key.exportKey(), fileKeyPKCS1);
+                    });
+
+                    it('should handle data without begin/end encapsulation boundaries for pkcs8 public keys', function () {
+                        let publicFile = fs.readFileSync(keysFolder + 'public_pkcs8.pem', "utf8");
+                        let publicFileNoBoundaries = publicFile.substring("-----BEGIN PUBLIC KEY-----".length, publicFile.indexOf("-----END PUBLIC KEY-----"));
+                        let publicNodeRSA = new NodeRSA(publicFileNoBoundaries, "pkcs8-public-pem");
+                        assert.instanceOf(publicNodeRSA.keyPair, Object);
+                        assert(publicNodeRSA.isPublic());
+                        assert(publicNodeRSA.isPublic(true));
+                        assert(!publicNodeRSA.isPrivate());
+                    });
+
                     it('.importKey() from private components', function () {
                         var key = new NodeRSA();
                         key.importKey({