@certd/acme-client 0.1.10 → 0.2.0

package/package.json

@@ -2,7 +2,7 @@
     "name": "@certd/acme-client",
     "description": "Simple and unopinionated ACME client,base version 4.1.2",
     "author": "greper",
-    "version": "0.1.10",
+    "version": "0.2.0",
     "main": "src/index.js",
     "types": "types",
     "license": "MIT",
@@ -41,7 +41,7 @@
         "build-docs": "jsdoc2md src/client.js > docs/client.md && jsdoc2md src/crypto/forge.js > docs/forge.md",
         "lint": "eslint .",
         "lint-types": "dtslint types",
-        "prepublishOnly": "npm run build-docs",
+        "1prepublishOnly": "npm run build-docs",
         "test": "mocha -b -t 60000 \"test/setup.js\" \"test/**/*.spec.js\"",
         "test-local": "/bin/bash scripts/run-tests.sh",
         "build": "webpack ./src/index.js ./dist/bundle.js"
@@ -60,5 +60,6 @@
     ],
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
-    }
+    },
+    "gitHead": "5fbd7742665c0a949333d805153e9b6af91c0a71"
 }

package/src/crypto/forge.js

@@ -71,8 +71,7 @@ function parseDomains(obj) {
 
     if (rootAltNames && rootAltNames.altNames && rootAltNames.altNames.length) {
         altNamesDict = rootAltNames.altNames;
-    }
-    else if (rootExtensions && rootExtensions.extensions && rootExtensions.extensions.length) {
+    } else if (rootExtensions && rootExtensions.extensions && rootExtensions.extensions.length) {
         const extAltNames = rootExtensions.extensions.find((e) => 'altNames' in e);
 
         if (extAltNames && extAltNames.altNames && extAltNames.altNames.length) {
@@ -113,11 +112,22 @@ function parseDomains(obj) {
  */
 
 async function createPrivateKey(size = 2048) {
-    const keyPair = await generateKeyPair({ bits: size });
-    const pemKey = forge.pki.privateKeyToPem(keyPair.privateKey);
+    const keyPair = await generateKeyPair({bits: size});
+    // const privateKey = forge.pki.privateKeyToPem(keyPair.privateKey);
+
+    // convert a Forge private key to an ASN.1 RSAPrivateKey
+    var rsaPrivateKey = forge.pki.privateKeyToAsn1(keyPair.privateKey);
+
+// wrap an RSAPrivateKey ASN.1 object in a PKCS#8 ASN.1 PrivateKeyInfo
+    var privateKeyInfo = forge.pki.wrapRsaPrivateKey(rsaPrivateKey);
+
+// convert a PKCS#8 ASN.1 PrivateKeyInfo to PEM
+    var pemKey = forge.pki.privateKeyInfoToPem(privateKeyInfo);
+    console.log('privatekey ', pemKey)
     return Buffer.from(pemKey);
 }
 
+
 exports.createPrivateKey = createPrivateKey;
 
 
@@ -133,7 +143,7 @@ exports.createPrivateKey = createPrivateKey;
  * ```
  */
 
-exports.createPublicKey = async function(key) {
+exports.createPublicKey = async function (key) {
     const privateKey = forge.pki.privateKeyFromPem(key);
     const publicKey = forge.pki.rsa.setPublicKey(privateKey.n, privateKey.e);
     const pemKey = forge.pki.publicKeyToPem(publicKey);
@@ -179,7 +189,7 @@ exports.splitPemChain = (str) => forge.pem.decode(str).map(forge.pem.encode);
  * ```
  */
 
-exports.getModulus = async function(input) {
+exports.getModulus = async function (input) {
     if (!Buffer.isBuffer(input)) {
         input = Buffer.from(input);
     }
@@ -203,7 +213,7 @@ exports.getModulus = async function(input) {
  * ```
  */
 
-exports.getPublicExponent = async function(input) {
+exports.getPublicExponent = async function (input) {
     if (!Buffer.isBuffer(input)) {
         input = Buffer.from(input);
     }
@@ -228,7 +238,7 @@ exports.getPublicExponent = async function(input) {
  * ```
  */
 
-exports.readCsrDomains = async function(csr) {
+exports.readCsrDomains = async function (csr) {
     if (!Buffer.isBuffer(csr)) {
         csr = Buffer.from(csr);
     }
@@ -257,7 +267,7 @@ exports.readCsrDomains = async function(csr) {
  * ```
  */
 
-exports.readCertificateInfo = async function(cert) {
+exports.readCertificateInfo = async function (cert) {
     if (!Buffer.isBuffer(cert)) {
         cert = Buffer.from(cert);
     }
@@ -309,7 +319,7 @@ function createCsrSubject(subjectObj) {
     return Object.entries(subjectObj).reduce((result, [shortName, value]) => {
         if (value) {
             const valueTagClass = getCsrValueTagClass(shortName);
-            result.push({ shortName, value, valueTagClass });
+            result.push({shortName, value, valueTagClass});
         }
 
         return result;
@@ -329,7 +339,7 @@ function createCsrSubject(subjectObj) {
 function formatCsrAltNames(altNames) {
     return altNames.map((value) => {
         const type = net.isIP(value) ? 7 : 2;
-        return { type, value };
+        return {type, value};
     });
 }
 
@@ -388,11 +398,10 @@ function formatCsrAltNames(altNames) {
  * }, certificateKey);
  */
 
-exports.createCsr = async function(data, key = null) {
+exports.createCsr = async function (data, key = null) {
     if (!key) {
         key = await createPrivateKey(data.keySize);
-    }
-    else if (!Buffer.isBuffer(key)) {
+    } else if (!Buffer.isBuffer(key)) {
         key = Buffer.from(key);
     }