v1.0.7: bugfix for node v6

README.md

@@ -1,9 +1,8 @@
 [RSA-CSR.js](https://git.coolaj86.com/coolaj86/rsa-csr.js)
 ==========
 
-A [Root](https://therootcompany.com) Project.
+Sponsored by [Root](https://therootcompany.com),
-
+built for [ACME.js](https://git.coolaj86.com/coolaj86/acme.js)
-Built for [ACME.js](https://git.coolaj86.com/coolaj86/acme.js)
 and [Greenlock.js](https://git.coolaj86.com/coolaj86/greenlock-express.js)
 
 A focused, **zero-dependency** library that can do exactly one thing really, really well:
@@ -11,6 +10,10 @@ A focused, **zero-dependency** library that can do exactly one thing really, rea
 
 | < 300 lines of code | 1.7k gzipped | 4.7k minified | 8.5k with comments |
 
+Need JWK-to-PEM? Try [Rasha.js](https://git.coolaj86.com/coolaj86/rasha.js)
+
+Need to generate an EC CSR? Try [ECSDA-CSR.js](https://git.coolaj86.com/coolaj86/ecdsa-csr.js)
+
 Features
 ========
 
@@ -29,10 +32,6 @@ Features
 * [x] Vanilla Node.js
   * no school like the old school
   * easy to read and understand
-* [ ] JWK-to-PEM
-    * See [Rasha.js](https://git.coolaj86.com/coolaj86/rasha.js)
-* [ ] EC CSR
-    * See [ECSDA-CSR.js](https://git.coolaj86.com/coolaj86/ecdsa-csr.js)
 
 Usage
 -----
@@ -57,7 +56,7 @@ var key = {
 };
 var domains = [ 'example.com', 'www.example.com' ];
 
-return rsacsr({ jwk: key, domains: domains }).then(function (csr) {
+return rsacsr({ key: key, domains: domains }).then(function (csr) {
   console.log('CSR PEM:');
   console.log(csr);
 });

bin/rsa-csr.js

@@ -15,9 +15,13 @@ try {
   // ignore
 }
 
-rsacsr({ jwk: key, domains: domains }).then(function (csr) {
+var csr = rsacsr.sync({ key: key, domains: domains });
+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/csr.js

@@ -11,7 +11,14 @@ var RSA = {};
 var CSR = module.exports = function rsacsr(opts) {
   // We're using a Promise here to be compatible with the browser version
   // which will probably use the webcrypto API for some of the conversions
-  return Promise.resolve().then(function () {
+  opts = CSR._prepare(opts);
+
+  return CSR.create(opts).then(function (bytes) {
+    return CSR._encode(opts, bytes);
+  });
+};
+
+CSR._prepare = function (opts) {
   var Rasha;
   opts = JSON.parse(JSON.stringify(opts));
   var pem, jwk;
@@ -60,15 +67,28 @@ var CSR = module.exports = function rsacsr(opts) {
   }
 
   opts.jwk = jwk;
-    return CSR.create(opts).then(function (bytes) {
+  return opts;
+};
+CSR.sync = function (opts) {
+  opts = CSR._prepare(opts);
+  var bytes = CSR.createSync(opts);
+  return CSR._encode(opts, bytes);
+};
+CSR._encode = function (opts, bytes) {
+  if ('der' === (opts.encoding||'').toLowerCase()) {
+    return bytes;
+  }
   return PEM.packBlock({
     type: "CERTIFICATE REQUEST"
   , bytes: bytes /* { jwk: jwk, domains: opts.domains } */
   });
-    });
-  });
 };
 
+CSR.createSync = function createCsr(opts) {
+  var hex = CSR.request(opts.jwk, opts.domains);
+  var csr = CSR.signSync(opts.jwk, hex);
+  return Enc.hexToBuf(csr);
+};
 CSR.create = function createCsr(opts) {
   var hex = CSR.request(opts.jwk, opts.domains);
   return CSR.sign(opts.jwk, hex).then(function (csr) {
@@ -81,10 +101,18 @@ CSR.request = function createCsrBodyEc(jwk, domains) {
   return X509.packCsr(asn1pub, domains);
 };
 
+CSR.signSync = function csrEcSig(jwk, request) {
+  var keypem = PEM.packBlock({ type: "RSA PRIVATE KEY", bytes: X509.packPkcs1(jwk) });
+  var sig = RSA.signSync(keypem, Enc.hexToBuf(request));
+  return CSR.toDer({ request: request, signature: sig });
+};
 CSR.sign = function csrEcSig(jwk, request) {
   var keypem = PEM.packBlock({ type: "RSA PRIVATE KEY", bytes: X509.packPkcs1(jwk) });
-
   return RSA.sign(keypem, Enc.hexToBuf(request)).then(function (sig) {
+    return CSR.toDer({ request: request, signature: sig });
+  });
+};
+CSR.toDer = function encode(opts) {
   var sty = ASN1('30'
     // 1.2.840.113549.1.1.11 sha256WithRSAEncryption (PKCS #1)
   , ASN1('06', '2a864886f70d01010b')
@@ -92,13 +120,12 @@ CSR.sign = function csrEcSig(jwk, request) {
   );
   return ASN1('30'
     // The Full CSR Request Body
-    , request
+  , opts.request
     // The Signature Type
   , sty
     // The Signature
-    , ASN1.BitStr(Enc.bufToHex(sig))
+  , ASN1.BitStr(Enc.bufToHex(opts.signature))
   );
-  });
 };
 
 //
@@ -106,8 +133,7 @@ CSR.sign = function csrEcSig(jwk, request) {
 //
 
 // Took some tips from https://gist.github.com/codermapuche/da4f96cdb6d5ff53b7ebc156ec46a10a
-RSA.sign = function signRsa(keypem, ab) {
+RSA.signSync = function signRsaSync(keypem, ab) {
-  return Promise.resolve().then(function () {
   // Signer is a stream
   var sign = crypto.createSign('SHA256');
   sign.write(ab);
@@ -118,5 +144,9 @@ RSA.sign = function signRsa(keypem, ab) {
 
   // Convert to a JavaScript ArrayBuffer just because
   return sig.buffer.slice(sig.byteOffset, sig.byteOffset + sig.byteLength);
+};
+RSA.sign = function signRsa(keypem, ab) {
+  return Promise.resolve().then(function () {
+    return RSA.signSync(keypem, ab);
   });
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsa-csr",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "💯 A focused, zero-dependency library to generate a Certificate Signing Request (CSR) and sign it!",
   "homepage": "https://git.coolaj86.com/coolaj86/rsa-csr.js",
   "main": "index.js",