From fb2338e760b8b30c57739b2e16eba745da8da9f2 Mon Sep 17 00:00:00 2001
From: Alexander Cerutti <cerutti.alexander@gmail.com>
Date: Tue, 30 Apr 2019 22:11:08 +0200
Subject: [PATCH] Reverted parsePEM from utils to pass.js

---
 src/pass.js  | 21 ++++++++++++++++++++-
 src/utils.js | 20 +-------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/pass.js b/src/pass.js
index 4b5f2a9..82c3d6a 100644
--- a/src/pass.js
+++ b/src/pass.js
@@ -17,7 +17,7 @@ const FieldsArray = require("./fieldsArray");
 const {
 	assignLength, generateStringFile,
 	removeHidden, dateToW3CString,
-	isValidRGB, parsePEM
+	isValidRGB
 } = require("./utils");
 
 const readdir = promisify(fs.readdir);
@@ -218,6 +218,8 @@ class Pass {
 				// No model available at this path - renaming the error
 				throw new Error(formatMessage("MODEL_NOT_FOUND", this.model));
 			}
+
+			throw new Error(err);
 		}
 	}
 
@@ -769,6 +771,23 @@ function readCertificates(certificates) {
 		});
 }
 
+/**
+ * Parses the PEM-formatted passed text (certificates)
+ *
+ * @function parsePEM
+ * @params {String} element - Text content of .pem files
+ * @params {String=} passphrase - passphrase for the key
+ * @returns {Object} The parsed certificate or key in node forge format
+ */
+
+function parsePEM(pemName, element, passphrase) {
+	if (pemName === "signerKey" && passphrase) {
+		return forge.pki.decryptRsaPrivateKey(element, String(passphrase));
+	} else {
+		return forge.pki.certificateFromPem(element);
+	}
+}
+
 /**
  * Automatically generates barcodes for all the types given common info
  *
diff --git a/src/utils.js b/src/utils.js
index 2e99cc5..56a1aeb 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,23 +1,6 @@
 const moment = require("moment");
 const { EOL } = require("os");
 
-/**
- * Parses the PEM-formatted passed text (certificates)
- *
- * @function parsePEM
- * @params {String} element - Text content of .pem files
- * @params {String=} passphrase - passphrase for the key
- * @returns {Object} The parsed certificate or key in node forge format
- */
-
-function parsePEM(pemName, element, passphrase) {
-	if (pemName === "signerKey" && passphrase) {
-		return forge.pki.decryptRsaPrivateKey(element, String(passphrase));
-	} else {
-		return forge.pki.certificateFromPem(element);
-	}
-}
-
 /**
  * Checks if an rgb value is compliant with CSS-like syntax
  *
@@ -114,6 +97,5 @@ module.exports = {
 	generateStringFile,
 	removeHidden,
 	dateToW3CString,
-	isValidRGB,
-	parsePEM
+	isValidRGB
 };