coolaj86
/
old-keypairs.js
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

v1.2.14: use try/catch on PEM import

This commit is contained in:
AJ ONeal 2019-03-14 11:50:37 -06:00
parent 5dc3795a17
commit 48bee9204d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keypairs.js
View File

@ -346,10 +346,14 @@ Enc.bufToUrlBase64 = function (buf) {
// For 'rsa-compat' module only // For 'rsa-compat' module only
// PLEASE do not use these sync methods, they are deprecated // PLEASE do not use these sync methods, they are deprecated
Keypairs._importSync = function (opts) { Keypairs._importSync = function (opts) {
if ('RSA' === opts.jwk.kty) { try {
return Rasha.importSync(opts);
} else {
return Eckles.importSync(opts); return Eckles.importSync(opts);
} catch(e) {
try {
return Rasha.importSync(opts);
} catch(e) {
console.error("options.pem does not appear to be a valid RSA or ECDSA public or private key");
}
} }
}; };
// PLEASE do not use these, they are deprecated // PLEASE do not use these, they are deprecated

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "keypairs", "name": "keypairs",
"version": "1.2.13", "version": "1.2.14",
"description": "Lightweight RSA/ECDSA keypair generation and JWK <-> PEM using node's native RSA and ECDSA support", "description": "Lightweight RSA/ECDSA keypair generation and JWK <-> PEM using node's native RSA and ECDSA support",
"main": "keypairs.js", "main": "keypairs.js",
"files": [ "files": [