Merge dd1139771c964a72f4fcec3e4eeb3a05ac5967f8 into 4290ea753912378913b1f3f54e0fc5720afeda5d
This commit is contained in:
MAN$I VERMA
GitHub
commit
d1e5571e2f
@ -5,6 +5,45 @@
|
||||
*/
|
||||
|
||||
import r from "jsrsasign";
|
||||
|
||||
// Register SM2 curve parameters, OID, and curve name mappings in jsrsasign
|
||||
try {
|
||||
r.crypto.ECParameterDB.regist(
|
||||
"sm2p256v1",
|
||||
256,
|
||||
"FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFF", // p
|
||||
"FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFC", // a
|
||||
"28E9FA9E9D9F5E344D5A9E4BCF6509A7F39789F515AB8F92DDBCBD414D940E93", // b
|
||||
"FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFF7203DF6B21C6052B53BBF40939D54123", // n
|
||||
"1", // h
|
||||
"32C4AE2C1F1981195F9904466A39C9948FE30BBFF2660BE1715A4589334C74C7", // gx
|
||||
"BC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0", // gy
|
||||
[]
|
||||
);
|
||||
} catch (e) {
|
||||
// If it's already registered, this is fine
|
||||
}
|
||||
|
||||
const originalGetName = r.crypto.ECDSA.getName;
|
||||
if (originalGetName) {
|
||||
r.crypto.ECDSA.getName = function(oid) {
|
||||
if (oid === "2a811ccf5501822d" || oid === "1.2.156.10197.1.301") {
|
||||
return "sm2p256v1";
|
||||
}
|
||||
return originalGetName(oid);
|
||||
};
|
||||
}
|
||||
|
||||
try {
|
||||
r.KJUR.asn1.x509.OID.registerOIDs({
|
||||
"sm2p256v1": "1.2.156.10197.1.301",
|
||||
"SM2": "1.2.156.10197.1.301",
|
||||
"SM3": "1.2.156.10197.1.401",
|
||||
"SM2-with-SM3": "1.2.156.10197.1.501"
|
||||
});
|
||||
} catch (e) {
|
||||
// ignore
|
||||
}
|
||||
import { fromBase64 } from "../lib/Base64.mjs";
|
||||
import { runHash } from "../lib/Hash.mjs";
|
||||
import { fromHex, toHex } from "../lib/Hex.mjs";
|
||||
@ -86,10 +125,21 @@ class ParseX509Certificate extends Operation {
|
||||
sn = cert.getSerialNumberHex(),
|
||||
issuer = cert.getIssuer(),
|
||||
subject = cert.getSubject(),
|
||||
pk = cert.getPublicKey(),
|
||||
pkFields = [],
|
||||
sig = cert.getSignatureValueHex();
|
||||
|
||||
let pk;
|
||||
let pkLoadError = null;
|
||||
try {
|
||||
pk = cert.getPublicKey();
|
||||
} catch (e) {
|
||||
pkLoadError = e.message || e.toString();
|
||||
pk = {
|
||||
type: "Unknown",
|
||||
error: pkLoadError
|
||||
};
|
||||
}
|
||||
|
||||
let pkStr = "",
|
||||
sigStr = "",
|
||||
extensions = "";
|
||||
@ -144,9 +194,20 @@ class ParseX509Certificate extends Operation {
|
||||
value: pk.e + " (0x" + pk.e.toString(16) + ")"
|
||||
});
|
||||
} else {
|
||||
let spkiHex = "";
|
||||
try {
|
||||
spkiHex = cert.getPublicKeyHex();
|
||||
} catch (err) {}
|
||||
|
||||
if (spkiHex) {
|
||||
pkFields.push({
|
||||
key: "Raw SPKI Hex",
|
||||
value: formatByteStr(spkiHex, 16, 18)
|
||||
});
|
||||
}
|
||||
pkFields.push({
|
||||
key: "Error",
|
||||
value: "Unknown Public Key type"
|
||||
value: pkLoadError || "Unknown Public Key type"
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
190
tests/operations/tests/ParseX509Certificate.mjs
Normal file
190
tests/operations/tests/ParseX509Certificate.mjs
Normal file
@ -0,0 +1,190 @@
|
||||
/**
|
||||
* Parse X.509 certificate Tests
|
||||
*
|
||||
* @author n1474335 [n1474335@gmail.com]
|
||||
* @copyright Crown Copyright 2026
|
||||
* @license Apache-2.0
|
||||
*
|
||||
*/
|
||||
import TestRegister from "../../lib/TestRegister.mjs";
|
||||
|
||||
const RSA_CERT = `-----BEGIN CERTIFICATE-----
|
||||
MIIBfTCCASegAwIBAgIUeisK5Nwss2DGg5PCs4uSxxXyyNkwDQYJKoZIhvcNAQEL
|
||||
BQAwEzERMA8GA1UEAwwIUlNBIHRlc3QwHhcNMjExMTE5MTcyMDI2WhcNMzExMTE3
|
||||
MTcyMDI2WjATMREwDwYDVQQDDAhSU0EgdGVzdDBcMA0GCSqGSIb3DQEBAQUAA0sA
|
||||
MEgCQQDyq9A6emHSLczn5Omu5muy+AReC53pTGCrW6Bi65OoobahT2RUSzXCYuvB
|
||||
757fLLTKz+dLeo6sFkNhIzHZI+n7AgMBAAGjUzBRMB0GA1UdDgQWBBRO+jvkqq5p
|
||||
pnQgwMMnRoun6e7eiTAfBgNVHSMEGDAWgBRO+jvkqq5ppnQgwMMnRoun6e7eiTAP
|
||||
BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA0EAR/5HAZM5qBhU/ezDUIFx
|
||||
gmUGoFbIb5kJD41YCnaSdrgWglh4He4melSs42G/oxBBjuCJ0bUpqWnLl+lJkv1z
|
||||
IA==
|
||||
-----END CERTIFICATE-----`;
|
||||
|
||||
const EC_P256_CERT = `-----BEGIN CERTIFICATE-----
|
||||
MIIBfzCCASWgAwIBAgIUK4H8J3Hr7NpRLPrACj8Pje4JJJ0wCgYIKoZIzj0EAwIw
|
||||
FTETMBEGA1UEAwwKUC0yNTYgdGVzdDAeFw0yMTExMTkxNzE5NDVaFw0zMTExMTcx
|
||||
NzE5NDVaMBUxEzARBgNVBAMMClAtMjU2IHRlc3QwWTATBgcqhkjOPQIBBggqhkjO
|
||||
PQMBBwNCAAQNRzwDQQM0qgJgg9YwfPXJTOoTmYmC6yBwATwfrzXR+QnxmZM2IIJr
|
||||
qwuBHa8PVU2HZ2KKtaAo8fg9Uwpq/l7po1MwUTAdBgNVHQ4EFgQU/SxodXrpkybM
|
||||
gcIgkxnRKd7HMzowHwYDVR0jBBgwFoAU/SxodXrpkybMgcIgkxnRKd7HMzowDwYD
|
||||
VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNIADBFAiBU9PrOa/kXCpTTBInRf/sN
|
||||
ac2iDHmbdpWzcXI+xLKNYAIhAIRR1LRSHVwOTLQ/iBXd+8LCkm5aTB27RW46LN80
|
||||
ylxt
|
||||
-----END CERTIFICATE-----`;
|
||||
|
||||
const SM2_CERT = `-----BEGIN CERTIFICATE-----
|
||||
MIIBHTCBxKADAgECAgEBMAoGCCqGSM49BAMCMBYxFDASBgNVBAMMC1NNMiBUZXN0
|
||||
IENBMB4XDTI2MDcwMjAwMDAwMFoXDTM2MDcwMjAwMDAwMFowGzEZMBcGA1UEAwwQ
|
||||
U00yIFRlc3QgU3ViamVjdDBZMBMGByqGSM49AgEGCCqBHM9VAYItA0IABFet0rTa
|
||||
GlGtJsARgxXwBBZHJy/S2/9uIgtNaFZ3DAfkVLixjqpKO7OswIB0ILyOwU7x+sHh
|
||||
A7CnIGSL91qVB9swCgYIKoZIzj0EAwIDSAAwRQIgXvZHt7/twdWzA9RBYxMit1s0
|
||||
YWESFEEienczvwA9y+ICIQC2NCJsd8nq4pAEcX+XebuTUn/NkuSlxWC+a4/KvzTi
|
||||
Uw==
|
||||
-----END CERTIFICATE-----`;
|
||||
|
||||
const EXPECTED_RSA = `Version: 3 (0x02)
|
||||
Serial number: 697456755083946472681082503344832984412880816345 (0x7a2b0ae4dc2cb360c68393c2b38b92c715f2c8d9)
|
||||
Algorithm ID: SHA256withRSA
|
||||
Validity
|
||||
Not Before: 19/11/2021 17:20:26 (dd-mm-yyyy hh:mm:ss) (211119172026Z)
|
||||
Not After: 17/11/2031 17:20:26 (dd-mm-yyyy hh:mm:ss) (311117172026Z)
|
||||
Issuer
|
||||
CN = RSA test
|
||||
Subject
|
||||
CN = RSA test
|
||||
Fingerprints
|
||||
MD5: 0807638eee1403fbcacc1b6d25e00d95
|
||||
SHA1: cae48f6fac74e143e10e0d8db1597385d62f24c4
|
||||
SHA256: cd9125e6e7caa729c766e4d9ed84ef44e6bc57d00614c5f051af661e9ce3e436
|
||||
Public Key
|
||||
Algorithm: RSA
|
||||
Length: 512 bits
|
||||
Modulus: f2:ab:d0:3a:7a:61:d2:2d:cc:e7:e4:e9:ae:e6:6b:b2:
|
||||
f8:04:5e:0b:9d:e9:4c:60:ab:5b:a0:62:eb:93:a8:a1:
|
||||
b6:a1:4f:64:54:4b:35:c2:62:eb:c1:ef:9e:df:2c:b4:
|
||||
ca:cf:e7:4b:7a:8e:ac:16:43:61:23:31:d9:23:e9:fb
|
||||
Exponent: 65537 (0x10001)
|
||||
Certificate Signature
|
||||
Algorithm: SHA256withRSA
|
||||
Signature: 47:fe:47:01:93:39:a8:18:54:fd:ec:c3:50:81:71:82:
|
||||
65:06:a0:56:c8:6f:99:09:0f:8d:58:0a:76:92:76:b8:
|
||||
16:82:58:78:1d:ee:26:7a:54:ac:e3:61:bf:a3:10:41:
|
||||
8e:e0:89:d1:b5:29:a9:69:cb:97:e9:49:92:fd:73:20
|
||||
|
||||
Extensions
|
||||
subjectKeyIdentifier :
|
||||
4efa3be4aaae69a67420c0c327468ba7e9eede89
|
||||
authorityKeyIdentifier :
|
||||
kid=4efa3be4aaae69a67420c0c327468ba7e9eede89
|
||||
basicConstraints CRITICAL:
|
||||
cA=true
|
||||
`;
|
||||
|
||||
const EXPECTED_EC = `Version: 3 (0x02)
|
||||
Serial number: 248385364994530420657018049397175541334954026141 (0x2b81fc2771ebecda512cfac00a3f0f8dee09249d)
|
||||
Algorithm ID: SHA256withECDSA
|
||||
Validity
|
||||
Not Before: 19/11/2021 17:19:45 (dd-mm-yyyy hh:mm:ss) (211119171945Z)
|
||||
Not After: 17/11/2031 17:19:45 (dd-mm-yyyy hh:mm:ss) (311117171945Z)
|
||||
Issuer
|
||||
CN = P-256 test
|
||||
Subject
|
||||
CN = P-256 test
|
||||
Fingerprints
|
||||
MD5: d58a07c73ac5353acd1799174472478f
|
||||
SHA1: 562feb8b1a2c9808a98b350557ab80eab619ed48
|
||||
SHA256: 584662f4632e221a1d58f91f772fb6f617af7aa3d8542281af2efcc93c1b79eb
|
||||
Public Key
|
||||
Algorithm: EC
|
||||
Curve Name: secp256r1
|
||||
Length: 256 bits
|
||||
pub: 04:0d:47:3c:03:41:03:34:aa:02:60:83:d6:30:7c:f5:
|
||||
c9:4c:ea:13:99:89:82:eb:20:70:01:3c:1f:af:35:d1:
|
||||
f9:09:f1:99:93:36:20:82:6b:ab:0b:81:1d:af:0f:55:
|
||||
4d:87:67:62:8a:b5:a0:28:f1:f8:3d:53:0a:6a:fe:5e:
|
||||
e9
|
||||
Certificate Signature
|
||||
Algorithm: SHA256withECDSA
|
||||
r: 54:f4:fa:ce:6b:f9:17:0a:94:d3:04:89:d1:7f:fb:0d:
|
||||
69:cd:a2:0c:79:9b:76:95:b3:71:72:3e:c4:b2:8d:60
|
||||
s: 76:95:b3:71:72:3e:c4:b2:8d:60:02:21:00:84:51:d4:
|
||||
b4:52:1d:5c:0e:4c:b4:3f:88:15:dd:fb:c2:c2:92:6e:
|
||||
5a:4c:1d:bb:45:6e:3a:2c:df:34:ca:5c:6d
|
||||
|
||||
Extensions
|
||||
subjectKeyIdentifier :
|
||||
fd2c68757ae99326cc81c2209319d129dec7333a
|
||||
authorityKeyIdentifier :
|
||||
kid=fd2c68757ae99326cc81c2209319d129dec7333a
|
||||
basicConstraints CRITICAL:
|
||||
cA=true
|
||||
`;
|
||||
|
||||
const EXPECTED_SM2 = `Version: 3 (0x02)
|
||||
Serial number: 1 (0x01)
|
||||
Algorithm ID: SHA256withECDSA
|
||||
Validity
|
||||
Not Before: 02/07/2026 00:00:00 (dd-mm-yyyy hh:mm:ss) (260702000000Z)
|
||||
Not After: 02/07/2036 00:00:00 (dd-mm-yyyy hh:mm:ss) (360702000000Z)
|
||||
Issuer
|
||||
CN = SM2 Test CA
|
||||
Subject
|
||||
CN = SM2 Test Subject
|
||||
Fingerprints
|
||||
MD5: f031b4450bf2b81af03110be931ca64d
|
||||
SHA1: 36633862960380c974763006ad526aaa0d9d2e4b
|
||||
SHA256: e356fcd4b9f405552d504ce832e34a91afba1fea795380941e241e3b449c6bee
|
||||
Public Key
|
||||
Algorithm: EC
|
||||
Curve Name: sm2p256v1
|
||||
Length: 256 bits
|
||||
pub: 04:57:ad:d2:b4:da:1a:51:ad:26:c0:11:83:15:f0:04:
|
||||
16:47:27:2f:d2:db:ff:6e:22:0b:4d:68:56:77:0c:07:
|
||||
e4:54:b8:b1:8e:aa:4a:3b:b3:ac:c0:80:74:20:bc:8e:
|
||||
c1:4e:f1:fa:c1:e1:03:b0:a7:20:64:8b:f7:5a:95:07:
|
||||
db
|
||||
Certificate Signature
|
||||
Algorithm: SHA256withECDSA
|
||||
r: 5e:f6:47:b7:bf:ed:c1:d5:b3:03:d4:41:63:13:22:b7:
|
||||
5b:34:61:61:12:14:41:22:7a:77:33:bf:00:3d:cb:e2
|
||||
s: 41:22:7a:77:33:bf:00:3d:cb:e2:02:21:00:b6:34:22:
|
||||
6c:77:c9:ea
|
||||
|
||||
Extensions
|
||||
`;
|
||||
|
||||
TestRegister.addTests([
|
||||
{
|
||||
name: "Parse X.509 certificate: RSA",
|
||||
input: RSA_CERT,
|
||||
expectedOutput: EXPECTED_RSA,
|
||||
recipeConfig: [
|
||||
{
|
||||
op: "Parse X.509 certificate",
|
||||
args: ["PEM"],
|
||||
}
|
||||
],
|
||||
},
|
||||
{
|
||||
name: "Parse X.509 certificate: EC (secp256r1)",
|
||||
input: EC_P256_CERT,
|
||||
expectedOutput: EXPECTED_EC,
|
||||
recipeConfig: [
|
||||
{
|
||||
op: "Parse X.509 certificate",
|
||||
args: ["PEM"],
|
||||
}
|
||||
],
|
||||
},
|
||||
{
|
||||
name: "Parse X.509 certificate: SM2 (sm2p256v1)",
|
||||
input: SM2_CERT,
|
||||
expectedOutput: EXPECTED_SM2,
|
||||
recipeConfig: [
|
||||
{
|
||||
op: "Parse X.509 certificate",
|
||||
args: ["PEM"],
|
||||
}
|
||||
],
|
||||
},
|
||||
]);
|
||||
Loading…
x
Reference in New Issue
Block a user