lib/generate-privkey.js

@@ -48,10 +48,11 @@ module.exports = function (bitlen, exp) {
       try {
         return require('./generate-privkey-forge.js')(bitlen, exp);
       } catch(e) {
+        if (e.code !== 'MODULE_NOT_FOUND') {
+          throw e;
+        }
         console.error("[ERROR] rsa-compat: could not generate a private key.");
         console.error("None of crypto.generateKeyPair, ursa, nor node-forge are present");
-        console.error("");
-        throw e;
       }
     }
   }

lib/rsa-csr/README.md

@@ -171,7 +171,7 @@ Rather than trying to make a generic implementation that works with everything u
 this library is intentionally focused on around the use case of generating certificates for
 ACME services (such as Let's Encrypt).
 
-That said, [please tell me](https://git.coolaj86.com/coolaj86/rsa-csr.js/issues/new) if it doesn't
+That said, [please tell me](https://git.coolaj86.com/coolaj86/rsa-csr.js/issues) if it doesn't
 do what you need, it may make sense to add it (or otherwise, perhaps to help you create a fork).
 
 The primary goal of this project is for this code to do exactly (and all of)

lib/rsa-csr/bin/rsa-csr.js

@@ -15,13 +15,9 @@ try {
   // ignore
 }
 
-var csr = rsacsr.sync({ key: key, domains: domains });
+rsacsr({ key: key, domains: domains }).then(function (csr) {
-console.log(csr);
-/*
-.then(function (csr) {
   // Using error so that we can redirect stdout to file
   //console.error("CN=" + domains[0]);
   //console.error("subjectAltName=" + domains.join(','));
   console.log(csr);
 });
-*/

lib/rsa-csr/lib/csr.js

@@ -136,14 +136,14 @@ CSR.toDer = function encode(opts) {
 RSA.signSync = function signRsaSync(keypem, ab) {
   // Signer is a stream
   var sign = crypto.createSign('SHA256');
-  sign.write(ab);
+  sign.write(new Uint8Array(ab));
   sign.end();
 
   // The signature is ASN1 encoded, as it turns out
   var sig = sign.sign(keypem);
 
   // Convert to a JavaScript ArrayBuffer just because
-  return sig.buffer.slice(sig.byteOffset, sig.byteOffset + sig.byteLength);
+  return new Uint8Array(sig.buffer.slice(sig.byteOffset, sig.byteOffset + sig.byteLength));
 };
 RSA.sign = function signRsa(keypem, ab) {
   return Promise.resolve().then(function () {

lib/rsa-csr/package.json

@@ -1,34 +1,64 @@
 {
+  "_from": "rsa-csr",
+  "_id": "rsa-csr@1.0.5",
+  "_inBundle": false,
+  "_integrity": "sha512-rmQY0RmcpLdsXEJgE1S2xBam09YVggDIqBGCJNFkhD6ONkmpSGjZ+28J6gWy+ygKHHgC7Z+OpzDLVQYowOte3A==",
+  "_location": "/rsa-csr",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "rsa-csr",
     "name": "rsa-csr",
-  "version": "1.0.7",
+    "escapedName": "rsa-csr",
-  "description": "💯 A focused, zero-dependency library to generate a Certificate Signing Request (CSR) and sign it!",
+    "rawSpec": "",
-  "homepage": "https://git.coolaj86.com/coolaj86/rsa-csr.js",
+    "saveSpec": null,
-  "main": "index.js",
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/rsa-csr/-/rsa-csr-1.0.5.tgz",
+  "_shasum": "ac427ae3aa16089f5f26fc93047a7d2d844b0bf4",
+  "_spec": "rsa-csr",
+  "_where": "/Volumes/Data/git.coolaj86.com/coolaj86/rsa-compat.js",
+  "author": {
+    "name": "AJ ONeal",
+    "email": "coolaj86@gmail.com",
+    "url": "https://coolaj86.com/"
+  },
   "bin": {
     "rsa-csr": "bin/rsa-csr.js"
   },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "💯 A focused, zero-dependency library to generate a Certificate Signing Request (CSR) and sign it!",
+  "directories": {
+    "lib": "lib"
+  },
   "files": [
     "bin",
     "fixtures",
     "lib"
   ],
-  "directories": {
+  "homepage": "https://git.coolaj86.com/coolaj86/rsa-csr.js",
-    "lib": "lib"
-  },
-  "scripts": {
-    "postinstall": "node lib/telemetry.js event:install",
-    "test": "bash test.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.coolaj86.com/coolaj86/rsa-csr.js"
-  },
   "keywords": [
     "zero-dependency",
     "CSR",
     "RSA",
     "x509"
   ],
-  "author": "AJ ONeal <coolaj86@gmail.com> (https://coolaj86.com/)",
+  "license": "MPL-2.0",
-  "license": "MPL-2.0"
+  "main": "index.js",
+  "name": "rsa-csr",
+  "repository": {
+    "type": "git",
+    "url": "https://git.coolaj86.com/coolaj86/rsa-csr.js"
+  },
+  "scripts": {
+    "postinstall": "node lib/telemetry.js event:install",
+    "test": "bash test.sh"
+  },
+  "version": "1.0.5"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsa-compat",
-  "version": "2.0.8",
+  "version": "2.0.5",
   "engines": {
     "node": ">=10.12"
   },