Cool_Tools/CyberChef
1
0
Fork 0
mirror of synced 2024-12-18 17:55:53 +01:00
Code Releases Activity

ECDSA JSON Web Signature format

Browse Source 
used e.g. by JWT
This commit is contained in:
CPlusSharp 2024-04-14 16:11:11 +02:00
parent 7e7195c291
commit 21ac516248
4 changed files with 105 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/operations/ECDSASign.mjs
View File

@ -6,6 +6,8 @@
import Operation from "../Operation.mjs"; import Operation from "../Operation.mjs";
import OperationError from "../errors/OperationError.mjs"; import OperationError from "../errors/OperationError.mjs";
import { fromHex } from "../lib/Hex.mjs";
import { toBase64 } from "../lib/Base64.mjs";
import r from "jsrsasign"; import r from "jsrsasign";
/** /**
@ -48,6 +50,7 @@ class ECDSASign extends Operation {
value: [ value: [
"ASN.1 HEX", "ASN.1 HEX",
"P1363 HEX", "P1363 HEX",
"JSON Web Signature",
"Raw JSON" "Raw JSON"
] ]
} }
@ -86,6 +89,10 @@ class ECDSASign extends Operation {
case "P1363 HEX": case "P1363 HEX":
result = r.KJUR.crypto.ECDSA.asn1SigToConcatSig(signatureASN1Hex); result = r.KJUR.crypto.ECDSA.asn1SigToConcatSig(signatureASN1Hex);
break; break;
case "JSON Web Signature":
result = r.KJUR.crypto.ECDSA.asn1SigToConcatSig(signatureASN1Hex);
result = toBase64(fromHex(result), "A-Za-z0-9-_"); // base64url
break;
case "Raw JSON": { case "Raw JSON": {
const signatureRS = r.KJUR.crypto.ECDSA.parseSigHexInHexRS(signatureASN1Hex); const signatureRS = r.KJUR.crypto.ECDSA.parseSigHexInHexRS(signatureASN1Hex);
result = JSON.stringify(signatureRS); result = JSON.stringify(signatureRS);

25
src/core/operations/ECDSASignatureConversion.mjs
View File

@ -6,6 +6,8 @@
import Operation from "../Operation.mjs"; import Operation from "../Operation.mjs";
import OperationError from "../errors/OperationError.mjs"; import OperationError from "../errors/OperationError.mjs";
import { fromBase64, toBase64 } from "../lib/Base64.mjs";
import { fromHex, toHexFast } from "../lib/Hex.mjs";
import r from "jsrsasign"; import r from "jsrsasign";
/** /**
@ -33,6 +35,7 @@ class ECDSASignatureConversion extends Operation {
"Auto", "Auto",
"ASN.1 HEX", "ASN.1 HEX",
"P1363 HEX", "P1363 HEX",
"JSON Web Signature",
"Raw JSON" "Raw JSON"
] ]
}, },
@ -42,6 +45,7 @@ class ECDSASignatureConversion extends Operation {
value: [ value: [
"ASN.1 HEX", "ASN.1 HEX",
"P1363 HEX", "P1363 HEX",
"JSON Web Signature",
"Raw JSON" "Raw JSON"
] ]
} }
@ -69,22 +73,39 @@ class ECDSASignatureConversion extends Operation {
} }
if (inputFormat === "Auto") { if (inputFormat === "Auto") {
const hexRegex = /^[a-f\d]{2,}$/gi;
if (hexRegex.test(input)) {
if (input.substring(0, 2) === "30" && r.ASN1HEX.isASN1HEX(input)) { if (input.substring(0, 2) === "30" && r.ASN1HEX.isASN1HEX(input)) {
inputFormat = "ASN.1 HEX"; inputFormat = "ASN.1 HEX";
} else { } else {
inputFormat = "P1363 HEX"; inputFormat = "P1363 HEX";
} }
} }
}
let inputBase64;
if (inputFormat === "Auto") {
try {
inputBase64 = fromBase64(input, "A-Za-z0-9-_", false);
inputFormat = "JSON Web Signature";
} catch {}
}
// convert input to ASN.1 hex // convert input to ASN.1 hex
let signatureASN1Hex; let signatureASN1Hex;
switch (inputFormat) { switch (inputFormat) {
case "Auto":
throw new OperationError("Signature format could not be detected");
case "ASN.1 HEX": case "ASN.1 HEX":
signatureASN1Hex = input; signatureASN1Hex = input;
break; break;
case "P1363 HEX": case "P1363 HEX":
signatureASN1Hex = r.KJUR.crypto.ECDSA.concatSigToASN1Sig(input); signatureASN1Hex = r.KJUR.crypto.ECDSA.concatSigToASN1Sig(input);
break; break;
case "JSON Web Signature":
if (!inputBase64) inputBase64 = fromBase64(input, "A-Za-z0-9-_");
signatureASN1Hex = r.KJUR.crypto.ECDSA.concatSigToASN1Sig(toHexFast(inputBase64));
break;
case "Raw JSON": { case "Raw JSON": {
if (!inputJson) inputJson = JSON.parse(input); if (!inputJson) inputJson = JSON.parse(input);
if (!inputJson.r) { if (!inputJson.r) {
@ -107,6 +128,10 @@ class ECDSASignatureConversion extends Operation {
case "P1363 HEX": case "P1363 HEX":
result = r.KJUR.crypto.ECDSA.asn1SigToConcatSig(signatureASN1Hex); result = r.KJUR.crypto.ECDSA.asn1SigToConcatSig(signatureASN1Hex);
break; break;
case "JSON Web Signature":
result = r.KJUR.crypto.ECDSA.asn1SigToConcatSig(signatureASN1Hex);
result = toBase64(fromHex(result), "A-Za-z0-9-_"); // base64url
break;
case "Raw JSON": { case "Raw JSON": {
const signatureRS = r.KJUR.crypto.ECDSA.parseSigHexInHexRS(signatureASN1Hex); const signatureRS = r.KJUR.crypto.ECDSA.parseSigHexInHexRS(signatureASN1Hex);
result = JSON.stringify(signatureRS); result = JSON.stringify(signatureRS);

20
src/core/operations/ECDSAVerify.mjs
View File

@ -6,6 +6,8 @@
import Operation from "../Operation.mjs"; import Operation from "../Operation.mjs";
import OperationError from "../errors/OperationError.mjs"; import OperationError from "../errors/OperationError.mjs";
import { fromBase64 } from "../lib/Base64.mjs";
import { toHexFast } from "../lib/Hex.mjs";
import r from "jsrsasign"; import r from "jsrsasign";
/** /**
@ -33,6 +35,7 @@ class ECDSAVerify extends Operation {
"Auto", "Auto",
"ASN.1 HEX", "ASN.1 HEX",
"P1363 HEX", "P1363 HEX",
"JSON Web Signature",
"Raw JSON" "Raw JSON"
] ]
}, },
@ -85,22 +88,39 @@ class ECDSAVerify extends Operation {
} }
if (inputFormat === "Auto") { if (inputFormat === "Auto") {
const hexRegex = /^[a-f\d]{2,}$/gi;
if (hexRegex.test(input)) {
if (input.substring(0, 2) === "30" && r.ASN1HEX.isASN1HEX(input)) { if (input.substring(0, 2) === "30" && r.ASN1HEX.isASN1HEX(input)) {
inputFormat = "ASN.1 HEX"; inputFormat = "ASN.1 HEX";
} else { } else {
inputFormat = "P1363 HEX"; inputFormat = "P1363 HEX";
} }
} }
}
let inputBase64;
if (inputFormat === "Auto") {
try {
inputBase64 = fromBase64(input, "A-Za-z0-9-_", false);
inputFormat = "JSON Web Signature";
} catch {}
}
// convert to ASN.1 signature // convert to ASN.1 signature
let signatureASN1Hex; let signatureASN1Hex;
switch (inputFormat) { switch (inputFormat) {
case "Auto":
throw new OperationError("Signature format could not be detected");
case "ASN.1 HEX": case "ASN.1 HEX":
signatureASN1Hex = input; signatureASN1Hex = input;
break; break;
case "P1363 HEX": case "P1363 HEX":
signatureASN1Hex = r.KJUR.crypto.ECDSA.concatSigToASN1Sig(input); signatureASN1Hex = r.KJUR.crypto.ECDSA.concatSigToASN1Sig(input);
break; break;
case "JSON Web Signature":
if (!inputBase64) inputBase64 = fromBase64(input, "A-Za-z0-9-_");
signatureASN1Hex = r.KJUR.crypto.ECDSA.concatSigToASN1Sig(toHexFast(inputBase64));
break;
case "Raw JSON": { case "Raw JSON": {
if (!inputJson) inputJson = JSON.parse(input); if (!inputJson) inputJson = JSON.parse(input);
if (!inputJson.r) { if (!inputJson.r) {

45
tests/operations/tests/ECDSA.mjs
View File

@ -31,6 +31,7 @@ gusgcAE8H6810fkJ8ZmTNiCCa6sLgR2vD1VNh2diirWgKPH4PVMKav5e6Q==
sha256: { sha256: {
asn1: "3046022100e06905608a2fa7dbda9e284c2a7959dfb68fb527a5f003b2d7975ff135145127022100b6baa253793334f8b93ea1dd622bc600124d8090babd807efe3f77b8b324388d", asn1: "3046022100e06905608a2fa7dbda9e284c2a7959dfb68fb527a5f003b2d7975ff135145127022100b6baa253793334f8b93ea1dd622bc600124d8090babd807efe3f77b8b324388d",
p1363: "e06905608a2fa7dbda9e284c2a7959dfb68fb527a5f003b2d7975ff135145127b6baa253793334f8b93ea1dd622bc600124d8090babd807efe3f77b8b324388d", p1363: "e06905608a2fa7dbda9e284c2a7959dfb68fb527a5f003b2d7975ff135145127b6baa253793334f8b93ea1dd622bc600124d8090babd807efe3f77b8b324388d",
jws: "4GkFYIovp9vanihMKnlZ37aPtSel8AOy15df8TUUUSe2uqJTeTM0-Lk-od1iK8YAEk2AkLq9gH7-P3e4syQ4jQ",
json: `{"r":"00e06905608a2fa7dbda9e284c2a7959dfb68fb527a5f003b2d7975ff135145127","s":"00b6baa253793334f8b93ea1dd622bc600124d8090babd807efe3f77b8b324388d"}` json: `{"r":"00e06905608a2fa7dbda9e284c2a7959dfb68fb527a5f003b2d7975ff135145127","s":"00b6baa253793334f8b93ea1dd622bc600124d8090babd807efe3f77b8b324388d"}`
} }
} }
@ -260,6 +261,17 @@ TestRegister.addTests([
} }
] ]
}, },
{
name: "ECDSA Verify: P-256 with SHA256 (JWS signature)",
input: P256.signature.sha256.jws,
expectedOutput: "Verified OK",
recipeConfig: [
{
"op": "ECDSA Verify",
"args": ["Auto", "SHA-256", P256.publicKey, ASCII_TEXT]
}
]
},
{ {
name: "ECDSA Verify: P-256 with SHA256 (JSON signature)", name: "ECDSA Verify: P-256 with SHA256 (JSON signature)",
input: P256.signature.sha256.json, input: P256.signature.sha256.json,
@ -339,6 +351,17 @@ TestRegister.addTests([
} }
] ]
}, },
{
name: "ECDSA Signature Conversion: ASN.1 To JWS",
input: P256.signature.sha256.asn1,
expectedOutput: P256.signature.sha256.jws,
recipeConfig: [
{
"op": "ECDSA Signature Conversion",
"args": ["Auto", "JSON Web Signature"]
}
]
},
{ {
name: "ECDSA Signature Conversion: ASN.1 To JSON", name: "ECDSA Signature Conversion: ASN.1 To JSON",
input: P256.signature.sha256.asn1, input: P256.signature.sha256.asn1,
@ -372,6 +395,17 @@ TestRegister.addTests([
} }
] ]
}, },
{
name: "ECDSA Signature Conversion: P1363 To JWS",
input: P256.signature.sha256.p1363,
expectedOutput: P256.signature.sha256.jws,
recipeConfig: [
{
"op": "ECDSA Signature Conversion",
"args": ["Auto", "JSON Web Signature"]
}
]
},
{ {
name: "ECDSA Signature Conversion: P1363 To JSON", name: "ECDSA Signature Conversion: P1363 To JSON",
input: P256.signature.sha256.p1363, input: P256.signature.sha256.p1363,
@ -405,6 +439,17 @@ TestRegister.addTests([
} }
] ]
}, },
{
name: "ECDSA Signature Conversion: JSON To JWS",
input: P256.signature.sha256.json,
expectedOutput: P256.signature.sha256.jws,
recipeConfig: [
{
"op": "ECDSA Signature Conversion",
"args": ["Auto", "JSON Web Signature"]
}
]
},
{ {
name: "ECDSA Signature Conversion: JSON To JSON", name: "ECDSA Signature Conversion: JSON To JSON",
input: P256.signature.sha256.json, input: P256.signature.sha256.json,