WIP: rsa-compat-style node v10 and v6 support

v1.4.0: add jwk thumbprinting
A Root Project
2019-05-14 04:18:52 -06:00 · 2019-02-06 23:56:13 -07:00 · 2019-02-06 23:49:01 -07:00 · 2018-12-01 17:01:24 -07:00 · 2018-12-01 16:30:05 -07:00 · 2018-12-01 15:39:01 -07:00
15 changed files with 898 additions and 518 deletions
--- a/README.md
+++ b/README.md
@ -1,30 +1,82 @@
-eckles.js
+[Eckles.js](https://git.coolaj86.com/coolaj86/eckles.js)
 =========

-Sponsored by [Root](https://therootcompany.com).
+A [Root](https://therootcompany.com) Project.
 Built for [ACME.js](https://git.coolaj86.com/coolaj86/acme.js)
 and [Greenlock.js](https://git.coolaj86.com/coolaj86/greenlock.js)

+| < 600 lines of code | 3kb gzipped | 10kb minified | 17kb with comments |
+
 ECDSA (elliptic curve) tools. Lightweight. Zero Dependencies. Universal compatibility.

+* [x] Fast and Easy EC Key Generation
 * [x] PEM-to-JWK
 * [x] JWK-to-PEM
+* [x] JWK thumbprint
+* [x] SSH "pub" format
+* [x] CLI
+  * See [Eckles CLI](https://git.coolaj86.com/coolaj86/eckles-cli.js)
+* [ ] RSA
+  * **Need RSA tools?** Check out [Rasha.js](https://git.coolaj86.com/coolaj86/rasha.js)

-This project is fully functional and tested (and the code is pretty clean).
+## Install

-It is considered to be complete, but if you find a bug please open an issue.
+For node.js:
+
+```bash
+npm install --save eckles
+```
+
+CLI:
+
+```bash
+npm install -g eckles
+```
+
+See [Eckles CLI](https://git.coolaj86.com/coolaj86/eckles-cli.js)
+
+## Generate EC (ECDSA/ECDH) Key
+
+Achieves the *fastest possible key generation* using node's native EC bindings to OpenSSL,
+then converts to JWK for ease-of-use.
+
+```js
+Eckles.generate({ format: 'jwk' }).then(function (keypair) {
+  console.log(keypair.private);
+  console.log(keypair.public);
+});
+```
+
+**options**
+
+* `format` defaults to `'jwk'`
+  * `'sec1'` (traditional)
+  * `'pkcs8'`
+  * `'ssh'`
+* `encoding` defaults to `'json'`
+  * `'pem'` (type + DER.toString('base64'))
+  * `'der'`
+
+**advanced options**
+
+* `namedCurve` defaults to `'P-256'`
+  * `P-384` is also supported
+  * larger keys have not been implemented
+    * A) because they're a senseless waste
+    * B) they have similar, but slightly different formats

 ## PEM-to-JWK

 * [x] SEC1/X9.62, PKCS#8, SPKI/PKIX
 * [x] P-256 (prime256v1, secp256r1), P-384 (secp384r1)
+* [x] SSH (RFC4716), (RFC 4716/SSH2)

 ```js
-var eckles = require('eckles');
+var Eckles = require('eckles');
 var pem = require('fs')
  .readFileSync('./node_modles/eckles/fixtures/privkey-ec-p256.sec1.pem', 'ascii');

-eckles.import({ pem: pem }).then(function (jwk) {
+Eckles.import({ pem: pem }).then(function (jwk) {
  console.log(jwk);
 });
 ```
@ -46,10 +98,10 @@ eckles.import({ pem: pem }).then(function (jwk) {
 * [x] SSH (RFC4716), (RFC 4716/SSH2)

 ```js
-var eckles = require('eckles');
+var Eckles = require('eckles');
 var jwk = require('eckles/fixtures/privkey-ec-p256.jwk.json');

-eckles.export({ jwk: jwk }).then(function (pem) {
+Eckles.export({ jwk: jwk }).then(function (pem) {
  // PEM in SEC1 (x9.62) format
  console.log(pem);
 });
@ -71,18 +123,18 @@ The default output format is `sec1`/`x9.62` (EC-specific format) is used for pri
 Use `format: 'pkcs8'` to output in PKCS#8 format instead.

 ```js
-eckles.export({ jwk: jwk, format: 'pkcs8' }).then(function (pem) {
+Eckles.export({ jwk: jwk, format: 'pkcs8' }).then(function (pem) {
  // PEM in PKCS#8 format
  console.log(pem);
 });
 ```

 ```
-----BEGIN EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
 MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiYydo27aNGO9DBUW
 eGEPD8oNi1LZDqfxPmQlieLBjVShRANCAAQhPVJYvGxpw+ITlnXqOSikCfz/7zms
 yODIKiSueMN+3pj9icDgDnTJl7sKcWyp4Nymc9u5s/pyliJVyd680hjK
-----END EC PRIVATE KEY-----
+-----END PRIVATE KEY-----
 ```

 `format: 'ssh'`:
@ -95,7 +147,7 @@ To get the same format as you
 would get with `ssh-keygen`, pass `ssh` as the format option:

 ```js
-eckles.export({ jwk: jwk, format: 'ssh' }).then(function (pub) {
+Eckles.export({ jwk: jwk, format: 'ssh' }).then(function (pub) {
  // Special SSH2 Public Key format (RFC 4716)
  console.log(pub);
 });
@ -112,7 +164,7 @@ If a private key is used as input, a private key will be output.
 If you'd like to output a public key instead you can pass `public: true` or `format: 'spki'`.

 ```js
-eckles.export({ jwk: jwk, public: true }).then(function (pem) {
+Eckles.export({ jwk: jwk, public: true }).then(function (pem) {
  // PEM in SPKI/PKIX format
  console.log(pem);
 });
@ -125,6 +177,35 @@ rMjgyCokrnjDft6Y/YnA4A50yZe7CnFsqeDcpnPbubP6cpYiVcnevNIYyg==
 -----END PUBLIC KEY-----
 ```

+## JWK Thumbprint
+
+```js
+Eckles.thumbprint({ jwk: jwk }).then(function (thumbprint) {
+  console.log(thumbprint);
+});
+```
+
+Testing
+-------
+
+All cases are tested in `test.sh`.
+
+You can compare these keys to the ones that you get from OpenSSL, ssh-keygen, and WebCrypto:
+
+```bash
+# Generate EC P-256 Keypair
+openssl ecparam -genkey -name prime256v1 -noout -out ./privkey-ec-p256.sec1.pem
+
+# Export Public-only EC Key (as SPKI)
+openssl ec -in ./privkey-ec-p256.sec1.pem -pubout -out ./pub-ec-p256.spki.pem
+
+# Convert SEC1 (traditional) EC Keypair to PKCS8 format
+openssl pkcs8 -topk8 -nocrypt -in ./privkey-ec-p256.sec1.pem -out ./privkey-ec-p256.pkcs8.pem
+
+# Convert EC public key to SSH format
+ssh-keygen -f ./pub-ec-p256.spki.pem -i -mPKCS8 > ./pub-ec-p256.ssh.pub
+```
+
 Goals of this project
 -----

@ -132,11 +213,12 @@ Goals of this project
 * Focused support for P-256 and P-384, which are already universally supported.
 * Convert both ways
 * Browser support as well (TODO)
+* OpenSSL, ssh-keygen, and WebCrypto compatibility

 Legal
 -----

-Licensed MPL-2.0
-
+[Eckles.js](https://git.coolaj86.com/coolaj86/eckles.js) |
+MPL-2.0 |
 [Terms of Use](https://therootcompany.com/legal/#terms) |
 [Privacy Policy](https://therootcompany.com/legal/#privacy)
--- a/bin/eckles.js
+++ b/bin/eckles.js
@ -2,11 +2,35 @@
 'use strict';

 var fs = require('fs');
-var eckles = require('../index.js');
+var Eckles = require('../index.js');

 var infile = process.argv[2];
 var format = process.argv[3];

+if (!infile) {
+  infile = 'jwk';
+}
+
+if (-1 !== [ 'jwk', 'pem', 'json', 'der', 'sec1', 'pkcs8', 'spki', 'ssh' ].indexOf(infile)) {
+  console.log("Generating new key...");
+  Eckles.generate({
+    format: infile
+  , namedCurve: format === 'P-384' ? 'P-384' : 'P-256'
+  , encoding: format === 'der' ? 'der' : 'pem'
+  }).then(function (key) {
+    if ('der' === infile || 'der' === format) {
+      key.private = key.private.toString('binary');
+      key.public = key.public.toString('binary');
+    }
+    console.log(key.private);
+    console.log(key.public);
+  }).catch(function (err) {
+    console.error(err);
+    process.exit(1);
+  });
+  return;
+}
+
 var key = fs.readFileSync(infile, 'ascii');

 try {
@ -15,16 +39,29 @@ try {
  // ignore
 }

+var thumbprint = ('thumbprint' === format);
+if (thumbprint) {
+  format = 'public';
+}
+
 if ('string' === typeof key) {
+  if (thumbprint) {
+    Eckles.thumbprint({ pem: key }).then(console.log);
+    return;
+  }
  var pub = (-1 !== [ 'public', 'spki', 'pkix' ].indexOf(format));
-  eckles.import({ pem: key, public: (pub || format) }).then(function (jwk) {
+  Eckles.import({ pem: key, public: (pub || format) }).then(function (jwk) {
    console.log(JSON.stringify(jwk, null, 2));
  }).catch(function (err) {
    console.error(err);
    process.exit(1);
  });
 } else {
-  eckles.export({ jwk: key, format: format }).then(function (pem) {
+  if (thumbprint) {
+    Eckles.thumbprint({ jwk: key }).then(console.log);
+    return;
+  }
+  Eckles.export({ jwk: key, format: format }).then(function (pem) {
    console.log(pem);
  }).catch(function (err) {
    console.error(err);
--- a/fixtures/privkey-ec-p256.pkcs8.pem
+++ b/fixtures/privkey-ec-p256.pkcs8.pem
@ -1,5 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
 MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiYydo27aNGO9DBUW
 eGEPD8oNi1LZDqfxPmQlieLBjVShRANCAAQhPVJYvGxpw+ITlnXqOSikCfz/7zms
 yODIKiSueMN+3pj9icDgDnTJl7sKcWyp4Nymc9u5s/pyliJVyd680hjK
-----END EC PRIVATE KEY-----
+-----END PRIVATE KEY-----
--- a/fixtures/privkey-ec-p384.pkcs8.pem
+++ b/fixtures/privkey-ec-p384.pkcs8.pem
@ -1,6 +1,6 @@
-----BEGIN EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
 MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBeXK4IRZJNNLxTv078
 zPTnPXy+HiRvXSzO+7/ul1e4ZZXqV8TI8THJRhawDoDaR1WhZANiAATbMRTRsoJr
 t6Mosgnyg8acuGqHHKK/j/DfwrZrRI8Lp2xJ33+CU0nyVyq/Sx9/kZtUPiOe7zdL
 qxyfr9N4CPcRk5EQZs6zp3OhWlq6Cf5dAwzIL07hUtsMMUYFlMmUyxs=
-----END EC PRIVATE KEY-----
+-----END PRIVATE KEY-----
--- a/lib/asn1.js
+++ b/lib/asn1.js
@ -0,0 +1,61 @@
+'use strict';
+
+var Enc = require('./encoding.js');
+
+//
+// A dumbed-down, minimal ASN.1 packer
+//
+
+// Almost every ASN.1 type that's important for CSR
+// can be represented generically with only a few rules.
+var ASN1 = module.exports = function ASN1(/*type, hexstrings...*/) {
+  var args = Array.prototype.slice.call(arguments);
+  var typ = args.shift();
+  var str = args.join('').replace(/\s+/g, '').toLowerCase();
+  var len = (str.length/2);
+  var lenlen = 0;
+  var hex = typ;
+
+  // We can't have an odd number of hex chars
+  if (len !== Math.round(len)) {
+    throw new Error("invalid hex");
+  }
+
+  // The first byte of any ASN.1 sequence is the type (Sequence, Integer, etc)
+  // The second byte is either the size of the value, or the size of its size
+
+  // 1. If the second byte is < 0x80 (128) it is considered the size
+  // 2. If it is > 0x80 then it describes the number of bytes of the size
+  //    ex: 0x82 means the next 2 bytes describe the size of the value
+  // 3. The special case of exactly 0x80 is "indefinite" length (to end-of-file)
+
+  if (len > 127) {
+    lenlen += 1;
+    while (len > 255) {
+      lenlen += 1;
+      len = len >> 8;
+    }
+  }
+
+  if (lenlen) { hex += Enc.numToHex(0x80 + lenlen); }
+  return hex + Enc.numToHex(str.length/2) + str;
+};
+
+// The Integer type has some special rules
+ASN1.UInt = function UINT() {
+  var str = Array.prototype.slice.call(arguments).join('');
+  var first = parseInt(str.slice(0, 2), 16);
+
+  // If the first byte is 0x80 or greater, the number is considered negative
+  // Therefore we add a '00' prefix if the 0x80 bit is set
+  if (0x80 & first) { str = '00' + str; }
+
+  return ASN1('02', str);
+};
+
+// The Bit String type also has a special rule
+ASN1.BitStr = function BITSTR() {
+  var str = Array.prototype.slice.call(arguments).join('');
+  // '00' is a mask of how many bits of the next byte to ignore
+  return ASN1('03', '00' + str);
+};
--- a/lib/eckles.js
+++ b/lib/eckles.js
@ -1,9 +1,11 @@
 'use strict';

-var ASN1;
 var EC = module.exports;
-var Hex = {};
-var PEM = {};
+
+var Enc = require('./encoding.js');
+var PEM = require('./pem.js');
+var SSH = require('./ssh.js');
+var x509 = require('./x509.js');

 // 1.2.840.10045.3.1.7
 // prime256v1 (ANSI X9.62 named elliptic curve)
@ -12,465 +14,237 @@ var OBJ_ID_EC  = '06 08 2A8648CE3D030107'.replace(/\s+/g, '').toLowerCase();
 // secp384r1 (SECG (Certicom) named elliptic curve)
 var OBJ_ID_EC_384 = '06 05 2B81040022'.replace(/\s+/g, '').toLowerCase();

-// 1.2.840.10045.2.1
-// ecPublicKey (ANSI X9.62 public key type)
-var OBJ_ID_EC_PUB = '06 07 2A8648CE3D0201'.replace(/\s+/g, '').toLowerCase();
-
-
 // The one good thing that came from the b***kchain hysteria: good EC documentation
 // https://davidederosa.com/basic-blockchain-programming/elliptic-curve-keys/

-PEM._toUrlSafeBase64 = function (u8) {
-  //console.log('Len:', u8.byteLength);
-  return Buffer.from(u8).toString('base64')
-    .replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
-};
-
-PEM.parseBlock = function pemToDer(pem) {
-  var typ;
-  var pub;
-  var crv;
-  var der = Buffer.from(pem.split(/\n/).filter(function (line, i) {
-    if (0 === i) {
-      if (/ PUBLIC /.test(line)) {
-        pub = true;
-      } else if (/ PRIVATE /.test(line)) {
-        pub = false;
-      }
-      if (/ EC/.test(line)) {
-        typ = 'EC';
-      }
-    }
-    return !/---/.test(line);
-  }).join(''), 'base64');
-
-  if (!typ || 'EC' === typ) {
-    var hex = toHex(der);
-    if (-1 !== hex.indexOf(OBJ_ID_EC)) {
-      typ = 'EC';
-      crv = 'P-256';
-    } else if (-1 !== hex.indexOf(OBJ_ID_EC_384)) {
-      typ = 'EC';
-      crv = 'P-384';
-    } else {
-      // TODO support P-384 as well (but probably nothing else)
-      console.warn("unsupported ec curve");
-    }
-  }
-
-  return { kty: typ, pub: pub, der: der, crv: crv };
-};
-
-PEM.packBlock = function (opts) {
-  // TODO allow for headers?
-  return '-----BEGIN ' + opts.type + '-----\n'
-    + toBase64(opts.bytes).match(/.{1,64}/g).join('\n') + '\n'
-    + '-----END ' + opts.type + '-----'
-  ;
-};
-
-function toHex(ab) {
-  var hex = [];
-  var u8 = new Uint8Array(ab);
-  var size = u8.byteLength;
-  var i;
-  var h;
-  for (i = 0; i < size; i += 1) {
-    h = u8[i].toString(16);
-    if (2 === h.length) {
-      hex.push(h);
-    } else {
-      hex.push('0' + h);
-    }
-  }
-  return hex.join('').replace(/\s+/g, '').toLowerCase();
-}
-Hex.fromAB = toHex;
-
-Hex.fromInt = function numToHex(d) {
-  d = d.toString(16);
-  if (d.length % 2) {
-    return '0' + d;
-  }
-  return d;
-};
-Hex.toUint8 = function (hex) {
-  var buf = Buffer.from(hex, 'hex');
-  var ab = buf.buffer;
-  return new Uint8Array(ab.slice(buf.offset, buf.offset + buf.byteLength));
-};
-
-function toBase64(u8) {
-  return Buffer.from(u8).toString('base64');
-}
-
-function urlBase64ToBase64(ub64) {
-  var r = ub64 % 4;
-  if (2 === r) {
-    ub64 += '==';
-  } else if (3 === r) {
-    ub64 += '=';
-  }
-  return ub64.replace(/-/g, '+').replace(/_/g, '/');
-}
-function base64ToUint8(b64) {
-  var buf = Buffer.from(b64, 'base64');
-  return new Uint8Array(buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength));
-}
-
-EC.parseSec1 = function parseEcOnlyPrivkey(u8, jwk) {
-  var index = 7;
-  var len = 32;
-  var olen = OBJ_ID_EC.length/2;
-
-  if ("P-384" === jwk.crv) {
-    olen = OBJ_ID_EC_384.length/2;
-    index = 8;
-    len = 48;
-  }
-  if (len !== u8[index - 1]) {
-    throw new Error("Unexpected bitlength " + len);
-  }
-
-  // private part is d
-  var d = u8.slice(index, index + len);
-  // compression bit index
-  var ci = index + len + 2 + olen + 2 + 3;
-  var c = u8[ci];
-  var x, y;
-
-  if (0x04 === c) {
-    y = u8.slice(ci + 1 + len, ci + 1 + len + len);
-  } else if (0x02 !== c) {
-    throw new Error("not a supported EC private key");
-  }
-  x = u8.slice(ci + 1, ci + 1 + len);
-
-  return {
-    kty: jwk.kty
-  , crv: jwk.crv
-  , d: PEM._toUrlSafeBase64(d)
-  //, dh: toHex(d)
-  , x: PEM._toUrlSafeBase64(x)
-  //, xh: toHex(x)
-  , y: PEM._toUrlSafeBase64(y)
-  //, yh: toHex(y)
-  };
-};
-
-EC.parsePkcs8 = function parseEcPkcs8(u8, jwk) {
-  var index = 24 + (OBJ_ID_EC.length/2);
-  var len = 32;
-  if ("P-384" === jwk.crv) {
-    index = 24 + (OBJ_ID_EC_384.length/2) + 2;
-    len = 48;
-  }
-
-  //console.log(index, u8.slice(index));
-  if (0x04 !== u8[index]) {
-    //console.log(jwk);
-    throw new Error("privkey not found");
-  }
-  var d = u8.slice(index+2, index+2+len);
-  var ci = index+2+len+5;
-  var xi = ci+1;
-  var x = u8.slice(xi, xi + len);
-  var yi = xi+len;
-  var y;
-  if (0x04 === u8[ci]) {
-    y = u8.slice(yi, yi + len);
-  } else if (0x02 !== u8[ci]) {
-    throw new Error("invalid compression bit (expected 0x04 or 0x02)");
-  }
-
-  return {
-    kty: jwk.kty
-  , crv: jwk.crv
-  , d: PEM._toUrlSafeBase64(d)
-  //, dh: toHex(d)
-  , x: PEM._toUrlSafeBase64(x)
-  //, xh: toHex(x)
-  , y: PEM._toUrlSafeBase64(y)
-  //, yh: toHex(y)
-  };
-};
-
-EC.parseSpki = function parsePem(u8, jwk) {
-  var ci = 16 + OBJ_ID_EC.length/2;
-  var len = 32;
-
-  if ("P-384" === jwk.crv) {
-    ci = 16 + OBJ_ID_EC_384.length/2;
-    len = 48;
-  }
-
-  var c = u8[ci];
-  var xi = ci + 1;
-  var x = u8.slice(xi, xi + len);
-  var yi = xi + len;
-  var y;
-  if (0x04 === c) {
-    y = u8.slice(yi, yi + len);
-  } else if (0x02 !== c) {
-    throw new Error("not a supported EC private key");
-  }
-
-  return {
-    kty: jwk.kty
-  , crv: jwk.crv
-  , x: PEM._toUrlSafeBase64(x)
-  //, xh: toHex(x)
-  , y: PEM._toUrlSafeBase64(y)
-  //, yh: toHex(y)
-  };
-};
-EC.parsePkix = EC.parseSpki;
-
 /*global Promise*/
+EC.generate = function (opts) {
+  return Promise.resolve().then(function () {
+    var typ = 'ec';
+    var format = opts.format;
+    var encoding = opts.encoding;
+    var priv;
+    var pub = 'spki';
+
+    if (!format) {
+      format = 'jwk';
+    }
+    if (-1 !== [ 'spki', 'pkcs8', 'ssh' ].indexOf(format)) {
+      format = 'pkcs8';
+    }
+
+    if ('pem' === format) {
+      format = 'sec1';
+      encoding = 'pem';
+    } else if ('der' === format) {
+      format = 'sec1';
+      encoding = 'der';
+    }
+
+    if ('jwk' === format || 'json' === format) {
+      format = 'jwk';
+      encoding = 'json';
+    } else {
+      priv = format;
+    }
+
+    if (!encoding) {
+      encoding = 'pem';
+    }
+
+    if (priv) {
+      priv = { type: priv, format: encoding };
+      pub = { type: pub, format: encoding };
+    } else {
+      // jwk
+      priv = { type: 'sec1', format: 'pem' };
+      pub = { type: 'spki', format: 'pem' };
+    }
+
+    return new Promise(function (resolve, reject) {
+      return require('crypto').generateKeyPair(typ, {
+        namedCurve: opts.crv || opts.namedCurve || 'P-256'
+      , privateKeyEncoding: priv
+      , publicKeyEncoding: pub
+      }, function (err, pubkey, privkey) {
+        if (err) { reject(err); }
+        resolve({
+          private: privkey
+        , public: pubkey
+        });
+      });
+    }).then(function (keypair) {
+      if ('jwk' === format) {
+        return {
+          private: EC.importSync({ pem: keypair.private, format: priv.type })
+        , public: EC.importSync({ pem: keypair.public, format: pub.type, public: true })
+        };
+      }
+
+      if ('ssh' !== opts.format) {
+        return keypair;
+      }
+
+      return {
+        private: keypair.private
+      , public: EC.exportSync({ jwk: EC.importSync({
+          pem: keypair.public, format: format, public: true
+        }), format: opts.format, public: true })
+      };
+    });
+  });
+};
+
+EC.importSync = function importEcSync(opts) {
+  if (!opts || !opts.pem || 'string' !== typeof opts.pem) {
+    throw new Error("must pass { pem: pem } as a string");
+  }
+  if (0 === opts.pem.indexOf('ecdsa-sha2-')) {
+    return SSH.parseSsh(opts.pem);
+  }
+  var pem = opts.pem;
+  var u8 = PEM.parseBlock(pem).bytes;
+  var hex = Enc.bufToHex(u8);
+  var jwk = { kty: 'EC', crv: null, x: null, y: null };
+
+  //console.log();
+  if (-1 !== hex.indexOf(OBJ_ID_EC)) {
+    jwk.crv = "P-256";
+
+    // PKCS8
+    if (0x02 === u8[3] && 0x30 === u8[6] && 0x06 === u8[8]) {
+      //console.log("PKCS8", u8[3].toString(16), u8[6].toString(16), u8[8].toString(16));
+      jwk = x509.parsePkcs8(u8, jwk);
+    // EC-only
+    } else if (0x02 === u8[2] && 0x04 === u8[5] && 0xA0 === u8[39]) {
+      //console.log("EC---", u8[2].toString(16), u8[5].toString(16), u8[39].toString(16));
+      jwk = x509.parseSec1(u8, jwk);
+    // SPKI/PKIK (Public)
+    } else if (0x30 === u8[2] && 0x06 === u8[4] && 0x06 === u8[13]) {
+      //console.log("SPKI-", u8[2].toString(16), u8[4].toString(16), u8[13].toString(16));
+      jwk = x509.parseSpki(u8, jwk);
+    // Error
+    } else {
+      //console.log("PKCS8", u8[3].toString(16), u8[6].toString(16), u8[8].toString(16));
+      //console.log("EC---", u8[2].toString(16), u8[5].toString(16), u8[39].toString(16));
+      //console.log("SPKI-", u8[2].toString(16), u8[4].toString(16), u8[13].toString(16));
+      throw new Error("unrecognized key format");
+    }
+  } else if (-1 !== hex.indexOf(OBJ_ID_EC_384)) {
+    jwk.crv = "P-384";
+
+    // PKCS8
+    if (0x02 === u8[3] && 0x30 === u8[6] && 0x06 === u8[8]) {
+      //console.log("PKCS8", u8[3].toString(16), u8[6].toString(16), u8[8].toString(16));
+      jwk = x509.parsePkcs8(u8, jwk);
+    // EC-only
+    } else if (0x02 === u8[3] && 0x04 === u8[6] && 0xA0 === u8[56]) {
+      //console.log("EC---", u8[3].toString(16), u8[6].toString(16), u8[56].toString(16));
+      jwk = x509.parseSec1(u8, jwk);
+    // SPKI/PKIK (Public)
+    } else if (0x30 === u8[2] && 0x06 === u8[4] && 0x06 === u8[13]) {
+      //console.log("SPKI-", u8[2].toString(16), u8[4].toString(16), u8[13].toString(16));
+      jwk = x509.parseSpki(u8, jwk);
+    // Error
+    } else {
+      //console.log("PKCS8", u8[3].toString(16), u8[6].toString(16), u8[8].toString(16));
+      //console.log("EC---", u8[3].toString(16), u8[6].toString(16), u8[56].toString(16));
+      //console.log("SPKI-", u8[2].toString(16), u8[4].toString(16), u8[13].toString(16));
+      throw new Error("unrecognized key format");
+    }
+  } else {
+    throw new Error("Supported key types are P-256 and P-384");
+  }
+  if (opts.public) {
+    if (true !== opts.public) {
+      throw new Error("options.public must be either `true` or `false` not ("
+        + typeof opts.public + ") '" + opts.public + "'");
+    }
+    delete jwk.d;
+  }
+  return jwk;
+};
 EC.parse = function parseEc(opts) {
  return Promise.resolve().then(function () {
-    if (!opts || !opts.pem) {
-      throw new Error("must pass { pem: pem }");
-    }
-    var pem = opts.pem;
-    var u8 = PEM.parseBlock(pem).der;
-    var hex = toHex(u8);
-    var jwk = { kty: 'EC', crv: null, x: null, y: null };
-
-    //console.log();
-    if (-1 !== hex.indexOf(OBJ_ID_EC)) {
-      jwk.crv = "P-256";
-
-      // PKCS8
-      if (0x02 === u8[3] && 0x30 === u8[6] && 0x06 === u8[8]) {
-        //console.log("PKCS8", u8[3].toString(16), u8[6].toString(16), u8[8].toString(16));
-        jwk = EC.parsePkcs8(u8, jwk);
-      // EC-only
-      } else if (0x02 === u8[2] && 0x04 === u8[5] && 0xA0 === u8[39]) {
-        //console.log("EC---", u8[2].toString(16), u8[5].toString(16), u8[39].toString(16));
-        jwk = EC.parseSec1(u8, jwk);
-      // SPKI/PKIK (Public)
-      } else if (0x30 === u8[2] && 0x06 === u8[4] && 0x06 === u8[13]) {
-        //console.log("SPKI-", u8[2].toString(16), u8[4].toString(16), u8[13].toString(16));
-        jwk = EC.parseSpki(u8, jwk);
-      // Error
-      } else {
-        //console.log("PKCS8", u8[3].toString(16), u8[6].toString(16), u8[8].toString(16));
-        //console.log("EC---", u8[2].toString(16), u8[5].toString(16), u8[39].toString(16));
-        //console.log("SPKI-", u8[2].toString(16), u8[4].toString(16), u8[13].toString(16));
-        throw new Error("unrecognized key format");
-      }
-    } else if (-1 !== hex.indexOf(OBJ_ID_EC_384)) {
-      jwk.crv = "P-384";
-
-      // PKCS8
-      if (0x02 === u8[3] && 0x30 === u8[6] && 0x06 === u8[8]) {
-        //console.log("PKCS8", u8[3].toString(16), u8[6].toString(16), u8[8].toString(16));
-        jwk = EC.parsePkcs8(u8, jwk);
-      // EC-only
-      } else if (0x02 === u8[3] && 0x04 === u8[6] && 0xA0 === u8[56]) {
-        //console.log("EC---", u8[3].toString(16), u8[6].toString(16), u8[56].toString(16));
-        jwk = EC.parseSec1(u8, jwk);
-      // SPKI/PKIK (Public)
-      } else if (0x30 === u8[2] && 0x06 === u8[4] && 0x06 === u8[13]) {
-        //console.log("SPKI-", u8[2].toString(16), u8[4].toString(16), u8[13].toString(16));
-        jwk = EC.parseSpki(u8, jwk);
-      // Error
-      } else {
-        //console.log("PKCS8", u8[3].toString(16), u8[6].toString(16), u8[8].toString(16));
-        //console.log("EC---", u8[3].toString(16), u8[6].toString(16), u8[56].toString(16));
-        //console.log("SPKI-", u8[2].toString(16), u8[4].toString(16), u8[13].toString(16));
-        throw new Error("unrecognized key format");
-      }
-    } else {
-      throw new Error("Supported key types are P-256 and P-384");
-    }
-    if (opts.public) {
-      if (true !== opts.public) {
-        throw new Error("options.public must be either `true` or `false` not ("
-          + typeof opts.public + ") '" + opts.public + "'");
-      }
-      delete jwk.d;
-    }
-    return jwk;
+    return EC.importSync(opts);
  });
 };
 EC.toJwk = EC.import = EC.parse;

+EC.exportSync = function (opts) {
+  if (!opts || !opts.jwk || 'object' !== typeof opts.jwk) {
+    throw new Error("must pass { jwk: jwk } as a JSON object");
+  }
+  var jwk = JSON.parse(JSON.stringify(opts.jwk));
+  var format = opts.format;
+  if (opts.public || -1 !== [ 'spki', 'pkix', 'ssh', 'rfc4716' ].indexOf(format)) {
+    jwk.d = null;
+  }
+  if ('EC' !== jwk.kty) {
+    throw new Error("options.jwk.kty must be 'EC' for EC keys");
+  }
+  if (!jwk.d) {
+    if (!format || -1 !== [ 'spki', 'pkix' ].indexOf(format)) {
+      format = 'spki';
+    } else if (-1 !== [ 'ssh', 'rfc4716' ].indexOf(format)) {
+      format = 'ssh';
+    } else {
+      throw new Error("options.format must be 'spki' or 'ssh' for public EC keys, not ("
+        + typeof format + ") " + format);
+    }
+  } else {
+    if (!format || 'sec1' === format) {
+      format = 'sec1';
+    } else if ('pkcs8' !== format) {
+      throw new Error("options.format must be 'sec1' or 'pkcs8' for private EC keys, not '" + format + "'");
+    }
+  }
+  if (-1 === [ 'P-256', 'P-384' ].indexOf(jwk.crv)) {
+    throw new Error("options.jwk.crv must be either P-256 or P-384 for EC keys, not '" + jwk.crv + "'");
+  }
+  if (!jwk.y) {
+    throw new Error("options.jwk.y must be a urlsafe base64-encoded either P-256 or P-384");
+  }
+
+  if ('sec1' === format) {
+    return PEM.packBlock({ type: "EC PRIVATE KEY", bytes: x509.packSec1(jwk) });
+  } else if ('pkcs8' === format) {
+    return PEM.packBlock({ type: "PRIVATE KEY", bytes: x509.packPkcs8(jwk) });
+  } else if (-1 !== [ 'spki', 'pkix' ].indexOf(format)) {
+    return PEM.packBlock({ type: "PUBLIC KEY", bytes: x509.packSpki(jwk) });
+  } else if (-1 !== [ 'ssh', 'rfc4716' ].indexOf(format)) {
+    return SSH.packSsh(jwk);
+  } else {
+    throw new Error("Sanity Error: reached unreachable code block with format: " + format);
+  }
+};
 EC.pack = function (opts) {
  return Promise.resolve().then(function () {
-    if (!opts || !opts.jwk || 'object' !== typeof opts.jwk) {
-      throw new Error("must pass { jwk: jwk }");
-    }
-    var jwk = JSON.parse(JSON.stringify(opts.jwk));
-    var format = opts.format;
-    if (opts.public || -1 !== [ 'spki', 'pkix', 'ssh', 'rfc4716' ].indexOf(format)) {
-      jwk.d = null;
-    }
-    if ('EC' !== jwk.kty) {
-      throw new Error("options.jwk.kty must be 'EC' for EC keys");
-    }
-    if (!jwk.d) {
-      if (!format || -1 !== [ 'spki', 'pkix' ].indexOf(format)) {
-        format = 'spki';
-      } else if (-1 !== [ 'ssh', 'rfc4716' ].indexOf(format)) {
-        format = 'ssh';
-      } else {
-        throw new Error("options.format must be 'spki' or 'ssh' for public EC keys, not ("
-          + typeof format + ") " + format);
-      }
-    } else {
-      if (!format || 'sec1' === format) {
-        format = 'sec1';
-      } else if ('pkcs8' !== format) {
-        throw new Error("options.format must be 'sec1' or 'pkcs8' for private EC keys");
-      }
-    }
-    if (-1 === [ 'P-256', 'P-384' ].indexOf(jwk.crv)) {
-      throw new Error("options.jwk.crv must be either P-256 or P-384 for EC keys");
-    }
-    if (!jwk.y) {
-      throw new Error("options.jwk.y must be a urlsafe base64-encoded either P-256 or P-384");
-    }
-
-    if ('sec1' === format) {
-      return PEM.packBlock({ type: "EC PRIVATE KEY", bytes: EC.packSec1(jwk) });
-    } else if ('pkcs8' === format) {
-      return PEM.packBlock({ type: "EC PRIVATE KEY", bytes: EC.packPkcs8(jwk) });
-    } else if (-1 !== [ 'spki', 'pkix' ].indexOf(format)) {
-      return PEM.packBlock({ type: "PUBLIC KEY", bytes: EC.packSpki(jwk) });
-    } else if (-1 !== [ 'ssh', 'rfc4716' ].indexOf(format)) {
-      return EC.packSsh(jwk);
-    } else {
-      throw new Error("Sanity Error: reached unreachable code block with format: " + format);
-    }
+    return EC.exportSync(opts);
  });
 };

-EC.packSec1 = function (jwk) {
-  var d = toHex(base64ToUint8(urlBase64ToBase64(jwk.d)));
-  var x = toHex(base64ToUint8(urlBase64ToBase64(jwk.x)));
-  var y = toHex(base64ToUint8(urlBase64ToBase64(jwk.y)));
-  var objId = ('P-256' === jwk.crv) ? OBJ_ID_EC : OBJ_ID_EC_384;
-  return Hex.toUint8(
-    ASN1('30'
-    , ASN1.UInt('01')
-    , ASN1('04', d)
-    , ASN1('A0', objId)
-    , ASN1('A1', ASN1.BitStr('04' + x + y)))
-  );
-};
-EC.packPkcs8 = function (jwk) {
-  var d = toHex(base64ToUint8(urlBase64ToBase64(jwk.d)));
-  var x = toHex(base64ToUint8(urlBase64ToBase64(jwk.x)));
-  var y = toHex(base64ToUint8(urlBase64ToBase64(jwk.y)));
-  var objId = ('P-256' === jwk.crv) ? OBJ_ID_EC : OBJ_ID_EC_384;
-  return Hex.toUint8(
-    ASN1('30'
-    , ASN1.UInt('00')
-    , ASN1('30'
-      , OBJ_ID_EC_PUB
-      , objId
-      )
-    , ASN1('04'
-      , ASN1('30'
-        , ASN1.UInt('01')
-        , ASN1('04', d)
-        , ASN1('A1', ASN1.BitStr('04' + x + y)))))
-  );
-};
-EC.packSpki = function (jwk) {
-  var x = toHex(base64ToUint8(urlBase64ToBase64(jwk.x)));
-  var y = toHex(base64ToUint8(urlBase64ToBase64(jwk.y)));
-  var objId = ('P-256' === jwk.crv) ? OBJ_ID_EC : OBJ_ID_EC_384;
-  return Hex.toUint8(
-    ASN1('30'
-    , ASN1('30'
-      , OBJ_ID_EC_PUB
-      , objId
-      )
-    , ASN1.BitStr('04' + x + y))
-  );
-};
-EC.packPkix = EC.packSpki;
-EC.packSsh = function (jwk) {
-  // Custom SSH format
-  var typ = 'ecdsa-sha2-nistp256';
-	var a = '32 35 36';
-  var b = '41';
-  var comment = jwk.crv + '@localhost';
-  if ('P-256' !== jwk.crv) {
-    typ = 'ecdsa-sha2-nistp384';
-    a = '33 38 34';
-    b = '61';
-  }
-  var x = toHex(base64ToUint8(urlBase64ToBase64(jwk.x)));
-  var y = toHex(base64ToUint8(urlBase64ToBase64(jwk.y)));
-  var ssh = Hex.toUint8(
-    ('00 00 00 13 65 63 64 73 61 2d 73 68 61 32 2d 6e 69 73 74 70'
-    + a + '00 00 00 08 6e 69 73 74 70' + a + '00 00 00' + b
-    + '04' + x + y).replace(/\s+/g, '').toLowerCase()
-  );
-
-  return typ + ' ' + toBase64(ssh) + ' ' + comment;
+EC.__thumbprint = function (jwk) {
+  var buf = require('crypto').createHash('sha256')
+    // alphabetically sorted keys [ 'crv', 'kty', 'x', 'y' ]
+    .update('{"crv":"' + jwk.crv + '","kty":"EC","x":"' + jwk.x + '","y":"' + jwk.y + '"}')
+    .digest()
+  ;
+  return Enc.bufToUrlBase64(buf);
 };

-//
-// A dumbed-down, minimal ASN.1 packer
-//
-
-// Almost every ASN.1 type that's important for CSR
-// can be represented generically with only a few rules.
-ASN1 = function ASN1(/*type, hexstrings...*/) {
-  var args = Array.prototype.slice.call(arguments);
-  var typ = args.shift();
-  var str = args.join('').replace(/\s+/g, '').toLowerCase();
-  var len = (str.length/2);
-  var lenlen = 0;
-  var hex = typ;
-
-  // We can't have an odd number of hex chars
-  if (len !== Math.round(len)) {
-    throw new Error("invalid hex");
-  }
-
-  // The first byte of any ASN.1 sequence is the type (Sequence, Integer, etc)
-  // The second byte is either the size of the value, or the size of its size
-
-  // 1. If the second byte is < 0x80 (128) it is considered the size
-  // 2. If it is > 0x80 then it describes the number of bytes of the size
-  //    ex: 0x82 means the next 2 bytes describe the size of the value
-  // 3. The special case of exactly 0x80 is "indefinite" length (to end-of-file)
-
-  if (len > 127) {
-    lenlen += 1;
-    while (len > 255) {
-      lenlen += 1;
-      len = len >> 8;
+EC.thumbprint = function (opts) {
+  return Promise.resolve().then(function () {
+    var jwk;
+    if ('EC' === opts.kty) {
+      jwk = opts;
+    } else if (opts.jwk) {
+      jwk = opts.jwk;
+    } else {
+      jwk = EC.importSync(opts);
    }
-  }
-
-  if (lenlen) { hex += Hex.fromInt(0x80 + lenlen); }
-  return hex + Hex.fromInt(str.length/2) + str;
-};
-
-// The Integer type has some special rules
-ASN1.UInt = function UINT() {
-  var str = Array.prototype.slice.call(arguments).join('');
-  var first = parseInt(str.slice(0, 2), 16);
-
-  // If the first byte is 0x80 or greater, the number is considered negative
-  // Therefore we add a '00' prefix if the 0x80 bit is set
-  if (0x80 & first) { str = '00' + str; }
-
-  return ASN1('02', str);
-};
-
-// The Bit String type also has a special rule
-ASN1.BitStr = function BITSTR() {
-  var str = Array.prototype.slice.call(arguments).join('');
-  // '00' is a mask of how many bits of the next byte to ignore
-  return ASN1('03', '00' + str);
+    return EC.__thumbprint(jwk);
+  });
 };

 EC.toPem = EC.export = EC.pack;
--- a/lib/encoding.js
+++ b/lib/encoding.js
@ -0,0 +1,42 @@
+'use strict';
+
+var Enc = module.exports;
+
+Enc.base64ToBuf = function (str) {
+  // node handles both base64 and urlBase64 equally
+  return Buffer.from(str, 'base64');
+};
+
+Enc.base64ToHex = function (b64) {
+  return Enc.bufToHex(Enc.base64ToBuf(b64));
+};
+
+Enc.bufToBase64 = function (u8) {
+  // Ensure a node buffer, even if TypedArray
+  return Buffer.from(u8).toString('base64');
+};
+
+Enc.bufToHex = function (u8) {
+  // Ensure a node buffer, even if TypedArray
+  return Buffer.from(u8).toString('hex');
+};
+
+Enc.bufToUrlBase64 = function (u8) {
+  return Enc.bufToBase64(u8)
+    .replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+};
+
+Enc.hexToUint8 = function (hex) {
+  // TODO: I don't remember why I chose Uint8Array over Buffer...
+  var buf = Buffer.from(hex, 'hex');
+  var ab = buf.buffer.slice(buf.offset, buf.offset + buf.byteLength);
+  return new Uint8Array(ab);
+};
+
+Enc.numToHex = function (d) {
+  d = d.toString(16);
+  if (d.length % 2) {
+    return '0' + d;
+  }
+  return d;
+};
--- a/lib/generate-privkey-node-v6.js
+++ b/lib/generate-privkey-node-v6.js
@ -0,0 +1,36 @@
+// Copyright 2016-2018 AJ ONeal. All rights reserved
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+'use strict';
+
+var curves = {
+  "P-256": "prime256v1" // 65
+, "secp256r1": "prime256v1"
+, "P-384": "secp384r1" // 97
+, "P-521": "secp521r1" // 133
+};
+var crv = "P-256";
+var ecdh = require('crypto').createECDH(curves[crv] || crv);
+var keys = ecdh.generateKeys(null, 'uncompressed');
+console.log(keys.length);
+console.log(keys.toString('hex'));
+keys = keys.slice(1);
+var x = keys.slice(0, keys.byteLength / 2);
+var y = keys.slice(keys.byteLength / 2);
+while (0 === x[0]) { x = x.slice(1); }
+while (0 === y[0]) { y = y.slice(1); }
+console.log({
+  kty: "EC"
+, crv: "P-XXX"
+, x: _toUrlBase64(x)
+, y: _toUrlBase64(y)
+});
+
+function _toUrlBase64(buf) {
+  return buf.toString('base64')
+    .replace(/\+/g, "-")
+    .replace(/\//g, "_")
+    .replace(/=/g,"")
+  ;
+}
--- a/lib/generate-privkey-node.js
+++ b/lib/generate-privkey-node.js
@ -0,0 +1,22 @@
+// Copyright 2016-2018 AJ ONeal. All rights reserved
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+'use strict';
+
+module.exports = function (crv) {
+  var keypair = require('crypto').generateKeyPairSync(
+    'ec'
+  , { namedCurve: crv
+    , privateKeyEncoding: { type: 'sec1', format: 'pem' }
+    , publicKeyEncoding: { type: 'spki', format: 'pem' }
+    }
+  );
+  var result = { privateKeyPem: keypair.privateKey.trim() };
+  return result;
+};
+
+if (require.main === module) {
+  var keypair = module.exports('P-256');
+  console.info(keypair.privateKeyPem);
+}
--- a/lib/pem.js
+++ b/lib/pem.js
@ -0,0 +1,28 @@
+'use strict';
+
+var PEM = module.exports;
+var Enc = require('./encoding.js');
+
+PEM.parseBlock = function pemToDer(pem) {
+  var lines = pem.trim().split(/\n/);
+  var end = lines.length - 1;
+  var head = lines[0].match(/-----BEGIN (.*)-----/);
+  var foot = lines[end].match(/-----END (.*)-----/);
+
+  if (head) {
+    lines = lines.slice(1, end);
+    head = head[1];
+    if (head !== foot[1]) {
+      throw new Error("headers and footers do not match");
+    }
+  }
+
+  return { type: head, bytes: Enc.base64ToBuf(lines.join('')) };
+};
+
+PEM.packBlock = function (opts) {
+  return '-----BEGIN ' + opts.type + '-----\n'
+    + Enc.bufToBase64(opts.bytes).match(/.{1,64}/g).join('\n') + '\n'
+    + '-----END ' + opts.type + '-----'
+  ;
+};
--- a/lib/ssh.js
+++ b/lib/ssh.js
@ -0,0 +1,55 @@
+'use strict';
+
+var SSH = module.exports;
+var Enc = require('./encoding.js');
+
+                      // 19  e  c  d  s  a  -  s  h  a  2  -  n  i  s  t  p  2  5  6
+var SSH_EC_P256 = '00000013 65 63 64 73 61 2d 73 68 61 32 2d 6e 69 73 74 70 32 35 36'
+  .replace(/\s+/g, '').toLowerCase();
+                      // 19  e  c  d  s  a  -  s  h  a  2  -  n  i  s  t  p  3  8  4
+var SSH_EC_P384 = '00000013 65 63 64 73 61 2d 73 68 61 32 2d 6e 69 73 74 70 33 38 34'
+  .replace(/\s+/g, '').toLowerCase();
+
+SSH.parseSsh = function (pem) {
+  var jwk = { kty: 'EC', crv: null, x: null, y: null };
+  var b64 = pem.split(/\s+/g)[1];
+  var buf = Buffer.from(b64, 'base64');
+  var hex = Enc.bufToHex(buf);
+  var index = 40;
+  var len;
+  if (0 === hex.indexOf(SSH_EC_P256)) {
+    jwk.crv = 'P-256';
+    len = 32;
+  } else if (0 === hex.indexOf(SSH_EC_P384)) {
+    jwk.crv = 'P-384';
+    len = 48;
+  }
+  var x = buf.slice(index, index + len);
+  var y = buf.slice(index + len, index + len + len);
+  jwk.x = Enc.bufToUrlBase64(x);
+  jwk.y = Enc.bufToUrlBase64(y);
+  return jwk;
+};
+
+
+SSH.packSsh = function (jwk) {
+  // Custom SSH format
+  var typ = 'ecdsa-sha2-nistp256';
+	var a = '32 35 36';
+  var b = '41';
+  var comment = jwk.crv + '@localhost';
+  if ('P-256' !== jwk.crv) {
+    typ = 'ecdsa-sha2-nistp384';
+    a = '33 38 34';
+    b = '61';
+  }
+  var x = Enc.base64ToHex(jwk.x);
+  var y = Enc.base64ToHex(jwk.y);
+  var ssh = Enc.hexToUint8(
+    ('00 00 00 13 65 63 64 73 61 2d 73 68 61 32 2d 6e 69 73 74 70'
+    + a + '00 00 00 08 6e 69 73 74 70' + a + '00 00 00' + b
+    + '04' + x + y).replace(/\s+/g, '').toLowerCase()
+  );
+
+  return typ + ' ' + Enc.bufToBase64(ssh) + ' ' + comment;
+};
--- a/lib/telemetry.js
+++ b/lib/telemetry.js
@ -32,28 +32,28 @@ function addCommunityMember(opts) {
    , method: 'POST'
    , headers: { 'Content-Type': 'application/json' }
    }, function (resp) {
-			// let the data flow, so we can ignore it
+      // let the data flow, so we can ignore it
      resp.on('data', function () {});
      //resp.on('data', function (chunk) { console.log(chunk.toString()); });
-			resp.on('error', function () { /*ignore*/ });
-			//resp.on('error', function (err) { console.error(err); });
+      resp.on('error', function () { /*ignore*/ });
+      //resp.on('error', function (err) { console.error(err); });
    });
-		var obj = JSON.parse(JSON.stringify(data));
-		obj.action = 'updates';
+    var obj = JSON.parse(JSON.stringify(data));
+    obj.action = 'updates';
    try {
      obj.ppid = ppid(obj.action);
    } catch(e) {
      // ignore
      //console.error(e);
    }
-		obj.name = opts.name || undefined;
-		obj.address = opts.email;
-		obj.community = 'node.js@therootcompany.com';
+    obj.name = opts.name || undefined;
+    obj.address = opts.email;
+    obj.community = 'node.js@therootcompany.com';

    req.write(JSON.stringify(obj, 2, null));
    req.end();
-		req.on('error', function () { /*ignore*/ });
-		//req.on('error', function (err) { console.error(err); });
+    req.on('error', function () { /*ignore*/ });
+    //req.on('error', function (err) { console.error(err); });
  }, 50);
 }

@ -66,14 +66,14 @@ function ping(action) {
    , method: 'POST'
    , headers: { 'Content-Type': 'application/json' }
    }, function (resp) {
-			// let the data flow, so we can ignore it
+      // let the data flow, so we can ignore it
      resp.on('data', function () { });
      //resp.on('data', function (chunk) { console.log(chunk.toString()); });
-			resp.on('error', function () { /*ignore*/ });
-			//resp.on('error', function (err) { console.error(err); });
+      resp.on('error', function () { /*ignore*/ });
+      //resp.on('error', function (err) { console.error(err); });
    });
-		var obj = JSON.parse(JSON.stringify(data));
-		obj.action = action;
+    var obj = JSON.parse(JSON.stringify(data));
+    obj.action = action;
    try {
      obj.ppid = ppid(obj.action);
    } catch(e) {
@ -83,22 +83,22 @@ function ping(action) {

    req.write(JSON.stringify(obj, 2, null));
    req.end();
-		req.on('error', function (/*e*/) { /*console.error('req.error', e);*/ });
+    req.on('error', function (/*e*/) { /*console.error('req.error', e);*/ });
  }, 50);
 }

 // to help identify unique installs without getting
 // the personally identifiable info that we don't want
 function ppid(action) {
-	var parts = [ action, data.package, data.version, data.node, data.arch, data.platform, data.release ];
-	var ifaces = os.networkInterfaces();
-	Object.keys(ifaces).forEach(function (ifname) {
-		if (/^en/.test(ifname) || /^eth/.test(ifname) || /^wl/.test(ifname)) {
-			if  (ifaces[ifname] && ifaces[ifname].length) {
-				parts.push(ifaces[ifname][0].mac);
-			}
-		}
-	});
+  var parts = [ action, data.package, data.version, data.node, data.arch, data.platform, data.release ];
+  var ifaces = os.networkInterfaces();
+  Object.keys(ifaces).forEach(function (ifname) {
+    if (/^en/.test(ifname) || /^eth/.test(ifname) || /^wl/.test(ifname)) {
+      if  (ifaces[ifname] && ifaces[ifname].length) {
+        parts.push(ifaces[ifname][0].mac);
+      }
+    }
+  });
  return crypto.createHash('sha1').update(parts.join(',')).digest('base64');
 }

@ -106,6 +106,6 @@ module.exports.ping = ping;
 module.exports.joinCommunity = addCommunityMember;

 if (require.main === module) {
-	ping('install');
-	//addCommunityMember({ name: "AJ ONeal", email: 'coolaj86@gmail.com' });
+  ping('install');
+  //addCommunityMember({ name: "AJ ONeal", email: 'coolaj86@gmail.com' });
 }
--- a/lib/x509.js
+++ b/lib/x509.js
@ -0,0 +1,170 @@
+'use strict';
+
+var ASN1 = require('./asn1.js');
+var Enc = require('./encoding.js');
+var x509 = module.exports;
+
+// 1.2.840.10045.3.1.7
+// prime256v1 (ANSI X9.62 named elliptic curve)
+var OBJ_ID_EC  = '06 08 2A8648CE3D030107'.replace(/\s+/g, '').toLowerCase();
+// 1.3.132.0.34
+// secp384r1 (SECG (Certicom) named elliptic curve)
+var OBJ_ID_EC_384 = '06 05 2B81040022'.replace(/\s+/g, '').toLowerCase();
+// 1.2.840.10045.2.1
+// ecPublicKey (ANSI X9.62 public key type)
+var OBJ_ID_EC_PUB = '06 07 2A8648CE3D0201'.replace(/\s+/g, '').toLowerCase();
+
+x509.parseSec1 = function parseEcOnlyPrivkey(u8, jwk) {
+  var index = 7;
+  var len = 32;
+  var olen = OBJ_ID_EC.length/2;
+
+  if ("P-384" === jwk.crv) {
+    olen = OBJ_ID_EC_384.length/2;
+    index = 8;
+    len = 48;
+  }
+  if (len !== u8[index - 1]) {
+    throw new Error("Unexpected bitlength " + len);
+  }
+
+  // private part is d
+  var d = u8.slice(index, index + len);
+  // compression bit index
+  var ci = index + len + 2 + olen + 2 + 3;
+  var c = u8[ci];
+  var x, y;
+
+  if (0x04 === c) {
+    y = u8.slice(ci + 1 + len, ci + 1 + len + len);
+  } else if (0x02 !== c) {
+    throw new Error("not a supported EC private key");
+  }
+  x = u8.slice(ci + 1, ci + 1 + len);
+
+  return {
+    kty: jwk.kty
+  , crv: jwk.crv
+  , d: Enc.bufToUrlBase64(d)
+  //, dh: Enc.bufToHex(d)
+  , x: Enc.bufToUrlBase64(x)
+  //, xh: Enc.bufToHex(x)
+  , y: Enc.bufToUrlBase64(y)
+  //, yh: Enc.bufToHex(y)
+  };
+};
+
+x509.parsePkcs8 = function parseEcPkcs8(u8, jwk) {
+  var index = 24 + (OBJ_ID_EC.length/2);
+  var len = 32;
+  if ("P-384" === jwk.crv) {
+    index = 24 + (OBJ_ID_EC_384.length/2) + 2;
+    len = 48;
+  }
+
+  //console.log(index, u8.slice(index));
+  if (0x04 !== u8[index]) {
+    //console.log(jwk);
+    throw new Error("privkey not found");
+  }
+  var d = u8.slice(index+2, index+2+len);
+  var ci = index+2+len+5;
+  var xi = ci+1;
+  var x = u8.slice(xi, xi + len);
+  var yi = xi+len;
+  var y;
+  if (0x04 === u8[ci]) {
+    y = u8.slice(yi, yi + len);
+  } else if (0x02 !== u8[ci]) {
+    throw new Error("invalid compression bit (expected 0x04 or 0x02)");
+  }
+
+  return {
+    kty: jwk.kty
+  , crv: jwk.crv
+  , d: Enc.bufToUrlBase64(d)
+  //, dh: Enc.bufToHex(d)
+  , x: Enc.bufToUrlBase64(x)
+  //, xh: Enc.bufToHex(x)
+  , y: Enc.bufToUrlBase64(y)
+  //, yh: Enc.bufToHex(y)
+  };
+};
+
+x509.parseSpki = function parsePem(u8, jwk) {
+  var ci = 16 + OBJ_ID_EC.length/2;
+  var len = 32;
+
+  if ("P-384" === jwk.crv) {
+    ci = 16 + OBJ_ID_EC_384.length/2;
+    len = 48;
+  }
+
+  var c = u8[ci];
+  var xi = ci + 1;
+  var x = u8.slice(xi, xi + len);
+  var yi = xi + len;
+  var y;
+  if (0x04 === c) {
+    y = u8.slice(yi, yi + len);
+  } else if (0x02 !== c) {
+    throw new Error("not a supported EC private key");
+  }
+
+  return {
+    kty: jwk.kty
+  , crv: jwk.crv
+  , x: Enc.bufToUrlBase64(x)
+  //, xh: Enc.bufToHex(x)
+  , y: Enc.bufToUrlBase64(y)
+  //, yh: Enc.bufToHex(y)
+  };
+};
+x509.parsePkix = x509.parseSpki;
+
+x509.packSec1 = function (jwk) {
+  var d = Enc.base64ToHex(jwk.d);
+  var x = Enc.base64ToHex(jwk.x);
+  var y = Enc.base64ToHex(jwk.y);
+  var objId = ('P-256' === jwk.crv) ? OBJ_ID_EC : OBJ_ID_EC_384;
+  return Enc.hexToUint8(
+    ASN1('30'
+    , ASN1.UInt('01')
+    , ASN1('04', d)
+    , ASN1('A0', objId)
+    , ASN1('A1', ASN1.BitStr('04' + x + y)))
+  );
+};
+x509.packPkcs8 = function (jwk) {
+  var d = Enc.base64ToHex(jwk.d);
+  var x = Enc.base64ToHex(jwk.x);
+  var y = Enc.base64ToHex(jwk.y);
+  var objId = ('P-256' === jwk.crv) ? OBJ_ID_EC : OBJ_ID_EC_384;
+  return Enc.hexToUint8(
+    ASN1('30'
+    , ASN1.UInt('00')
+    , ASN1('30'
+      , OBJ_ID_EC_PUB
+      , objId
+      )
+    , ASN1('04'
+      , ASN1('30'
+        , ASN1.UInt('01')
+        , ASN1('04', d)
+        , ASN1('A1', ASN1.BitStr('04' + x + y)))))
+  );
+};
+x509.packSpki = function (jwk) {
+  var x = Enc.base64ToHex(jwk.x);
+  var y = Enc.base64ToHex(jwk.y);
+  var objId = ('P-256' === jwk.crv) ? OBJ_ID_EC : OBJ_ID_EC_384;
+  return Enc.hexToUint8(
+    ASN1('30'
+    , ASN1('30'
+      , OBJ_ID_EC_PUB
+      , objId
+      )
+    , ASN1.BitStr('04' + x + y))
+  );
+};
+x509.packPkix = x509.packSpki;
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "eckles",
-  "version": "1.1.1",
-  "description": "PEM-to-JWK and JWK-to-PEM for ECDSA keys in a lightweight, zero-dependency library focused on perfect universal compatibility.",
+  "version": "1.4.0",
+  "description": "💯 PEM-to-JWK and JWK-to-PEM (and SSH) for ECDSA keys in a lightweight, zero-dependency library focused on perfect universal compatibility.",
  "homepage": "https://git.coolaj86.com/coolaj86/eckles.js",
  "main": "index.js",
  "bin": {
@ -17,7 +17,7 @@
  },
  "scripts": {
    "postinstall": "node lib/telemetry.js event:install",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "bash test.sh"
  },
  "repository": {
    "type": "git",
@ -29,6 +29,8 @@
    "PEM-to-JWK",
    "ECDSA",
    "EC",
+    "SSH-to-JWK",
+    "JWK-to-SSH",
    "p-256",
    "prime256v1",
    "secp256r1",
--- a/test.sh
+++ b/test.sh
@ -1,65 +1,136 @@
 #/bin/bash
 set -e

-echo ""
 echo ""
 echo "Testing PEM-to-JWK P-256"
-echo ""
-node bin/eckles.js fixtures/privkey-ec-p256.sec1.pem | tee fixtures/privkey-ec-p256.jwk.2
+node bin/eckles.js fixtures/privkey-ec-p256.sec1.pem \
+  > fixtures/privkey-ec-p256.jwk.2
 diff fixtures/privkey-ec-p256.jwk.json fixtures/privkey-ec-p256.jwk.2
-node bin/eckles.js fixtures/privkey-ec-p256.pkcs8.pem | tee fixtures/privkey-ec-p256.jwk.2
+node bin/eckles.js fixtures/privkey-ec-p256.pkcs8.pem \
+  > fixtures/privkey-ec-p256.jwk.2
 diff fixtures/privkey-ec-p256.jwk.json fixtures/privkey-ec-p256.jwk.2
-node bin/eckles.js fixtures/pub-ec-p256.spki.pem | tee fixtures/pub-ec-p256.jwk.2
+node bin/eckles.js fixtures/pub-ec-p256.spki.pem \
+  > fixtures/pub-ec-p256.jwk.2
 diff fixtures/pub-ec-p256.jwk.json fixtures/pub-ec-p256.jwk.2
+#
+node bin/eckles.js fixtures/pub-ec-p256.ssh.pub \
+  > fixtures/pub-ec-p256.jwk.2
+diff fixtures/pub-ec-p256.jwk.2 fixtures/pub-ec-p256.jwk.2
+echo "PASS"
+

-echo ""
 echo ""
 echo "Testing PEM-to-JWK P-384"
-echo ""
-node bin/eckles.js fixtures/privkey-ec-p384.sec1.pem | tee fixtures/privkey-ec-p384.jwk.2
+node bin/eckles.js fixtures/privkey-ec-p384.sec1.pem \
+  > fixtures/privkey-ec-p384.jwk.2
 diff fixtures/privkey-ec-p384.jwk.json fixtures/privkey-ec-p384.jwk.2
-node bin/eckles.js fixtures/privkey-ec-p384.pkcs8.pem | tee fixtures/privkey-ec-p384.jwk.2.2
+node bin/eckles.js fixtures/privkey-ec-p384.pkcs8.pem \
+  > fixtures/privkey-ec-p384.jwk.2.2
 diff fixtures/privkey-ec-p384.jwk.json fixtures/privkey-ec-p384.jwk.2.2
-node bin/eckles.js fixtures/pub-ec-p384.spki.pem | tee fixtures/pub-ec-p384.jwk.2
+node bin/eckles.js fixtures/pub-ec-p384.spki.pem \
+  > fixtures/pub-ec-p384.jwk.2
 diff fixtures/pub-ec-p384.jwk.json fixtures/pub-ec-p384.jwk.2
+#
+node bin/eckles.js fixtures/pub-ec-p384.ssh.pub \
+  > fixtures/pub-ec-p384.jwk.2
+diff fixtures/pub-ec-p384.jwk.2 fixtures/pub-ec-p384.jwk.2
+echo "PASS"
+

-echo ""
 echo ""
 echo "Testing JWK-to-PEM P-256"
-echo ""
-node bin/eckles.js fixtures/privkey-ec-p256.jwk.json sec1 | tee fixtures/privkey-ec-p256.sec1.pem.2
+node bin/eckles.js fixtures/privkey-ec-p256.jwk.json sec1 \
+  > fixtures/privkey-ec-p256.sec1.pem.2
 diff fixtures/privkey-ec-p256.sec1.pem fixtures/privkey-ec-p256.sec1.pem.2
 #
-node bin/eckles.js fixtures/privkey-ec-p256.jwk.json pkcs8 | tee fixtures/privkey-ec-p256.pkcs8.pem.2
+node bin/eckles.js fixtures/privkey-ec-p256.jwk.json pkcs8 \
+  > fixtures/privkey-ec-p256.pkcs8.pem.2
 diff fixtures/privkey-ec-p256.pkcs8.pem fixtures/privkey-ec-p256.pkcs8.pem.2
 #
-node bin/eckles.js fixtures/pub-ec-p256.jwk.json spki | tee fixtures/pub-ec-p256.spki.pem.2
+node bin/eckles.js fixtures/pub-ec-p256.jwk.json spki \
+  > fixtures/pub-ec-p256.spki.pem.2
 diff fixtures/pub-ec-p256.spki.pem fixtures/pub-ec-p256.spki.pem.2
 # ssh-keygen -f fixtures/pub-ec-p256.spki.pem -i -mPKCS8 > fixtures/pub-ec-p256.ssh.pub
-node bin/eckles.js fixtures/pub-ec-p256.jwk.json ssh | tee fixtures/pub-ec-p256.ssh.pub.2
+node bin/eckles.js fixtures/pub-ec-p256.jwk.json ssh \
+  > fixtures/pub-ec-p256.ssh.pub.2
 diff fixtures/pub-ec-p256.ssh.pub fixtures/pub-ec-p256.ssh.pub.2
+echo "PASS"
+

-echo ""
 echo ""
 echo "Testing JWK-to-PEM P-384"
-echo ""
-node bin/eckles.js fixtures/privkey-ec-p384.jwk.json sec1 | tee fixtures/privkey-ec-p384.sec1.pem.2
+node bin/eckles.js fixtures/privkey-ec-p384.jwk.json sec1 \
+  > fixtures/privkey-ec-p384.sec1.pem.2
 diff fixtures/privkey-ec-p384.sec1.pem fixtures/privkey-ec-p384.sec1.pem.2
 #
-node bin/eckles.js fixtures/privkey-ec-p384.jwk.json pkcs8 | tee fixtures/privkey-ec-p384.pkcs8.pem.2
+node bin/eckles.js fixtures/privkey-ec-p384.jwk.json pkcs8 \
+  > fixtures/privkey-ec-p384.pkcs8.pem.2
 diff fixtures/privkey-ec-p384.pkcs8.pem fixtures/privkey-ec-p384.pkcs8.pem.2
 #
-node bin/eckles.js fixtures/pub-ec-p384.jwk.json spki | tee fixtures/pub-ec-p384.spki.pem.2
+node bin/eckles.js fixtures/pub-ec-p384.jwk.json spki \
+  > fixtures/pub-ec-p384.spki.pem.2
 diff fixtures/pub-ec-p384.spki.pem fixtures/pub-ec-p384.spki.pem.2
 # ssh-keygen -f fixtures/pub-ec-p384.spki.pem -i -mPKCS8 > fixtures/pub-ec-p384.ssh.pub
-node bin/eckles.js fixtures/pub-ec-p384.jwk.json ssh | tee fixtures/pub-ec-p384.ssh.pub.2
+node bin/eckles.js fixtures/pub-ec-p384.jwk.json ssh \
+  > fixtures/pub-ec-p384.ssh.pub.2
 diff fixtures/pub-ec-p384.ssh.pub fixtures/pub-ec-p384.ssh.pub.2
+echo "PASS"
+

 rm fixtures/*.2

+
+echo ""
+echo "Testing freshly generated keypair"
+# Generate EC P-256 Keypair
+openssl ecparam -genkey -name prime256v1 -noout -out ./privkey-ec-p256.sec1.pem
+# Export Public-only EC Key (as SPKI)
+openssl ec -in ./privkey-ec-p256.sec1.pem -pubout -out ./pub-ec-p256.spki.pem
+# Convert SEC1 (traditional) EC Keypair to PKCS8 format
+openssl pkcs8 -topk8 -nocrypt -in ./privkey-ec-p256.sec1.pem -out ./privkey-ec-p256.pkcs8.pem
+# Convert EC public key to SSH format
+sshpub=$(ssh-keygen -f ./pub-ec-p256.spki.pem -i -mPKCS8)
+echo "$sshpub P-256@localhost" > ./pub-ec-p256.ssh.pub
+#
+node bin/eckles.js ./privkey-ec-p256.sec1.pem > ./privkey-ec-p256.jwk.json
+node bin/eckles.js ./privkey-ec-p256.jwk.json sec1 > ./privkey-ec-p256.sec1.pem.2
+diff ./privkey-ec-p256.sec1.pem ./privkey-ec-p256.sec1.pem.2
+#
+node bin/eckles.js ./privkey-ec-p256.pkcs8.pem > ./privkey-ec-p256.jwk.json
+node bin/eckles.js ./privkey-ec-p256.jwk.json pkcs8 > ./privkey-ec-p256.pkcs8.pem.2
+diff ./privkey-ec-p256.pkcs8.pem ./privkey-ec-p256.pkcs8.pem.2
+#
+node bin/eckles.js ./pub-ec-p256.spki.pem > ./pub-ec-p256.jwk.json
+node bin/eckles.js ./pub-ec-p256.jwk.json spki > ./pub-ec-p256.spki.pem.2
+diff ./pub-ec-p256.spki.pem ./pub-ec-p256.spki.pem.2
+#
+node bin/eckles.js ./pub-ec-p256.ssh.pub > ./pub-ec-p256.jwk.json
+node bin/eckles.js ./pub-ec-p256.jwk.json ssh > ./pub-ec-p256.ssh.pub.2
+diff ./pub-ec-p256.ssh.pub ./pub-ec-p256.ssh.pub.2
+echo "PASS"
+
+echo ""
+echo "Testing key generation"
+node bin/eckles.js jwk > /dev/null
+node bin/eckles.js jwk P-384 > /dev/null
+node bin/eckles.js sec1 > /dev/null
+node bin/eckles.js pkcs8 > /dev/null
+node bin/eckles.js ssh #> /dev/null
+echo "PASS"
+
+echo ""
+echo "Testing Thumbprints"
+node bin/eckles.js ./fixtures/privkey-ec-p256.sec1.pem thumbprint
+node bin/eckles.js ./fixtures/pub-ec-p256.jwk.json thumbprint
+echo "PASS"
+
+rm *.2
+
+
 echo ""
 echo ""
 echo "PASSED:"
 echo "• All inputs produced valid outputs"
 echo "• All outputs matched known-good values"
+echo "• Generated keys in each format (sec1, pkcs8, jwk, ssh)"
 echo ""
Author	SHA1	Message	Date
AJ ONeal	1d5f58ff10	WIP: rsa-compat-style node v10 and v6 support	2019-05-14 04:18:52 -06:00
AJ ONeal	7d30ca129d	v1.4.0: add jwk thumbprinting	2019-02-06 23:56:13 -07:00
AJ ONeal	02134e5c4f	A Root Project	2019-02-06 23:49:01 -07:00
AJ ONeal	6bef1617b3	cleanup	2018-12-01 17:01:24 -07:00
AJ ONeal	86956eb9d1	cleanup	2018-12-01 16:30:05 -07:00
AJ ONeal	e11120ae29	whitespace and comment cleanup	2018-12-01 15:39:01 -07:00
AJ ONeal	077532ab33	v1.3.3: move CLI to own module	2018-11-24 23:24:46 -07:00
AJ ONeal	8d85bbaadf	update error msg	2018-11-24 23:17:22 -07:00
AJ ONeal	747f406107	v1.3.2: update package description	2018-11-24 20:29:18 -07:00
AJ ONeal	5d3c6a4b65	v1.3.1: add tests to package.json	2018-11-24 20:25:58 -07:00
AJ ONeal	3102515664	v1.3.0: Add key generation, document CLI	2018-11-24 20:21:27 -07:00
AJ ONeal	b4f15f5f29	show proper PKCS8 PEM type string in example	2018-11-22 03:52:15 -07:00
AJ ONeal	61bab2c47d	add new random test	2018-11-21 00:49:50 -07:00
AJ ONeal	d3357fdb23	update README, correct PKCS8 comments	2018-11-21 00:36:53 -07:00
AJ ONeal	67bb76d19e	v1.2.0 add ability to read ssh pub files	2018-11-20 23:55:17 -07:00