Compare commits

...

3 Commits

2 changed files with 31 additions and 5 deletions

View File

@ -240,7 +240,7 @@ Keypairs.signJws = function (opts) {
if ('EC' === opts.jwk.kty) { if ('EC' === opts.jwk.kty) {
// ECDSA JWT signatures differ from "normal" ECDSA signatures // ECDSA JWT signatures differ from "normal" ECDSA signatures
// https://tools.ietf.org/html/rfc7518#section-3.4 // https://tools.ietf.org/html/rfc7518#section-3.4
binsig = convertIfEcdsa(binsig); binsig = ecdsaAsn1SigToJoseSig(binsig);
} }
var sig = binsig.toString('base64') var sig = binsig.toString('base64')
@ -257,7 +257,7 @@ Keypairs.signJws = function (opts) {
}; };
} }
function convertIfEcdsa(binsig) { function ecdsaAsn1SigToJoseSig(binsig) {
// should have asn1 sequence header of 0x30 // should have asn1 sequence header of 0x30
if (0x30 !== binsig[0]) { throw new Error("Impossible EC SHA head marker"); } if (0x30 !== binsig[0]) { throw new Error("Impossible EC SHA head marker"); }
var index = 2; // first ecdsa "R" header byte var index = 2; // first ecdsa "R" header byte
@ -342,3 +342,25 @@ Enc.bufToUrlBase64 = function (buf) {
return Buffer.from(buf).toString('base64') return Buffer.from(buf).toString('base64')
.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, ''); .replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
}; };
// For 'rsa-compat' module only
// PLEASE do not use these sync methods, they are deprecated
Keypairs._importSync = function (opts) {
try {
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
Keypairs._exportSync = function (opts) {
if ('RSA' === opts.jwk.kty) {
return Rasha.exportSync(opts);
} else {
return Eckles.exportSync(opts);
}
};

View File

@ -1,7 +1,7 @@
{ {
"name": "keypairs", "name": "keypairs",
"version": "1.2.12", "version": "1.2.14",
"description": "Lightweight RSA/ECDSA keypair generation and JWK <-> PEM", "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": [
"bin/keypairs.js" "bin/keypairs.js"
@ -21,7 +21,11 @@
"RSA", "RSA",
"ECDSA", "ECDSA",
"PEM", "PEM",
"JWK" "JWK",
"keypair",
"crypto",
"sign",
"verify"
], ],
"author": "AJ ONeal <coolaj86@gmail.com> (https://coolaj86.com/)", "author": "AJ ONeal <coolaj86@gmail.com> (https://coolaj86.com/)",
"license": "MPL-2.0", "license": "MPL-2.0",