From f1b4ccf792760773b359dbdfd213c9ffa217e97a Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 5 Mar 2019 07:37:43 -0700 Subject: [PATCH] v1.2.3: bugfix double convert --- bin/keypairs.js | 8 ++++++-- package.json | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/keypairs.js b/bin/keypairs.js index 59d0713..cf39bc6 100755 --- a/bin/keypairs.js +++ b/bin/keypairs.js @@ -306,7 +306,9 @@ if ('gen' === opts.action || (!opts.action && !opts.names.length)) { process.exit(1); return; } - kp = Promise.resolve(readKeypair()); + var pair = readKeypair(); + pair._convert = true; + kp = Promise.resolve(); } if ('sign' === opts.action) { @@ -339,7 +341,9 @@ if ('sign' === opts.action) { }); } else { return kp.then(function (pair) { - return convertKeypair(pair); + if (pair._convert) { + return convertKeypair(pair); + } }); } diff --git a/package.json b/package.json index 6037762..0f6e4c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keypairs", - "version": "1.2.0", + "version": "1.2.2", "description": "Lightweight RSA/ECDSA keypair generation and JWK <-> PEM", "main": "keypairs.js", "files": [