diff --git a/bin/keypairs-cli.js b/bin/keypairs-cli.js index d1aefeb..a415a17 100755 --- a/bin/keypairs-cli.js +++ b/bin/keypairs-cli.js @@ -236,6 +236,9 @@ function guess(txt, filename) { return true; } } catch(e) { + if (setJwt(txt.trim())) { + return true; + } try { var jwk = Eckles.importSync({ pem: txt }); // pem._string = txt; diff --git a/package-lock.json b/package-lock.json index 678bb65..b9114a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "keypairs-cli", - "version": "1.2.3", + "version": "1.2.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -15,9 +15,9 @@ "integrity": "sha512-auWyk/k8oSkVHaD4RxkPadKsLUcIwKgr/h8F7UZEueFDBO7BsE4y+H6IMUDbfqKIFPg/9MxV6KcBdJCmVVcxSA==" }, "keyfetch": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/keyfetch/-/keyfetch-1.1.5.tgz", - "integrity": "sha512-6ZXz6r0ejJq6nc125t+TZEgvCHxO0nbz5IqiJn6AOaNadzIp9icj+5ny2IoYhUmis2tTmTDHhPPMIXgQUptTpQ==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/keyfetch/-/keyfetch-1.1.8.tgz", + "integrity": "sha512-a8E1E25mHiv2zZnrBM6WNfQi4hG43TgVg1JG/D61WiTBAM07OJzSuy3j00H2pWPF6MCofBmA+KTzSu145nZWuA==", "requires": { "@coolaj86/urequest": "^1.3.6", "eckles": "^1.4.0", @@ -25,9 +25,9 @@ } }, "keypairs": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/keypairs/-/keypairs-1.2.8.tgz", - "integrity": "sha512-Xb/ozyZTUM687nClQ0Jp0rCrTZKVJ3IVIKsmrH0FnFRqBrbSvUSTA+/WCRq2prb+kJJec+ry9h9yKVzZ5XW51w==", + "version": "1.2.12", + "resolved": "https://registry.npmjs.org/keypairs/-/keypairs-1.2.12.tgz", + "integrity": "sha512-zYjYdDvo7G4AIkkZVM3WEJBTRUIrFzYswYNqCxcCPHUsgbBBdewSHAH1CiaQ+VA6Yb7BLEPIv8gFrRz5wJrgsw==", "requires": { "eckles": "^1.4.1", "rasha": "^1.2.4" diff --git a/package.json b/package.json index f815aca..59a38b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keypairs-cli", - "version": "1.2.4", + "version": "1.2.5", "description": "CLI for Keypairs.js", "homepage": "https://git.coolaj86.com/coolaj86/keypairs-cli.js", "main": "bin/keypairs-cli.js", @@ -30,7 +30,7 @@ "author": "AJ ONeal (https://coolaj86.com/)", "license": "MPL-2.0", "dependencies": { - "keyfetch": "1.x", - "keypairs": "^1.2.8" + "keyfetch": "^1.1.8", + "keypairs": "^1.2.12" } } diff --git a/test.sh b/test.sh new file mode 100644 index 0000000..b59a083 --- /dev/null +++ b/test.sh @@ -0,0 +1,15 @@ +set -e +echo "" +echo "" +node bin/keypairs-cli.js gen > ./fixture.ec.jwk.json 2> ./fixture.ec.jwk.pub.json +node bin/keypairs-cli.js ./fixture.ec.jwk.json pkcs8 > fixture.ec.pem +node bin/keypairs-cli.js ./fixture.ec.pem > ./fixture.ec.jwk.json + +node bin/keypairs-cli.js gen rsa > ./fixture.rsa.jwk.json 2> ./fixture.rsa.jwk.pub.json +node bin/keypairs-cli.js ./fixture.rsa.jwk.json pkcs1 > fixture.rsa.pem +node bin/keypairs-cli.js ./fixture.rsa.pem > ./fixture.rsa.jwk.json + +node bin/keypairs-cli.js ./fixture.ec.jwk.json sign https://localhost:4080 '{}' 3d > works.txt; +node bin/keypairs-cli.js ./fixture.ec.jwk.pub.json decode works.txt +#node bin/keypairs-cli.js ./fixture.ec.jwk.pub.json decode works.txt +node bin/keypairs-cli.js ./fixture.ec.jwk.json sign https://localhost:4080 '{}' 3d > works.txt;