marcogll/passkit-generator
1
0
Fork 0
mirror of https://github.com/marcogll/passkit-generator.git synced 2026-03-15 21:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed way parsePEM checks with operation execute

Browse Source
This commit is contained in:
Alexander Cerutti
2018-11-07 12:53:07 +01:00
parent dd43daacfe
commit f6cd7cbc56
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pass.js
View File

@@ -643,7 +643,7 @@ class Pass {
.then(contents => { .then(contents => {
contents.forEach((file, index) => { contents.forEach((file, index) => {
let certName = optCertsNames[index]; let certName = optCertsNames[index];
let pem = parsePEM(file, this.Certificates._raw[certName].passphrase); let pem = parsePEM(certName, file, this.Certificates._raw[certName].passphrase);
if (!pem) { if (!pem) {
throw new Error(formatError("INVALID_CERTS", optCertsNames[index])); throw new Error(formatError("INVALID_CERTS", optCertsNames[index]));
@@ -682,13 +682,11 @@ class Pass {
* @returns {Object} The parsed certificate or key in node forge format * @returns {Object} The parsed certificate or key in node forge format
*/ */
function parsePEM(element, passphrase) { function parsePEM(pemName, element, passphrase) {
if (element.includes("PRIVATE KEY") && passphrase) { if (pemName === "signerKey" && passphrase) {
return forge.pki.decryptRsaPrivateKey(element, String(passphrase)); return forge.pki.decryptRsaPrivateKey(element, String(passphrase));
} else if (element.includes("CERTIFICATE")) {
return forge.pki.certificateFromPem(element);
} else { } else {
return null; return forge.pki.certificateFromPem(element);
} }
} }