Cool_Tools/CyberChef
1
0
Fork 0
mirror of synced 2024-11-27 16:10:55 +01:00
Code Releases Activity

Refactor code

Browse Source
This commit is contained in:
Robin Sandhu 2024-06-12 18:52:55 +01:00
parent 4528a1bdb6
commit e80d3d59bc
No known key found for this signature in database
GPG Key ID: 065D38DCE55F960E
1 changed files with 76 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/core/operations/ParseCSR.mjs
View File

@ -77,12 +77,12 @@ function formatSignature(sigAlg, sigHex) {
const d = new r.KJUR.crypto.DSA(); const d = new r.KJUR.crypto.DSA();
const sigParam = d.parseASN1Signature(sigHex); const sigParam = d.parseASN1Signature(sigHex);
out += ` Signature: out += ` Signature:
R: ${formatHexOntoMultiLine(sigParam[0].toString(16))} R: ${formatHexOntoMultiLine(absBigIntToHex(sigParam[0]))}
S: ${formatHexOntoMultiLine(sigParam[1].toString(16))}\n`; S: ${formatHexOntoMultiLine(absBigIntToHex(sigParam[1]))}\n`;
} else if (new RegExp("withrsa", "i").test(sigAlg)) { } else if (new RegExp("withrsa", "i").test(sigAlg)) {
out += ` Signature: ${formatHexOntoMultiLine(sigHex, false)}\n`;
} else {
out += ` Signature: ${formatHexOntoMultiLine(sigHex)}\n`; out += ` Signature: ${formatHexOntoMultiLine(sigHex)}\n`;
} else {
out += ` Signature: ${formatHexOntoMultiLine(ensureHexIsPositiveInTwosComplement(sigHex))}\n`;
} }
return chop(out); return chop(out);
@ -100,7 +100,7 @@ function formatSubjectPublicKey(publicKeyPEM) {
if (publicKey instanceof r.RSAKey) { if (publicKey instanceof r.RSAKey) {
out += ` Algorithm: RSA out += ` Algorithm: RSA
Length: ${publicKey.n.bitLength()} bits Length: ${publicKey.n.bitLength()} bits
Modulus: ${formatHexOntoMultiLine(publicKey.n.toString(16))} Modulus: ${formatHexOntoMultiLine(absBigIntToHex(publicKey.n))}
Exponent: ${publicKey.e} (0x${Utils.hex(publicKey.e)})\n`; Exponent: ${publicKey.e} (0x${Utils.hex(publicKey.e)})\n`;
} else if (publicKey instanceof r.KJUR.crypto.ECDSA) { } else if (publicKey instanceof r.KJUR.crypto.ECDSA) {
out += ` Algorithm: ECDSA out += ` Algorithm: ECDSA
@ -111,10 +111,10 @@ function formatSubjectPublicKey(publicKeyPEM) {
} else if (publicKey instanceof r.KJUR.crypto.DSA) { } else if (publicKey instanceof r.KJUR.crypto.DSA) {
out += ` Algorithm: DSA out += ` Algorithm: DSA
Length: ${publicKey.p.toString(16).length * 4} bits Length: ${publicKey.p.toString(16).length * 4} bits
Pub: ${formatHexOntoMultiLine(publicKey.y.toString(16))} Pub: ${formatHexOntoMultiLine(absBigIntToHex(publicKey.y))}
P: ${formatHexOntoMultiLine(publicKey.p.toString(16))} P: ${formatHexOntoMultiLine(absBigIntToHex(publicKey.p))}
Q: ${formatHexOntoMultiLine(publicKey.q.toString(16))} Q: ${formatHexOntoMultiLine(absBigIntToHex(publicKey.q))}
G: ${formatHexOntoMultiLine(publicKey.g.toString(16))}\n`; G: ${formatHexOntoMultiLine(absBigIntToHex(publicKey.g))}\n`;
} else { } else {
out += `unsupported public key algorithm\n`; out += `unsupported public key algorithm\n`;
} }
@ -178,19 +178,46 @@ function formatExtensionCriticalTag(extension) {
} }
/** /**
* Format hex input on multiple lines * Format string input as a comma separated hex string on multiple lines
* @param {*} hex string * @param {*} hex String
* @returns Multi-line string describing the Hex input * @returns Multi-line string describing the Hex input
*/ */
function formatHexOntoMultiLine(hex, prependZero=true) { function formatHexOntoMultiLine(hex) {
let colonSeparatedHex = chop(hex.replace(/(..)/g, "$&:")); if (hex.length % 2 !== 0) {
hex = "0" + hex
// prepend 00 if most significant bit it 1
if ((parseInt(colonSeparatedHex.substring(0, 2), 16) & 128) && prependZero) {
colonSeparatedHex = "00:" + colonSeparatedHex;
} }
return formatMultiLine(colonSeparatedHex); return formatMultiLine(chop(hex.replace(/(..)/g, "$&:")));
}
/**
* Convert BigInt to abs value in Hex
* @param {*} int BigInt
* @returns String representing absolute value in Hex
*/
function absBigIntToHex(int) {
int = int < 0n ? -int : int;
let hInt = int.toString(16);
return ensureHexIsPositiveInTwosComplement(hInt);
}
/**
* Ensure Hex String remains positive in 2's complement
* @param {*} hex String
* @returns Hex String ensuring value remains positive in 2's complement
*/
function ensureHexIsPositiveInTwosComplement(hex) {
if (hex.length % 2 !== 0) {
return "0" + hex;
}
// prepend 00 if most significant bit is 1 (sign bit)
if (hex.length >=2 && (parseInt(hex.substring(0, 2), 16) & 128)) {
hex = "00" + hex;
}
return hex
} }
/** /**
@ -232,22 +259,22 @@ function describeBasicConstraints(extension) {
function describeKeyUsage(extension) { function describeKeyUsage(extension) {
const usage = []; const usage = [];
const kuIdentifierToName = new Map([ const kuIdentifierToName = {
["digitalSignature", "Digital Signature"], digitalSignature: "Digital Signature",
["nonRepudiation", "Non-repudiation"], nonRepudiation: "Non-repudiation",
["keyEncipherment", "Key encipherment"], keyEncipherment: "Key encipherment",
["dataEncipherment", "Data encipherment"], dataEncipherment: "Data encipherment",
["keyAgreement", "Key agreement"], keyAgreement: "Key agreement",
["keyCertSign", "Key certificate signing"], keyCertSign: "Key certificate signing",
["cRLSign", "CRL signing"], cRLSign: "CRL signing",
["encipherOnly", "Encipher Only"], encipherOnly: "Encipher Only",
["decipherOnly", "Decipher Only"], decipherOnly: "Decipher Only",
]); };
if (Object.hasOwn(extension, "names")) { if (Object.hasOwn(extension, "names")) {
extension.names.forEach((ku) => { extension.names.forEach((ku) => {
if (kuIdentifierToName.has(ku)) { if (Object.hasOwn(kuIdentifierToName, ku)) {
usage.push(kuIdentifierToName.get(ku)); usage.push(kuIdentifierToName[ku]);
} else { } else {
usage.push(`unknown key usage (${ku})`); usage.push(`unknown key usage (${ku})`);
} }
@ -268,27 +295,27 @@ function describeKeyUsage(extension) {
function describeExtendedKeyUsage(extension) { function describeExtendedKeyUsage(extension) {
const usage = []; const usage = [];
const ekuIdentifierToName = new Map([ const ekuIdentifierToName = {
["serverAuth", "TLS Web Server Authentication"], "serverAuth": "TLS Web Server Authentication",
["clientAuth", "TLS Web Client Authentication"], "clientAuth": "TLS Web Client Authentication",
["codeSigning", "Code signing"], "codeSigning": "Code signing",
["emailProtection", "E-mail Protection (S/MIME)"], "emailProtection": "E-mail Protection (S/MIME)",
["timeStamping", "Trusted Timestamping"], "timeStamping": "Trusted Timestamping",
["1.3.6.1.4.1.311.2.1.21", "Microsoft Individual Code Signing"], // msCodeInd "1.3.6.1.4.1.311.2.1.21": "Microsoft Individual Code Signing", // msCodeInd
["1.3.6.1.4.1.311.2.1.22", "Microsoft Commercial Code Signing"], // msCodeCom "1.3.6.1.4.1.311.2.1.22": "Microsoft Commercial Code Signing", // msCodeCom
["1.3.6.1.4.1.311.10.3.1", "Microsoft Trust List Signing"], // msCTLSign "1.3.6.1.4.1.311.10.3.1": "Microsoft Trust List Signing", // msCTLSign
["1.3.6.1.4.1.311.10.3.3", "Microsoft Server Gated Crypto"], // msSGC "1.3.6.1.4.1.311.10.3.3": "Microsoft Server Gated Crypto", // msSGC
["1.3.6.1.4.1.311.10.3.4", "Microsoft Encrypted File System"], // msEFS "1.3.6.1.4.1.311.10.3.4": "Microsoft Encrypted File System", // msEFS
["1.3.6.1.4.1.311.20.2.2", "Microsoft Smartcard Login"], // msSmartcardLogin "1.3.6.1.4.1.311.20.2.2": "Microsoft Smartcard Login", // msSmartcardLogin
["2.16.840.1.113730.4.1", "Netscape Server Gated Crypto"], // nsSGC "2.16.840.1.113730.4.1": "Netscape Server Gated Crypto", // nsSGC
]); };
if (Object.hasOwn(extension, "array")) { if (Object.hasOwn(extension, "array")) {
extension.array.forEach((eku) => { extension.array.forEach((eku) => {
if (ekuIdentifierToName.has(eku)) { if (Object.hasOwn(ekuIdentifierToName, eku)) {
usage.push(ekuIdentifierToName.get(eku)); usage.push(ekuIdentifierToName[eku]);
} else { } else {
usage.push(`unknown extended key usage (${eku})`); usage.push(eku);
} }
}); });
} }
@ -331,7 +358,7 @@ function describeSubjectAlternativeName(extension) {
names.push(`Other: ${altName[key].oid}::${altName[key].value.utf8str.str}`); names.push(`Other: ${altName[key].oid}::${altName[key].value.utf8str.str}`);
break; break;
default: default:
names.push(`(unable to format type '${key}' name)\n`); names.push(`(unable to format SAN '${key}':${altName[key]})\n`);
} }
}); });
} }