@matter/protocol 0.16.0-alpha.0-20251110-c4c70a41b → 0.16.0-alpha.0-20251112-dba1973d5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/certificate/DeviceCertification.d.ts +1 -1
- package/dist/cjs/certificate/kinds/AttestationCertificates.js +2 -2
- package/dist/cjs/certificate/kinds/AttestationCertificates.js.map +1 -1
- package/dist/cjs/certificate/kinds/CertificationDeclaration.js +1 -1
- package/dist/cjs/certificate/kinds/CertificationDeclaration.js.map +1 -1
- package/dist/cjs/certificate/kinds/Icac.js +1 -1
- package/dist/cjs/certificate/kinds/Icac.js.map +1 -1
- package/dist/cjs/certificate/kinds/Noc.js +1 -1
- package/dist/cjs/certificate/kinds/Noc.js.map +1 -1
- package/dist/cjs/certificate/kinds/OperationalBase.js +1 -1
- package/dist/cjs/certificate/kinds/OperationalBase.js.map +1 -1
- package/dist/cjs/certificate/kinds/Rcac.js +1 -1
- package/dist/cjs/certificate/kinds/Rcac.js.map +1 -1
- package/dist/cjs/certificate/kinds/Vvsc.js +1 -1
- package/dist/cjs/certificate/kinds/Vvsc.js.map +1 -1
- package/dist/cjs/certificate/kinds/X509Base.d.ts +3 -3
- package/dist/cjs/certificate/kinds/X509Base.d.ts.map +1 -1
- package/dist/cjs/certificate/kinds/X509Base.js +4 -5
- package/dist/cjs/certificate/kinds/X509Base.js.map +1 -1
- package/dist/cjs/fabric/Fabric.d.ts +1 -1
- package/dist/cjs/session/case/CaseClient.d.ts.map +1 -1
- package/dist/cjs/session/case/CaseClient.js +2 -2
- package/dist/cjs/session/case/CaseClient.js.map +1 -1
- package/dist/cjs/session/case/CaseServer.d.ts.map +1 -1
- package/dist/cjs/session/case/CaseServer.js +2 -2
- package/dist/cjs/session/case/CaseServer.js.map +1 -1
- package/dist/esm/certificate/DeviceCertification.d.ts +1 -1
- package/dist/esm/certificate/kinds/AttestationCertificates.js +2 -2
- package/dist/esm/certificate/kinds/AttestationCertificates.js.map +1 -1
- package/dist/esm/certificate/kinds/CertificationDeclaration.js +1 -1
- package/dist/esm/certificate/kinds/CertificationDeclaration.js.map +1 -1
- package/dist/esm/certificate/kinds/Icac.js +1 -1
- package/dist/esm/certificate/kinds/Icac.js.map +1 -1
- package/dist/esm/certificate/kinds/Noc.js +1 -1
- package/dist/esm/certificate/kinds/Noc.js.map +1 -1
- package/dist/esm/certificate/kinds/OperationalBase.js +1 -1
- package/dist/esm/certificate/kinds/OperationalBase.js.map +1 -1
- package/dist/esm/certificate/kinds/Rcac.js +1 -1
- package/dist/esm/certificate/kinds/Rcac.js.map +1 -1
- package/dist/esm/certificate/kinds/Vvsc.js +1 -1
- package/dist/esm/certificate/kinds/Vvsc.js.map +1 -1
- package/dist/esm/certificate/kinds/X509Base.d.ts +3 -3
- package/dist/esm/certificate/kinds/X509Base.d.ts.map +1 -1
- package/dist/esm/certificate/kinds/X509Base.js +5 -5
- package/dist/esm/certificate/kinds/X509Base.js.map +1 -1
- package/dist/esm/fabric/Fabric.d.ts +1 -1
- package/dist/esm/session/case/CaseClient.d.ts.map +1 -1
- package/dist/esm/session/case/CaseClient.js +3 -3
- package/dist/esm/session/case/CaseClient.js.map +1 -1
- package/dist/esm/session/case/CaseServer.d.ts.map +1 -1
- package/dist/esm/session/case/CaseServer.js +11 -3
- package/dist/esm/session/case/CaseServer.js.map +1 -1
- package/package.json +6 -6
- package/src/certificate/kinds/AttestationCertificates.ts +2 -2
- package/src/certificate/kinds/CertificationDeclaration.ts +1 -1
- package/src/certificate/kinds/Icac.ts +1 -1
- package/src/certificate/kinds/Noc.ts +1 -1
- package/src/certificate/kinds/OperationalBase.ts +1 -1
- package/src/certificate/kinds/Rcac.ts +1 -1
- package/src/certificate/kinds/Vvsc.ts +1 -1
- package/src/certificate/kinds/X509Base.ts +7 -7
- package/src/session/case/CaseClient.ts +3 -3
- package/src/session/case/CaseServer.ts +12 -3
|
@@ -21,7 +21,7 @@ class OperationalBase extends X509Base {
|
|
|
21
21
|
const certBytes = DerCodec.encode({
|
|
22
22
|
certificate,
|
|
23
23
|
signAlgorithm: X962.EcdsaWithSHA256,
|
|
24
|
-
signature: DerBitString(this.signature)
|
|
24
|
+
signature: DerBitString(this.signature.der)
|
|
25
25
|
});
|
|
26
26
|
assertCertificateDerSize(certBytes);
|
|
27
27
|
return certBytes;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/certificate/kinds/OperationalBase.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAgB,cAAc,UAAU,QAAQ,MAAM,YAAY;AAClE,SAAS,gBAAgB;AACzB,SAAS,0BAA0B,wBAAkC;AAGrE,MAAM,SAAS,OAAO,IAAI,4BAA4B;AAK/C,MAAe,wBAAoD,SAAa;AAAA,EACnF,YAAY,MAAyB;AACjC,UAAM,IAAI;AACV,SAAK,eAAe;AAAA,EACxB;AAAA;AAAA;AAAA;AAAA;AAAA,EAYA,eAAe;AACX,UAAM,cAAc,KAAK,0BAA0B,KAAK,IAAI;AAC5D,UAAM,YAAY,SAAS,OAAO;AAAA,MAC9B;AAAA,MACA,eAAe,KAAK;AAAA,MACpB,WAAW,aAAa,KAAK,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAgB,cAAc,UAAU,QAAQ,MAAM,YAAY;AAClE,SAAS,gBAAgB;AACzB,SAAS,0BAA0B,wBAAkC;AAGrE,MAAM,SAAS,OAAO,IAAI,4BAA4B;AAK/C,MAAe,wBAAoD,SAAa;AAAA,EACnF,YAAY,MAAyB;AACjC,UAAM,IAAI;AACV,SAAK,eAAe;AAAA,EACxB;AAAA;AAAA;AAAA;AAAA;AAAA,EAYA,eAAe;AACX,UAAM,cAAc,KAAK,0BAA0B,KAAK,IAAI;AAC5D,UAAM,YAAY,SAAS,OAAO;AAAA,MAC9B;AAAA,MACA,eAAe,KAAK;AAAA,MACpB,WAAW,aAAa,KAAK,UAAU,GAAG;AAAA,IAC9C,CAAC;AACD,6BAAyB,SAAS;AAClC,WAAO;AAAA,EACX;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,gBAAgB;AACZ,UAAM,OAAO,KAAK;AAClB,QAAI,KAAK,aAAa,aAAa;AAC/B,YAAM,IAAI;AAAA,QACN,8EAA8E,KAAK,aAAa,UAAU;AAAA,MAC9G;AAEJ,QAAI,KAAK,uBAAuB,GAAG;AAE/B,YAAM,IAAI,iBAAiB,oCAAoC,KAAK,kBAAkB,EAAE;AAAA,IAC5F;AAEA,QAAI,KAAK,uBAAuB,GAAG;AAE/B,YAAM,IAAI,iBAAiB,qCAAqC,KAAK,kBAAkB,EAAE;AAAA,IAC7F;AAEA,QAAI,KAAK,4BAA4B,GAAG;AAEpC,YAAM,IAAI,iBAAiB,0CAA0C,KAAK,uBAAuB,EAAE;AAAA,IACvG;AAGA,QAAI,OAAO,KAAK,KAAK,OAAO,EAAE,SAAS,GAAG;AACtC,YAAM,IAAI,iBAAiB,wDAAwD;AAAA,IACvF;AACA,QAAI,OAAO,KAAK,KAAK,MAAM,EAAE,SAAS,GAAG;AACrC,YAAM,IAAI,iBAAiB,uDAAuD;AAAA,IACtF;AAIA,QAAI,KAAK,YAAY,MAAO,KAAK,OAAO;AACpC,aAAO,KAAK,gDAAgD,KAAK,YAAY,GAAI,OAAO,KAAK,KAAK,EAAE;AAAA,IAIxG;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -36,7 +36,7 @@ class Rcac extends OperationalBase {
|
|
|
36
36
|
* If the certificate is not signed, it throws a CertificateError.
|
|
37
37
|
*/
|
|
38
38
|
asSignedTlv() {
|
|
39
|
-
return OperationalCertificate.TlvRcac.encode({ ...this.cert, signature: this.signature });
|
|
39
|
+
return OperationalCertificate.TlvRcac.encode({ ...this.cert, signature: this.signature.bytes });
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
42
42
|
* Verify requirements a Matter Root certificate must fulfill.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/certificate/kinds/Rcac.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,OAAe,YAAY,iBAAiB;AACrD,SAAS,gBAAgB;AACzB,SAAS,wBAAwB;AACjC,SAAS,+BAA+B;AACxC,SAAS,8BAA8B;AACvC,SAAS,uBAAuB;AAChC,SAAS,gBAAgB;AAElB,MAAM,aAAa,gBAA6C;AAAA;AAAA,EAEnE,OAAO,QAAQ,KAAkB;AAC7B,WAAO,IAAI,KAAK,uBAAuB,QAAQ,OAAO,GAAG,CAAC;AAAA,EAC9D;AAAA;AAAA,EAGA,OAAO,SAAS,MAAmB;AAC/B,UAAM,OAAO,SAAS,qBAAqB,IAAI;AAC/C,WAAO,IAAI,KAAK,IAAmC;AAAA,EACvD;AAAA;AAAA,EAGU,iBAAiB;AACvB,UAAM;AAAA,MACF,YAAY;AAAA,QACR,kBAAkB,EAAE,KAAK;AAAA,MAC7B;AAAA,IACJ,IAAI,KAAK;AACT,QAAI,CAAC,MAAM;AACP,YAAM,IAAI,iBAAiB,gCAAgC;AAAA,IAC/D;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,cAAc;AACV,WAAO,uBAAuB,QAAQ,OAAO,EAAE,GAAG,KAAK,MAAM,WAAW,KAAK,UAAU,CAAC;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -28,7 +28,7 @@ class Vvsc extends OperationalBase {
|
|
|
28
28
|
* If the certificate is not signed, it throws a CertificateError.
|
|
29
29
|
*/
|
|
30
30
|
asSignedTlv() {
|
|
31
|
-
return OperationalCertificate.TlvVvsc.encode({ ...this.cert, signature: this.signature });
|
|
31
|
+
return OperationalCertificate.TlvVvsc.encode({ ...this.cert, signature: this.signature.bytes });
|
|
32
32
|
}
|
|
33
33
|
/**
|
|
34
34
|
* Verify requirements a Matter Intermediate CA certificate must fulfill.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/certificate/kinds/Vvsc.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAwB,kBAAkB;AAC1C,SAAS,wBAAwB;AACjC,SAAS,8BAA8B;AACvC,SAAS,uBAAuB;AAKzB,MAAM,aAAa,gBAA6C;AAAA;AAAA,EAEnE,OAAO,QAAQ,KAAkB;AAC7B,WAAO,IAAI,KAAK,uBAAuB,QAAQ,OAAO,GAAG,CAAC;AAAA,EAC9D;AAAA;AAAA,EAGU,iBAAiB;AACvB,UAAM;AAAA,MACF,YAAY;AAAA,QACR,kBAAkB,EAAE,KAAK;AAAA,MAC7B;AAAA,IACJ,IAAI,KAAK;AACT,QAAI,CAAC,MAAM;AACP,YAAM,IAAI,iBAAiB,wCAAwC;AAAA,IACvE;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,cAAc;AACV,WAAO,uBAAuB,QAAQ,OAAO,EAAE,GAAG,KAAK,MAAM,WAAW,KAAK,UAAU,CAAC;AAAA,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAwB,kBAAkB;AAC1C,SAAS,wBAAwB;AACjC,SAAS,8BAA8B;AACvC,SAAS,uBAAuB;AAKzB,MAAM,aAAa,gBAA6C;AAAA;AAAA,EAEnE,OAAO,QAAQ,KAAkB;AAC7B,WAAO,IAAI,KAAK,uBAAuB,QAAQ,OAAO,GAAG,CAAC;AAAA,EAC9D;AAAA;AAAA,EAGU,iBAAiB;AACvB,UAAM;AAAA,MACF,YAAY;AAAA,QACR,kBAAkB,EAAE,KAAK;AAAA,MAC7B;AAAA,IACJ,IAAI,KAAK;AACT,QAAI,CAAC,MAAM;AACP,YAAM,IAAI,iBAAiB,wCAAwC;AAAA,IACvE;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,cAAc;AACV,WAAO,uBAAuB,QAAQ,OAAO,EAAE,GAAG,KAAK,MAAM,WAAW,KAAK,UAAU,MAAM,CAAC;AAAA,EAClG;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,MAAM,OAAO,SAAiB;AAC1B,SAAK,cAAc;AAEnB,UAAM,EAAE,QAAQ,IAAI,KAAK;AACzB,UAAM,EAAE,MAAM,IAAI;AAGlB,QAAI,UAAU,UAAa,MAAM,QAAQ,KAAK,GAAG;AAC7C,YAAM,IAAI,iBAAiB,qCAAqC,WAAW,KAAK,KAAK,CAAC,EAAE;AAAA,IAC5F;AAGA,QAAI,YAAY,SAAS;AACrB,YAAM,IAAI,iBAAiB,4CAA4C;AAAA,IAC3E;AAGA,QAAI,cAAc,SAAS;AACvB,YAAM,IAAI,iBAAiB,8CAA8C;AAAA,IAC7E;AAGA,QAAI,2BAA2B,SAAS;AACpC,YAAM,IAAI,iBAAiB,4DAA4D;AAAA,IAC3F;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { Bytes, Crypto, DerType, Key } from "#general";
|
|
6
|
+
import { Bytes, Crypto, DerType, EcdsaSignature, Key } from "#general";
|
|
7
7
|
import { Unsigned } from "./common.js";
|
|
8
8
|
import { X509Certificate } from "./definitions/base.js";
|
|
9
9
|
/**
|
|
@@ -20,12 +20,12 @@ export declare abstract class X509Base<CT extends X509Certificate> {
|
|
|
20
20
|
* Get the signature of the certificate.
|
|
21
21
|
* If the certificate is not signed, it throws a CertificateError.
|
|
22
22
|
*/
|
|
23
|
-
get signature():
|
|
23
|
+
get signature(): EcdsaSignature;
|
|
24
24
|
/**
|
|
25
25
|
* Set the signature of the certificate.
|
|
26
26
|
* If the certificate is already signed, it throws a CertificateError.
|
|
27
27
|
*/
|
|
28
|
-
set signature(signature:
|
|
28
|
+
set signature(signature: EcdsaSignature);
|
|
29
29
|
/**
|
|
30
30
|
* Sign the certificate using the provided crypto and key.
|
|
31
31
|
* It throws a CertificateError if the certificate is already signed.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"X509Base.d.ts","sourceRoot":"","sources":["../../../../src/certificate/kinds/X509Base.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EAEL,MAAM,EAMN,OAAO,EACP,GAAG,EAMN,MAAM,UAAU,CAAC;AAElB,OAAO,EAA8C,QAAQ,EAAE,MAAM,aAAa,CAAC;AAenF,OAAO,EAAoD,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG1G;;;;GAIG;AACH,8BAAsB,QAAQ,CAAC,EAAE,SAAS,eAAe;;gBAIzC,IAAI,EAAE,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;IAOnC,IAAI,IAAI,IAAI,QAAQ,CAAC,EAAE,CAAC,CAEvB;IAED,IAAI,QAAQ,YAEX;IAED;;;OAGG;IACH,IAAI,SAAS,IAWY,
|
|
1
|
+
{"version":3,"file":"X509Base.d.ts","sourceRoot":"","sources":["../../../../src/certificate/kinds/X509Base.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EAEL,MAAM,EAMN,OAAO,EACP,cAAc,EACd,GAAG,EAMN,MAAM,UAAU,CAAC;AAElB,OAAO,EAA8C,QAAQ,EAAE,MAAM,aAAa,CAAC;AAenF,OAAO,EAAoD,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG1G;;;;GAIG;AACH,8BAAsB,QAAQ,CAAC,EAAE,SAAS,eAAe;;gBAIzC,IAAI,EAAE,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;IAOnC,IAAI,IAAI,IAAI,QAAQ,CAAC,EAAE,CAAC,CAEvB;IAED,IAAI,QAAQ,YAEX;IAED;;;OAGG;IACH,IAAI,SAAS,IAWY,cAAc,CANtC;IAED;;;OAGG;IACH,IAAI,SAAS,CAAC,SAAS,EAAE,cAAc,EAKtC;IAED;;;OAGG;IACG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU;IAI1C;;OAEG;IACH,cAAc,IAAI,KAAK;IAoMvB;;OAEG;IACH,yBAAyB,CAAC,EACtB,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,MAAM,EACN,OAAO,EACP,sBAAsB,EACtB,UAAU,GACb,EAAE,QAAQ,CAAC,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqBlB;AAED,yBAAiB,QAAQ,CAAC;IACtB;;OAEG;IACH,SAAsB,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,oCAa7E;IAqTD;;;OAGG;IACH,SAAgB,oBAAoB,CAAC,WAAW,EAAE,KAAK,GAAG,eAAe,CAiGxE;IAED;;OAEG;IACH,SAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,oCAuE1E;CACJ"}
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
DerCodec,
|
|
12
12
|
DerKey,
|
|
13
13
|
DerType,
|
|
14
|
+
EcdsaSignature,
|
|
14
15
|
PublicKey,
|
|
15
16
|
RawBytes,
|
|
16
17
|
X509,
|
|
@@ -40,7 +41,7 @@ class X509Base {
|
|
|
40
41
|
constructor(cert) {
|
|
41
42
|
this.#cert = cert;
|
|
42
43
|
if ("signature" in cert) {
|
|
43
|
-
this.#signature = cert.signature;
|
|
44
|
+
this.#signature = new EcdsaSignature(cert.signature);
|
|
44
45
|
}
|
|
45
46
|
}
|
|
46
47
|
get cert() {
|
|
@@ -313,7 +314,7 @@ class X509Base {
|
|
|
313
314
|
return DerCodec.encode({
|
|
314
315
|
request,
|
|
315
316
|
signAlgorithm: X962.EcdsaWithSHA256,
|
|
316
|
-
signature: DerBitString(await crypto.signEcdsa(key, DerCodec.encode(request)
|
|
317
|
+
signature: DerBitString((await crypto.signEcdsa(key, DerCodec.encode(request))).der)
|
|
317
318
|
});
|
|
318
319
|
}
|
|
319
320
|
X509Base2.createCertificateSigningRequest = createCertificateSigningRequest;
|
|
@@ -591,7 +592,7 @@ class X509Base {
|
|
|
591
592
|
const extensionsBytes = certElements[idx][DerKey.Bytes];
|
|
592
593
|
const extensionsSequence = DerCodec.decode(extensionsBytes);
|
|
593
594
|
const extensions = parseExtensions(extensionsSequence);
|
|
594
|
-
const signature = Bytes.of(signatureNode[DerKey.Bytes]);
|
|
595
|
+
const signature = new EcdsaSignature(Bytes.of(signatureNode[DerKey.Bytes]), "der").bytes;
|
|
595
596
|
return {
|
|
596
597
|
serialNumber,
|
|
597
598
|
signatureAlgorithm,
|
|
@@ -654,8 +655,7 @@ class X509Base {
|
|
|
654
655
|
await crypto.verifyEcdsa(
|
|
655
656
|
PublicKey(publicKey),
|
|
656
657
|
DerCodec.encode(requestNode),
|
|
657
|
-
signatureNode[DerKey.Bytes],
|
|
658
|
-
"der"
|
|
658
|
+
new EcdsaSignature(signatureNode[DerKey.Bytes], "der")
|
|
659
659
|
);
|
|
660
660
|
return publicKey;
|
|
661
661
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/certificate/kinds/X509Base.ts"],
|
|
4
|
-
"mappings": "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",
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["X509Base", "ExtensionOid", "ExtendedKeyUsageOid"]
|
|
6
6
|
}
|
|
@@ -46,7 +46,7 @@ export declare class Fabric {
|
|
|
46
46
|
get groups(): FabricGroups;
|
|
47
47
|
get accessControl(): FabricAccessControl;
|
|
48
48
|
get publicKey(): AllowSharedBufferSource;
|
|
49
|
-
sign(data: Bytes): MaybePromise<
|
|
49
|
+
sign(data: Bytes): MaybePromise<import("#general").EcdsaSignature>;
|
|
50
50
|
verifyCredentials(operationalCert: Bytes, intermediateCACert?: Bytes): Promise<void>;
|
|
51
51
|
matchesFabricIdAndRootPublicKey(fabricId: FabricId, rootPublicKey: Bytes): boolean;
|
|
52
52
|
matchesKeyPair(keyPair: Key): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CaseClient.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAS,QAAQ,
|
|
1
|
+
{"version":3,"file":"CaseClient.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAS,QAAQ,EAA0D,MAAM,UAAU,CAAC;AACnG,OAAO,EAAE,eAAe,EAAmC,MAAM,8BAA8B,CAAC;AAEhG,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAkB/E,qBAAa,UAAU;;gBAGP,QAAQ,EAAE,cAAc;IAI9B,IAAI,CAAC,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,CAAC,WAAW;;;;CAgO7G;AAED,yBAAiB,UAAU,CAAC;IACxB,UAAiB,WAAW;QACxB,sBAAsB,CAAC,EAAE,QAAQ,CAAC;QAClC,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;KAClD;CACJ"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Icac } from "#certificate/kinds/Icac.js";
|
|
7
7
|
import { Noc } from "#certificate/kinds/Noc.js";
|
|
8
|
-
import { Bytes, Logger, PublicKey, UnexpectedDataError } from "#general";
|
|
8
|
+
import { Bytes, EcdsaSignature, Logger, PublicKey, UnexpectedDataError } from "#general";
|
|
9
9
|
import { RetransmissionLimitReachedError } from "#protocol/MessageExchange.js";
|
|
10
10
|
import { ChannelStatusResponseError } from "#securechannel/SecureChannelMessenger.js";
|
|
11
11
|
import { NodeSession } from "#session/NodeSession.js";
|
|
@@ -150,7 +150,7 @@ class CaseClient {
|
|
|
150
150
|
ellipticCurvePublicKey: peerPublicKey,
|
|
151
151
|
subject: { fabricId: peerFabricIdNOCert, nodeId: peerNodeIdNOCert }
|
|
152
152
|
} = Noc.fromTlv(peerNoc).cert;
|
|
153
|
-
await crypto.verifyEcdsa(PublicKey(peerPublicKey), peerSignatureData, peerSignature);
|
|
153
|
+
await crypto.verifyEcdsa(PublicKey(peerPublicKey), peerSignatureData, new EcdsaSignature(peerSignature));
|
|
154
154
|
if (peerNodeIdNOCert !== peerNodeId) {
|
|
155
155
|
throw new UnexpectedDataError(
|
|
156
156
|
`The node ID in the peer certificate ${peerNodeIdNOCert} doesn't match the expected peer node ID ${peerNodeId}`
|
|
@@ -187,7 +187,7 @@ class CaseClient {
|
|
|
187
187
|
const encryptedData = TlvEncryptedDataSigma3.encode({
|
|
188
188
|
responderNoc: localNoc,
|
|
189
189
|
responderIcac: localIcac,
|
|
190
|
-
signature
|
|
190
|
+
signature: signature.bytes
|
|
191
191
|
});
|
|
192
192
|
const encrypted = crypto.encrypt(sigma3Key, encryptedData, TBE_DATA3_NONCE);
|
|
193
193
|
const sigma3Bytes = await messenger.sendSigma3({ encrypted });
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/session/case/CaseClient.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,YAAY;AACrB,SAAS,WAAW;AAEpB,SAAS,OAAiB,QAAQ,WAAW,2BAA2B;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["fabric", "caseAuthenticatedTags"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CaseServer.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"CaseServer.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAeH,OAAO,EAAoB,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAuB,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAoBpE,qBAAa,UAAW,YAAW,eAAe;;IAC9C,QAAQ,CAAC,EAAE,KAA8B;IACzC,QAAQ,CAAC,qBAAqB,SAAS;gBAK3B,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa;IAKtD,aAAa,CAAC,QAAQ,EAAE,eAAe;IAyPvC,KAAK;CAGd"}
|
|
@@ -4,7 +4,15 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Noc } from "#certificate/kinds/Noc.js";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
Bytes,
|
|
9
|
+
CryptoDecryptError,
|
|
10
|
+
Diagnostic,
|
|
11
|
+
EcdsaSignature,
|
|
12
|
+
Logger,
|
|
13
|
+
PublicKey,
|
|
14
|
+
UnexpectedDataError
|
|
15
|
+
} from "#general";
|
|
8
16
|
import { NodeSession } from "#session/NodeSession.js";
|
|
9
17
|
import { SECURE_CHANNEL_PROTOCOL_ID, SecureChannelStatusCode } from "#types";
|
|
10
18
|
import { FabricNotFoundError } from "../../fabric/FabricManager.js";
|
|
@@ -155,7 +163,7 @@ class CaseServer {
|
|
|
155
163
|
const encryptedData = TlvEncryptedDataSigma2.encode({
|
|
156
164
|
responderNoc: nodeOpCert,
|
|
157
165
|
responderIcac: intermediateCACert,
|
|
158
|
-
signature,
|
|
166
|
+
signature: signature.bytes,
|
|
159
167
|
resumptionId: cx.localResumptionId
|
|
160
168
|
});
|
|
161
169
|
const encrypted = crypto.encrypt(sigma2Key, encryptedData, TBE_DATA2_NONCE);
|
|
@@ -197,7 +205,7 @@ class CaseServer {
|
|
|
197
205
|
if (fabric.fabricId !== peerFabricId) {
|
|
198
206
|
throw new UnexpectedDataError(`Fabric ID mismatch: ${fabric.fabricId} !== ${peerFabricId}`);
|
|
199
207
|
}
|
|
200
|
-
await crypto.verifyEcdsa(PublicKey(peerPublicKey), peerSignatureData, peerSignature);
|
|
208
|
+
await crypto.verifyEcdsa(PublicKey(peerPublicKey), peerSignatureData, new EcdsaSignature(peerSignature));
|
|
201
209
|
const secureSessionSalt = Bytes.concat(
|
|
202
210
|
operationalIdentityProtectionKey,
|
|
203
211
|
await crypto.computeSha256([cx.bytes, sigma2Bytes, sigma3Bytes])
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/session/case/CaseServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,WAAW;AACpB,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,WAAW;AACpB;AAAA,EACI;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,mBAAmB;AAG5B,SAAS,4BAA4B,+BAA+B;AACpE,SAAwB,2BAA2B;AAGnD,SAAS,kCAAkC;AAC3C;AAAA,EAEI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,2BAA2B;AAEpC,MAAM,SAAS,OAAO,IAAI,YAAY;AAE/B,MAAM,WAAsC;AAAA,EACtC,KAAK;AAAA,EACL,wBAAwB;AAAA,EAEjC;AAAA,EACA;AAAA,EAEA,YAAY,UAA0B,SAAwB;AAC1D,SAAK,YAAY;AACjB,SAAK,WAAW;AAAA,EACpB;AAAA,EAEA,MAAM,cAAc,UAA2B;AAC3C,UAAM,YAAY,IAAI,oBAAoB,QAAQ;AAClD,QAAI;AACA,YAAM,KAAK,cAAc,SAAS;AAAA,IACtC,SAAS,OAAO;AACZ,aAAO,MAAM,mCAAmC,KAAK;AAErD,UAAI,iBAAiB,qBAAqB;AACtC,cAAM,UAAU,UAAU,wBAAwB,kBAAkB;AAAA,MACxE,WAES,EAAE,iBAAiB,6BAA6B;AACrD,cAAM,UAAU,UAAU,wBAAwB,YAAY;AAAA,MAClE;AAAA,IACJ,UAAE;AAEE,YAAM,SAAS,QAAQ,QAAQ;AAAA,IACnC;AAAA,EACJ;AAAA,EAEA,MAAM,cAAc,WAAgC;AAChD,WAAO,KAAK,iCAA8B,WAAW,IAAI,UAAU,WAAW,CAAC;AAG/E,UAAM,EAAE,aAAa,OAAO,IAAI,MAAM,UAAU,WAAW;AAC3D,UAAM,mBACF,OAAO,iBAAiB,UAAa,OAAO,uBAAuB,SAC7D,KAAK,UAAU,yBAAyB,OAAO,YAAY,IAC3D;AAEV,UAAM,UAAU,IAAI,cAAc,KAAK,SAAS,QAAQ,WAAW,aAAa,QAAQ,gBAAgB;AAGxG,QAAI,MAAM,KAAK,QAAQ,OAAO,GAAG;AAC7B;AAAA,IACJ;AAGA,QAAI,MAAM,KAAK,gBAAgB,OAAO,GAAG;AACrC;AAAA,IACJ;AAEA,WAAO;AAAA,MACH;AAAA,MACA,UAAU;AAAA,MACV,WAAW,KAAK;AAAA,QACZ,cAAc,QAAQ;AAAA,QACtB,WAAW,QAAQ;AAAA,MACvB,CAAC;AAAA,IACL;AAEA,UAAM,IAAI,oBAAoB,sCAAsC;AAAA,EACxE;AAAA,EAEA,MAAM,QAAQ,IAAmB;AAC7B,QAAI,GAAG,qBAAqB,UAAa,GAAG,kBAAkB,UAAa,GAAG,qBAAqB,QAAW;AAC1G,aAAO;AAAA,IACX;AAEA,UAAM,EAAE,cAAc,QAAQ,YAAY,sBAAsB,IAAI,GAAG;AACvE,UAAM,EAAE,OAAO,IAAI,KAAK;AACxB,UAAM,gBAAgB,MAAM,OAAO;AAAA,MAC/B;AAAA,MACA,MAAM,OAAO,GAAG,YAAY,GAAG,gBAAgB;AAAA,MAC/C;AAAA,IACJ;AAEA,QAAI;AACA,aAAO,QAAQ,eAAe,GAAG,eAAe,iBAAiB;AAAA,IACrE,SAAS,GAAG;AACR,yBAAmB,OAAO,CAAC;AAG3B,SAAG,mBAAmB,GAAG,gBAAgB;AAEzC,aAAO;AAAA,IACX;AAGA,UAAM,qBAAqB,MAAM,KAAK,UAAU,0BAA0B;AAC1E,UAAM,oBAAoB,MAAM,OAAO,GAAG,YAAY,GAAG,gBAAgB;AACzE,UAAM,gBAAgB,MAAM,KAAK,UAAU,oBAAoB;AAAA,MAC3D,WAAW;AAAA,MACX;AAAA,MACA;AAAA,MACA,eAAe,GAAG;AAAA,MAClB;AAAA,MACA,MAAM;AAAA,MACN,aAAa;AAAA,MACb,cAAc;AAAA,MACd,uBAAuB,GAAG;AAAA,MAC1B;AAAA,IACJ,CAAC;AAGD,UAAM,aAAa,MAAM,OAAO,GAAG,YAAY,GAAG,iBAAiB;AACnE,UAAM,YAAY,MAAM,OAAO,cAAc,cAAc,YAAY,eAAe;AACtF,UAAM,YAAY,OAAO,QAAQ,WAAW,IAAI,WAAW,CAAC,GAAG,iBAAiB;AAChF,QAAI;AACA,YAAM,yBAAyB,KAAK,UAAU;AAC9C,YAAM,GAAG,UAAU,iBAAiB;AAAA,QAChC,cAAc,GAAG;AAAA,QACjB;AAAA,QACA;AAAA,QACA;AAAA,MACJ,CAAC;AAAA,IACL,SAAS,OAAO;AAEZ,YAAM,cAAc,QAAQ,KAAK;AACjC,YAAM;AAAA,IACV;AAEA,gBAAY,OAAO,QAAQ,WAAW,eAAe,GAAG,WAAW,QAAQ,UAAU;AAErF,OAAG,iBAAiB,eAAe,GAAG;AAGtC,UAAM,GAAG,UAAU,eAAe,sBAAsB;AAExD,UAAM,GAAG,UAAU,MAAM;AACzB,UAAM,KAAK,UAAU,qBAAqB,GAAG,gBAAgB;AAE7D,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,gBAAgB,IAAmB;AACrC;AAAA;AAAA,MAEI,EAAE,GAAG,qBAAqB,UAAa,GAAG,kBAAkB;AAAA,MAE5D,EAAE,GAAG,qBAAqB,UAAa,GAAG,kBAAkB,UAAa,GAAG,qBAAqB;AAAA,MACnG;AACE,aAAO;AAAA,IACX;AAGA,UAAM,EAAE,OAAO,IAAI,KAAK;AACxB,UAAM,kBAAkB,OAAO,YAAY,EAAE;AAG7C,UAAM,SAAS,MAAM,KAAK,SAAS,4BAA4B,GAAG,eAAe,GAAG,UAAU;AAC9F,UAAM,EAAE,iBAAiB,YAAY,oBAAoB,iCAAiC,IAAI;AAC9F,UAAM,MAAM,MAAM,OAAO,cAAc;AACvC,UAAM,yBAAyB,IAAI;AACnC,UAAM,eAAe,MAAM,OAAO,iBAAiB,KAAK,UAAU,GAAG,iBAAiB,CAAC;AAEvF,UAAM,aAAa,MAAM;AAAA,MACrB;AAAA,MACA;AAAA,MACA;AAAA,MACA,MAAM,OAAO,cAAc,GAAG,KAAK;AAAA,IACvC;AACA,UAAM,YAAY,MAAM,OAAO,cAAc,cAAc,YAAY,WAAW;AAClF,UAAM,gBAAgB,cAAc,OAAO;AAAA,MACvC,cAAc;AAAA,MACd,eAAe;AAAA,MACf,oBAAoB;AAAA,MACpB,oBAAoB,GAAG;AAAA,IAC3B,CAAC;AACD,UAAM,YAAY,MAAM,OAAO,KAAK,aAAa;AACjD,UAAM,gBAAgB,uBAAuB,OAAO;AAAA,MAChD,cAAc;AAAA,MACd,eAAe;AAAA,MACf,WAAW,UAAU;AAAA,MACrB,cAAc,GAAG;AAAA,IACrB,CAAC;AACD,UAAM,YAAY,OAAO,QAAQ,WAAW,eAAe,eAAe;AAC1E,UAAM,qBAAqB,MAAM,KAAK,UAAU,0BAA0B;AAC1E,UAAM,cAAc,MAAM,GAAG,UAAU,WAAW;AAAA,MAC9C;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,wBAAwB,KAAK,UAAU;AAAA;AAAA,IAC3C,CAAC;AAGD,UAAM;AAAA,MACF;AAAA,MACA,QAAQ,EAAE,WAAW,cAAc;AAAA,IACvC,IAAI,MAAM,GAAG,UAAU,WAAW;AAClC,UAAM,aAAa,MAAM;AAAA,MACrB;AAAA,MACA,MAAM,OAAO,cAAc,CAAC,GAAG,OAAO,WAAW,CAAC;AAAA,IACtD;AACA,UAAM,YAAY,MAAM,OAAO,cAAc,cAAc,YAAY,WAAW;AAClF,UAAM,oBAAoB,OAAO,QAAQ,WAAW,eAAe,eAAe;AAClF,UAAM;AAAA,MACF,cAAc;AAAA,MACd,eAAe;AAAA,MACf,WAAW;AAAA,IACf,IAAI,uBAAuB,OAAO,iBAAiB;AAEnD,UAAM,OAAO,kBAAkB,eAAe,sBAAsB;AAEpE,UAAM,oBAAoB,cAAc,OAAO;AAAA,MAC3C,cAAc;AAAA,MACd,eAAe;AAAA,MACf,oBAAoB,GAAG;AAAA,MACvB,oBAAoB;AAAA,IACxB,CAAC;AACD,UAAM;AAAA,MACF,wBAAwB;AAAA,MACxB,SAAS,EAAE,UAAU,cAAc,QAAQ,YAAY,sBAAsB;AAAA,IACjF,IAAI,IAAI,QAAQ,aAAa,EAAE;AAE/B,QAAI,OAAO,aAAa,cAAc;AAClC,YAAM,IAAI,oBAAoB,uBAAuB,OAAO,QAAQ,QAAQ,YAAY,EAAE;AAAA,IAC9F;AAEA,UAAM,OAAO,YAAY,UAAU,aAAa,GAAG,mBAAmB,IAAI,eAAe,aAAa,CAAC;AAGvG,UAAM,oBAAoB,MAAM;AAAA,MAC5B;AAAA,MACA,MAAM,OAAO,cAAc,CAAC,GAAG,OAAO,aAAa,WAAW,CAAC;AAAA,IACnE;AACA,UAAM,gBAAgB,MAAM,KAAK,UAAU,oBAAoB;AAAA,MAC3D,WAAW;AAAA,MACX;AAAA,MACA;AAAA,MACA,eAAe,GAAG;AAAA,MAClB;AAAA,MACA,MAAM;AAAA,MACN,aAAa;AAAA,MACb,cAAc;AAAA,MACd,uBAAuB,GAAG;AAAA,MAC1B;AAAA,IACJ,CAAC;AAED,gBAAY,OAAO,QAAQ,OAAO,eAAe,GAAG,WAAW,QAAQ,UAAU;AAEjF,UAAM,GAAG,UAAU,YAAY;AAE/B,UAAM,mBAAmB;AAAA,MACrB;AAAA,MACA;AAAA,MACA;AAAA,MACA,cAAc,GAAG;AAAA,MACjB,mBAAmB,cAAc;AAAA,MACjC;AAAA,IACJ;AAEA,UAAM,GAAG,UAAU,MAAM;AACzB,UAAM,KAAK,UAAU,qBAAqB,gBAAgB;AAE1D,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,QAAQ;AAAA,EAEd;AACJ;AAEA,MAAM,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EAEA,YACI,QACA,WACA,OACA,QACA,kBACF;AACE,SAAK,SAAS;AACd,SAAK,YAAY;AACjB,SAAK,QAAQ;AACb,SAAK,gBAAgB,OAAO;AAC5B,SAAK,mBAAmB,OAAO;AAC/B,SAAK,gBAAgB,OAAO;AAC5B,SAAK,gBAAgB,OAAO;AAC5B,SAAK,aAAa,OAAO;AACzB,SAAK,oBAAoB,OAAO;AAChC,SAAK,oBAAoB,OAAO;AAChC,SAAK,mBAAmB;AAAA,EAC5B;AAAA,EAEA,IAAI,oBAAoB;AACpB,WAAQ,KAAK,uBAAuB,KAAK,OAAO,YAAY,EAAE;AAAA,EAClE;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/protocol",
|
|
3
|
-
"version": "0.16.0-alpha.0-
|
|
3
|
+
"version": "0.16.0-alpha.0-20251112-dba1973d5",
|
|
4
4
|
"description": "Low-level APIs for Matter interaction",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -40,13 +40,13 @@
|
|
|
40
40
|
"#*": "./src/*"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@matter/general": "0.16.0-alpha.0-
|
|
44
|
-
"@matter/model": "0.16.0-alpha.0-
|
|
45
|
-
"@matter/types": "0.16.0-alpha.0-
|
|
43
|
+
"@matter/general": "0.16.0-alpha.0-20251112-dba1973d5",
|
|
44
|
+
"@matter/model": "0.16.0-alpha.0-20251112-dba1973d5",
|
|
45
|
+
"@matter/types": "0.16.0-alpha.0-20251112-dba1973d5"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@matter/tools": "0.16.0-alpha.0-
|
|
49
|
-
"@matter/testing": "0.16.0-alpha.0-
|
|
48
|
+
"@matter/tools": "0.16.0-alpha.0-20251112-dba1973d5",
|
|
49
|
+
"@matter/testing": "0.16.0-alpha.0-20251112-dba1973d5"
|
|
50
50
|
},
|
|
51
51
|
"files": [
|
|
52
52
|
"dist/**/*",
|
|
@@ -19,7 +19,7 @@ export abstract class AttestationBaseCertificate<CT extends X509Certificate> ext
|
|
|
19
19
|
* If the certificate is already signed, it throws a CertificateError.
|
|
20
20
|
*/
|
|
21
21
|
override async sign(crypto: Crypto, key: JsonWebKey) {
|
|
22
|
-
this.signature = await crypto.signEcdsa(key, this.asUnsignedAsn1()
|
|
22
|
+
this.signature = await crypto.signEcdsa(key, this.asUnsignedAsn1());
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
/**
|
|
@@ -31,7 +31,7 @@ export abstract class AttestationBaseCertificate<CT extends X509Certificate> ext
|
|
|
31
31
|
const certBytes = DerCodec.encode({
|
|
32
32
|
certificate,
|
|
33
33
|
signAlgorithm: X962.EcdsaWithSHA256,
|
|
34
|
-
signature: DerBitString(this.signature),
|
|
34
|
+
signature: DerBitString(this.signature.der),
|
|
35
35
|
});
|
|
36
36
|
assertCertificateDerSize(certBytes);
|
|
37
37
|
return certBytes;
|
|
@@ -77,7 +77,7 @@ export class CertificationDeclaration {
|
|
|
77
77
|
subjectKeyIdentifier: ContextTaggedBytes(0, this.#subjectKeyIdentifier),
|
|
78
78
|
digestAlgorithm: SHA256_CMS,
|
|
79
79
|
signatureAlgorithm: X962.EcdsaWithSHA256,
|
|
80
|
-
signature: await crypto.signEcdsa(privateKey, this.#eContent
|
|
80
|
+
signature: (await crypto.signEcdsa(privateKey, this.#eContent)).der,
|
|
81
81
|
},
|
|
82
82
|
],
|
|
83
83
|
};
|
|
@@ -45,7 +45,7 @@ export class Icac extends OperationalBase<OperationalCertificate.Icac> {
|
|
|
45
45
|
* If the certificate is not signed, it throws a CertificateError.
|
|
46
46
|
*/
|
|
47
47
|
asSignedTlv() {
|
|
48
|
-
return OperationalCertificate.TlvIcac.encode({ ...this.cert, signature: this.signature });
|
|
48
|
+
return OperationalCertificate.TlvIcac.encode({ ...this.cert, signature: this.signature.bytes });
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
/**
|
|
@@ -46,7 +46,7 @@ export class Noc extends OperationalBase<OperationalCertificate.Noc> {
|
|
|
46
46
|
* If the certificate is not signed, it throws a CertificateError.
|
|
47
47
|
*/
|
|
48
48
|
asSignedTlv() {
|
|
49
|
-
return OperationalCertificate.TlvNoc.encode({ ...this.cert, signature: this.signature });
|
|
49
|
+
return OperationalCertificate.TlvNoc.encode({ ...this.cert, signature: this.signature.bytes });
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
/**
|
|
@@ -35,7 +35,7 @@ export abstract class OperationalBase<CT extends X509Certificate> extends X509Ba
|
|
|
35
35
|
const certBytes = DerCodec.encode({
|
|
36
36
|
certificate,
|
|
37
37
|
signAlgorithm: X962.EcdsaWithSHA256,
|
|
38
|
-
signature: DerBitString(this.signature),
|
|
38
|
+
signature: DerBitString(this.signature.der),
|
|
39
39
|
});
|
|
40
40
|
assertCertificateDerSize(certBytes);
|
|
41
41
|
return certBytes;
|
|
@@ -41,7 +41,7 @@ export class Rcac extends OperationalBase<OperationalCertificate.Rcac> {
|
|
|
41
41
|
* If the certificate is not signed, it throws a CertificateError.
|
|
42
42
|
*/
|
|
43
43
|
asSignedTlv() {
|
|
44
|
-
return OperationalCertificate.TlvRcac.encode({ ...this.cert, signature: this.signature });
|
|
44
|
+
return OperationalCertificate.TlvRcac.encode({ ...this.cert, signature: this.signature.bytes });
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
/**
|
|
@@ -35,7 +35,7 @@ export class Vvsc extends OperationalBase<OperationalCertificate.Vvsc> {
|
|
|
35
35
|
* If the certificate is not signed, it throws a CertificateError.
|
|
36
36
|
*/
|
|
37
37
|
asSignedTlv() {
|
|
38
|
-
return OperationalCertificate.TlvVvsc.encode({ ...this.cert, signature: this.signature });
|
|
38
|
+
return OperationalCertificate.TlvVvsc.encode({ ...this.cert, signature: this.signature.bytes });
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
/**
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
DerKey,
|
|
15
15
|
DerNode,
|
|
16
16
|
DerType,
|
|
17
|
+
EcdsaSignature,
|
|
17
18
|
Key,
|
|
18
19
|
PublicKey,
|
|
19
20
|
RawBytes,
|
|
@@ -46,13 +47,13 @@ import { CertificateExtension } from "./definitions/operational.js";
|
|
|
46
47
|
* from a CSR.
|
|
47
48
|
*/
|
|
48
49
|
export abstract class X509Base<CT extends X509Certificate> {
|
|
49
|
-
#signature?:
|
|
50
|
+
#signature?: EcdsaSignature;
|
|
50
51
|
#cert: Unsigned<CT>;
|
|
51
52
|
|
|
52
53
|
constructor(cert: CT | Unsigned<CT>) {
|
|
53
54
|
this.#cert = cert;
|
|
54
55
|
if ("signature" in cert) {
|
|
55
|
-
this.#signature = cert.signature;
|
|
56
|
+
this.#signature = new EcdsaSignature(cert.signature);
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
|
|
@@ -79,7 +80,7 @@ export abstract class X509Base<CT extends X509Certificate> {
|
|
|
79
80
|
* Set the signature of the certificate.
|
|
80
81
|
* If the certificate is already signed, it throws a CertificateError.
|
|
81
82
|
*/
|
|
82
|
-
set signature(signature:
|
|
83
|
+
set signature(signature: EcdsaSignature) {
|
|
83
84
|
if (this.isSigned) {
|
|
84
85
|
throw new CertificateError("Certificate is already signed");
|
|
85
86
|
}
|
|
@@ -342,7 +343,7 @@ export namespace X509Base {
|
|
|
342
343
|
return DerCodec.encode({
|
|
343
344
|
request,
|
|
344
345
|
signAlgorithm: X962.EcdsaWithSHA256,
|
|
345
|
-
signature: DerBitString(await crypto.signEcdsa(key, DerCodec.encode(request)
|
|
346
|
+
signature: DerBitString((await crypto.signEcdsa(key, DerCodec.encode(request))).der),
|
|
346
347
|
});
|
|
347
348
|
}
|
|
348
349
|
|
|
@@ -739,7 +740,7 @@ export namespace X509Base {
|
|
|
739
740
|
|
|
740
741
|
// Extract signature from BIT STRING
|
|
741
742
|
// Note: DerKey.Bytes for BIT STRING returns data without the padding byte
|
|
742
|
-
const signature = Bytes.of(signatureNode[DerKey.Bytes]);
|
|
743
|
+
const signature = new EcdsaSignature(Bytes.of(signatureNode[DerKey.Bytes]), "der").bytes;
|
|
743
744
|
|
|
744
745
|
return {
|
|
745
746
|
serialNumber,
|
|
@@ -826,8 +827,7 @@ export namespace X509Base {
|
|
|
826
827
|
await crypto.verifyEcdsa(
|
|
827
828
|
PublicKey(publicKey),
|
|
828
829
|
DerCodec.encode(requestNode),
|
|
829
|
-
signatureNode[DerKey.Bytes],
|
|
830
|
-
"der",
|
|
830
|
+
new EcdsaSignature(signatureNode[DerKey.Bytes], "der"),
|
|
831
831
|
);
|
|
832
832
|
|
|
833
833
|
return publicKey;
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
import { Icac } from "#certificate/kinds/Icac.js";
|
|
8
8
|
import { Noc } from "#certificate/kinds/Noc.js";
|
|
9
9
|
import { Fabric } from "#fabric/Fabric.js";
|
|
10
|
-
import { Bytes, Duration, Logger, PublicKey, UnexpectedDataError } from "#general";
|
|
10
|
+
import { Bytes, Duration, EcdsaSignature, Logger, PublicKey, UnexpectedDataError } from "#general";
|
|
11
11
|
import { MessageExchange, RetransmissionLimitReachedError } from "#protocol/MessageExchange.js";
|
|
12
12
|
import { ChannelStatusResponseError } from "#securechannel/SecureChannelMessenger.js";
|
|
13
13
|
import { NodeSession } from "#session/NodeSession.js";
|
|
@@ -179,7 +179,7 @@ export class CaseClient {
|
|
|
179
179
|
subject: { fabricId: peerFabricIdNOCert, nodeId: peerNodeIdNOCert },
|
|
180
180
|
} = Noc.fromTlv(peerNoc).cert;
|
|
181
181
|
|
|
182
|
-
await crypto.verifyEcdsa(PublicKey(peerPublicKey), peerSignatureData, peerSignature);
|
|
182
|
+
await crypto.verifyEcdsa(PublicKey(peerPublicKey), peerSignatureData, new EcdsaSignature(peerSignature));
|
|
183
183
|
|
|
184
184
|
if (peerNodeIdNOCert !== peerNodeId) {
|
|
185
185
|
throw new UnexpectedDataError(
|
|
@@ -220,7 +220,7 @@ export class CaseClient {
|
|
|
220
220
|
const encryptedData = TlvEncryptedDataSigma3.encode({
|
|
221
221
|
responderNoc: localNoc,
|
|
222
222
|
responderIcac: localIcac,
|
|
223
|
-
signature,
|
|
223
|
+
signature: signature.bytes,
|
|
224
224
|
});
|
|
225
225
|
const encrypted = crypto.encrypt(sigma3Key, encryptedData, TBE_DATA3_NONCE);
|
|
226
226
|
const sigma3Bytes = await messenger.sendSigma3({ encrypted });
|
|
@@ -5,7 +5,16 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { Noc } from "#certificate/kinds/Noc.js";
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
Bytes,
|
|
10
|
+
Crypto,
|
|
11
|
+
CryptoDecryptError,
|
|
12
|
+
Diagnostic,
|
|
13
|
+
EcdsaSignature,
|
|
14
|
+
Logger,
|
|
15
|
+
PublicKey,
|
|
16
|
+
UnexpectedDataError,
|
|
17
|
+
} from "#general";
|
|
9
18
|
import { NodeSession } from "#session/NodeSession.js";
|
|
10
19
|
import { SessionParametersWithDurations } from "#session/pase/PaseMessages.js";
|
|
11
20
|
import { ResumptionRecord, SessionManager } from "#session/SessionManager.js";
|
|
@@ -207,7 +216,7 @@ export class CaseServer implements ProtocolHandler {
|
|
|
207
216
|
const encryptedData = TlvEncryptedDataSigma2.encode({
|
|
208
217
|
responderNoc: nodeOpCert,
|
|
209
218
|
responderIcac: intermediateCACert,
|
|
210
|
-
signature,
|
|
219
|
+
signature: signature.bytes,
|
|
211
220
|
resumptionId: cx.localResumptionId,
|
|
212
221
|
});
|
|
213
222
|
const encrypted = crypto.encrypt(sigma2Key, encryptedData, TBE_DATA2_NONCE);
|
|
@@ -254,7 +263,7 @@ export class CaseServer implements ProtocolHandler {
|
|
|
254
263
|
throw new UnexpectedDataError(`Fabric ID mismatch: ${fabric.fabricId} !== ${peerFabricId}`);
|
|
255
264
|
}
|
|
256
265
|
|
|
257
|
-
await crypto.verifyEcdsa(PublicKey(peerPublicKey), peerSignatureData, peerSignature);
|
|
266
|
+
await crypto.verifyEcdsa(PublicKey(peerPublicKey), peerSignatureData, new EcdsaSignature(peerSignature));
|
|
258
267
|
|
|
259
268
|
// All good! Create secure session
|
|
260
269
|
const secureSessionSalt = Bytes.concat(
|