From 8593ad461e0ade0481b88a22c0b695beba7ebef5 Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Fri, 5 Sep 2014 17:26:19 -0700
Subject: [PATCH] paypro: pem parsing - rename variables.
---
browser/root-certs | 8 ++++----
lib/common/RootCerts.js | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/browser/root-certs b/browser/root-certs
index f38a55d..ec7b733 100755
--- a/browser/root-certs
+++ b/browser/root-certs
@@ -62,9 +62,9 @@ function getRootCerts(callback) {
+ ' pem = pem.replace(/-----BEGIN CERTIFICATE-----/g, "");\n'
+ ' pem = pem.replace(/-----END CERTIFICATE-----/g, "");\n'
+ ' var parts = pem.trim().split(/(?:\\r?\\n){2,}/);\n'
- + ' var meta = {};\n'
+ + ' var headers = {};\n'
+ ' if (parts.length > 1) {\n'
- + ' meta = parts[0].trim().split(/[\\r\\n]/).reduce(function(out, line) {\n'
+ + ' headers = parts[0].trim().split(/[\\r\\n]/).reduce(function(out, line) {\n'
+ ' var parts = line.split(/:[ \\t]+/);\n'
+ ' var key = parts[0].trim().toLowerCase();\n'
+ ' var value = (parts.slice(1).join("") || "").trim();\n'
@@ -78,10 +78,10 @@ function getRootCerts(callback) {
+ ' ? new Buffer(pem, "base64")\n'
+ ' : null;\n'
+ ' return {\n'
- + ' meta: meta,\n'
+ + ' headers: headers,\n'
+ ' pem: pem,\n'
+ ' der: der,\n'
- + ' data: der || new Buffer([0])\n'
+ + ' body: der || new Buffer([0])\n'
+ ' };\n'
+ '}\n'
+ '\n'
diff --git a/lib/common/RootCerts.js b/lib/common/RootCerts.js
index 0297482..20c7a14 100644
--- a/lib/common/RootCerts.js
+++ b/lib/common/RootCerts.js
@@ -3731,9 +3731,9 @@ function parsePEM(pem) {
pem = pem.replace(/-----BEGIN CERTIFICATE-----/g, "");
pem = pem.replace(/-----END CERTIFICATE-----/g, "");
var parts = pem.trim().split(/(?:\r?\n){2,}/);
- var meta = {};
+ var headers = {};
if (parts.length > 1) {
- meta = parts[0].trim().split(/[\r\n]/).reduce(function(out, line) {
+ headers = parts[0].trim().split(/[\r\n]/).reduce(function(out, line) {
var parts = line.split(/:[ \t]+/);
var key = parts[0].trim().toLowerCase();
var value = (parts.slice(1).join("") || "").trim();
@@ -3747,10 +3747,10 @@ function parsePEM(pem) {
? new Buffer(pem, "base64")
: null;
return {
- meta: meta,
+ headers: headers,
pem: pem,
der: der,
- data: der || new Buffer([0])
+ body: der || new Buffer([0])
};
}