app.js

@@ -122,7 +122,6 @@
       $('.js-loading').hidden = false;
       var acme = ACME.create({
         Keypairs: Keypairs
-      , CSR: CSR
       });
       acme.init('https://acme-staging-v02.api.letsencrypt.org/directory').then(function (result) {
         console.log('acme result', result);
@@ -150,7 +149,16 @@
     $('form.js-csr').addEventListener('submit', function (ev) {
       ev.preventDefault();
       ev.stopPropagation();
-      generateCsr();
+      var domains = ($('.js-domains').value||'example.com').split(/[, ]+/g);
+      var privJwk = JSON.parse($('.js-jwk').innerText).private;
+      return CSR({ jwk: privJwk, domains: domains }).then(function (pem) {
+        // Verify with https://www.sslshopper.com/csr-decoder.html
+        console.log('CSR:');
+        console.log(pem);
+
+        console.log('CSR info:');
+        console.log(CSR._info(pem));
+      });
     });
 
     $('form.js-acme-order').addEventListener('submit', function (ev) {
@@ -161,14 +169,17 @@
       var email = accountStuff.email;
       var acme = accountStuff.acme;
 
-
-      var domains = ($('.js-domains').value||'example.com').split(/[, ]+/g);
-      return getDomainPrivkey().then(function () {
+      return Keypairs.generate({
+        kty: $('input[name="kty"]:checked').value
+      , namedCurve: $('input[name="ec-crv"]:checked').value
+      , modulusLength: $('input[name="rsa-len"]:checked').value
+      }).then(function (pair) {
+        console.log('domain keypair:', pair);
+        var domains = ($('.js-domains').value||'example.com').split(/[, ]+/g);
         return acme.certificates.create({
           accountKeypair: { privateKeyJwk: privJwk }
         , account: account
-        //, domainKeypair: { privateKeyJwk: accountStuff.domainPrivateJwk }
-        , csr: accountStuff.csr
+        , domainKeypair: { privateKeyJwk: pair.private }
         , email: email
         , domains: domains
         , agreeToTerms: checkTos
@@ -215,8 +226,6 @@
             }
           }
         , challengeTypes: [$('input[name="acme-challenge-type"]:checked').value]
-        }).catch(function (err) {
-          window.alert("failed! " + err.message || JSON.stringify(err));
         });
       });
     });
@@ -224,37 +233,5 @@
     $('.js-generate').hidden = false;
   }
 
-  function getDomainPrivkey() {
-    if (accountStuff.domainPrivateJwk) { return Promise.resolve(accountStuff.domainPrivateJwk); }
-    return Keypairs.generate({
-      kty: $('input[name="kty"]:checked').value
-    , namedCurve: $('input[name="ec-crv"]:checked').value
-    , modulusLength: $('input[name="rsa-len"]:checked').value
-    }).then(function (pair) {
-      console.log('domain keypair:', pair);
-      accountStuff.domainPrivateJwk = pair.private;
-      return pair.private;
-    });
-  }
-
-  function generateCsr() {
-    var domains = ($('.js-domains').value||'example.com').split(/[, ]+/g);
-    //var privJwk = JSON.parse($('.js-jwk').innerText).private;
-    return getDomainPrivkey().then(function (privJwk) {
-      accountStuff.domainPrivateJwk = privJwk;
-      return CSR({ jwk: privJwk, domains: domains }).then(function (pem) {
-        // Verify with https://www.sslshopper.com/csr-decoder.html
-        accountStuff.csr = pem;
-        console.log('CSR:');
-        console.log(pem);
-
-        console.log('CSR info:');
-        console.log(CSR._info(pem));
-
-        return pem;
-      });
-    });
-  }
-
   window.addEventListener('load', run);
 }());

lib/acme.js

@@ -848,10 +848,10 @@ ACME.create = function create(me) {
   if (!me) { me = {}; }
   // me.debug = true;
   me.challengePrefixes = ACME.challengePrefixes;
-  me.Keypairs = me.Keypairs || exports.Keypairs || require('keypairs').Keypairs;
-  me.CSR = me.CSR || exports.cSR || require('CSR').CSR;
+  me.Keypairs = me.Keypairs || me.RSA || require('rsa-compat').RSA;
+  me.CSR = me.CSR || require('CSR').CSR;
   me._nonces = [];
-  me._canUse = {};
+  me._canCheck = {};
   if (!me._baseUrl) {
     me._baseUrl = "";
   }

lib/csr.js

@@ -238,7 +238,7 @@ CSR._info = function (der) {
         // TODO utf8
         return Enc.bufToBin(name.value);
       });
-    })[0];
+    });
   })[0];
 
   return {

lib/keypairs.js

@@ -186,6 +186,10 @@ Keypairs.signJws = function (opts) {
         , signature: Enc.bufToUrlBase64(buf)
         };
 
+        console.log('Signed Base64 Msg:');
+        console.log(JSON.stringify(signedMsg, null, 2));
+
+        console.log('msg:', msg);
         return signedMsg;
       });
     }
@@ -259,6 +263,7 @@ Keypairs._import = function (opts) {
     opts.jwk.ext = true;
     opts.jwk.key_ops = ops;
 
+    console.log('jwk', opts.jwk);
     return window.crypto.subtle.importKey(
       "jwk"
     , opts.jwk