From b1f3c7ee9047760c250bbe0196112f9764846841 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Sat, 1 Dec 2018 22:05:03 -0700 Subject: [PATCH] v1.0.1: update README --- README.md | 9 +++++---- lib/ssh-parser.js | 8 +++++--- package.json | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6f8b1cd..ddfda06 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ Features * [x] EC Public Keys * P-256 (prime256v1, secp256r1) * P-384 (secp384r1) -* [ ] Browser Version (coming soon) +* [x] Browser Version + * [Bluecrypt SSH to JWK](https://git.coolaj86.com/coolaj86/bluecrypt-ssh-to-jwk.js) ### Need JWK to SSH? SSH to PEM? @@ -48,12 +49,12 @@ You can also use it from JavaScript: ```js var fs = require('fs'); -var sshtojwk = require('sshtojwk'); +var sshtojwk = require('ssh-to-jwk'); var pub = fs.readFileSync("./id_rsa.pub"); -var jwk = sshtojwk(pub); +var ssh = sshtojwk.parse(pub); -console.info(jwk); +console.info(ssh.jwk); ``` Legal diff --git a/lib/ssh-parser.js b/lib/ssh-parser.js index 752e823..6db164d 100644 --- a/lib/ssh-parser.js +++ b/lib/ssh-parser.js @@ -8,7 +8,7 @@ SSH.parse = function (ssh) { var result = { type: ssh[0], jwk: null, comment: ssh[2] || '' }; var buf = Enc.base64ToBuf(ssh[1]); - var els = SSH.parseElements(buf); + var els = SSH.parseElements({ bytes: buf }).elements; var typ = Enc.bufToBin(els[0]); var len; @@ -48,7 +48,8 @@ SSH.parse = function (ssh) { return result; }; -SSH.parseElements = function (buf) { +SSH.parseElements = function (ssh) { + var buf = ssh.bytes; var fulllen = buf.byteLength || buf.length; var offset = (buf.byteOffset || 0); var i = 0; @@ -78,7 +79,8 @@ SSH.parseElements = function (buf) { }).join('\n') + "invalid ssh public key length"); } - return els; + ssh.elements = els; + return ssh; }; SSH.types = { diff --git a/package.json b/package.json index 4d799e1..6935e3a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ssh-to-jwk", - "version": "1.0.0", + "version": "1.0.1", "description": "💯 SSH to JWK in a lightweight, zero-dependency library.", "homepage": "https://git.coolaj86.com/coolaj86/ssh-to-jwk.js", "main": "index.js",