Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1447152

Browse files
gmarcosbgmarcosb
committedFeb 3, 2025·
Generated uzing zap_regen_all.py
1 parent 365f758 commit 1447152

File tree

141 files changed

+2170
-6274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+2170
-6274
lines changed
 

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+19-42
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ cluster AdministratorCommissioning = 60 {
12021202

12031203
/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
12041204
cluster OperationalCredentials = 62 {
1205-
revision 2;
1205+
revision 1; // NOTE: Default/not specifically set
12061206

12071207
enum CertificateChainTypeEnum : enum8 {
12081208
kDACCertificate = 1;
@@ -1228,14 +1228,12 @@ cluster OperationalCredentials = 62 {
12281228
fabric_id fabricID = 3;
12291229
node_id nodeID = 4;
12301230
char_string<32> label = 5;
1231-
optional octet_string<85> vidVerificationStatement = 6;
12321231
fabric_idx fabricIndex = 254;
12331232
}
12341233

12351234
fabric_scoped struct NOCStruct {
1236-
long_octet_string<400> noc = 1;
1237-
nullable long_octet_string<400> icac = 2;
1238-
optional long_octet_string<400> vvsc = 3;
1235+
fabric_sensitive octet_string noc = 1;
1236+
nullable fabric_sensitive octet_string icac = 2;
12391237
fabric_idx fabricIndex = 254;
12401238
}
12411239

@@ -1257,7 +1255,7 @@ cluster OperationalCredentials = 62 {
12571255
}
12581256

12591257
response struct AttestationResponse = 1 {
1260-
octet_string attestationElements = 0;
1258+
octet_string<900> attestationElements = 0;
12611259
octet_string<64> attestationSignature = 1;
12621260
}
12631261

@@ -1266,7 +1264,7 @@ cluster OperationalCredentials = 62 {
12661264
}
12671265

12681266
response struct CertificateChainResponse = 3 {
1269-
long_octet_string<600> certificate = 0;
1267+
octet_string<600> certificate = 0;
12701268
}
12711269

12721270
request struct CSRRequestRequest {
@@ -1276,20 +1274,20 @@ cluster OperationalCredentials = 62 {
12761274

12771275
response struct CSRResponse = 5 {
12781276
octet_string NOCSRElements = 0;
1279-
octet_string<64> attestationSignature = 1;
1277+
octet_string attestationSignature = 1;
12801278
}
12811279

12821280
request struct AddNOCRequest {
1283-
long_octet_string<400> NOCValue = 0;
1284-
optional long_octet_string<400> ICACValue = 1;
1281+
octet_string<400> NOCValue = 0;
1282+
optional octet_string<400> ICACValue = 1;
12851283
octet_string<16> IPKValue = 2;
12861284
int64u caseAdminSubject = 3;
12871285
vendor_id adminVendorId = 4;
12881286
}
12891287

12901288
request struct UpdateNOCRequest {
1291-
long_octet_string<400> NOCValue = 0;
1292-
optional long_octet_string<400> ICACValue = 1;
1289+
octet_string NOCValue = 0;
1290+
optional octet_string ICACValue = 1;
12931291
}
12941292

12951293
response struct NOCResponse = 8 {
@@ -1307,46 +1305,25 @@ cluster OperationalCredentials = 62 {
13071305
}
13081306

13091307
request struct AddTrustedRootCertificateRequest {
1310-
long_octet_string<400> rootCACertificate = 0;
1311-
}
1312-
1313-
request struct SetVidVerificationStatementRequest {
1314-
optional vendor_id vendorID = 0;
1315-
optional octet_string<85> vidVerificationStatement = 1;
1316-
optional long_octet_string<400> vvsc = 2;
1317-
}
1318-
1319-
request struct SignVidVerificationRequestRequest {
1320-
fabric_idx fabricIndex = 0;
1321-
octet_string<32> clientChallenge = 1;
1322-
}
1323-
1324-
response struct SignVidVerificationResponse = 14 {
1325-
fabric_idx fabricIndex = 0;
1326-
int8u fabricBindingVersion = 1;
1327-
octet_string signature = 2;
1308+
octet_string rootCACertificate = 0;
13281309
}
13291310

1330-
/** This command SHALL be generated to request the Attestation Information, in the form of an AttestationResponse Command. */
1311+
/** Sender is requesting attestation information from the receiver. */
13311312
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
1332-
/** If the CertificateType is not a valid value per CertificateChainTypeEnum then the command SHALL fail with a Status Code of INVALID_COMMAND. */
1313+
/** Sender is requesting a device attestation certificate from the receiver. */
13331314
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
1334-
/** This command SHALL be generated to execute the Node Operational CSR Procedure and subsequently return the NOCSR Information, in the form of a CSRResponse Command. */
1315+
/** Sender is requesting a certificate signing request (CSR) from the receiver. */
13351316
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
1336-
/** This command SHALL add a new NOC chain to the device and commission a new Fabric association upon successful validation of all arguments and preconditions. */
1317+
/** Sender is requesting to add the new node operational certificates. */
13371318
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1338-
/** This command SHALL replace the NOC and optional associated ICAC (if present) scoped under the accessing fabric upon successful validation of all arguments and preconditions. */
1319+
/** Sender is requesting to update the node operational certificates. */
13391320
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
1340-
/** This command SHALL be used by an Administrator to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
1321+
/** This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
13411322
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
1342-
/** This command is used by Administrators to remove a given Fabric and delete all associated fabric-scoped data. */
1323+
/** This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data. */
13431324
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
1344-
/** This command SHALL add a Trusted Root CA Certificate, provided as its Matter Certificate Encoding representation, to the TrustedRootCertificates Attribute list and SHALL ensure the next AddNOC command executed uses the provided certificate as its root of trust. */
1325+
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
13451326
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
1346-
/** This command SHALL be used to one or many of the following: */
1347-
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1348-
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given by generating the response described in Fabric Table Vendor ID Verification Procedure. */
1349-
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
13501327
}
13511328

13521329
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+19-42
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,7 @@ cluster AdministratorCommissioning = 60 {
14771477

14781478
/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
14791479
cluster OperationalCredentials = 62 {
1480-
revision 2;
1480+
revision 1; // NOTE: Default/not specifically set
14811481

14821482
enum CertificateChainTypeEnum : enum8 {
14831483
kDACCertificate = 1;
@@ -1503,14 +1503,12 @@ cluster OperationalCredentials = 62 {
15031503
fabric_id fabricID = 3;
15041504
node_id nodeID = 4;
15051505
char_string<32> label = 5;
1506-
optional octet_string<85> vidVerificationStatement = 6;
15071506
fabric_idx fabricIndex = 254;
15081507
}
15091508

15101509
fabric_scoped struct NOCStruct {
1511-
long_octet_string<400> noc = 1;
1512-
nullable long_octet_string<400> icac = 2;
1513-
optional long_octet_string<400> vvsc = 3;
1510+
fabric_sensitive octet_string noc = 1;
1511+
nullable fabric_sensitive octet_string icac = 2;
15141512
fabric_idx fabricIndex = 254;
15151513
}
15161514

@@ -1532,7 +1530,7 @@ cluster OperationalCredentials = 62 {
15321530
}
15331531

15341532
response struct AttestationResponse = 1 {
1535-
octet_string attestationElements = 0;
1533+
octet_string<900> attestationElements = 0;
15361534
octet_string<64> attestationSignature = 1;
15371535
}
15381536

@@ -1541,7 +1539,7 @@ cluster OperationalCredentials = 62 {
15411539
}
15421540

15431541
response struct CertificateChainResponse = 3 {
1544-
long_octet_string<600> certificate = 0;
1542+
octet_string<600> certificate = 0;
15451543
}
15461544

15471545
request struct CSRRequestRequest {
@@ -1551,20 +1549,20 @@ cluster OperationalCredentials = 62 {
15511549

15521550
response struct CSRResponse = 5 {
15531551
octet_string NOCSRElements = 0;
1554-
octet_string<64> attestationSignature = 1;
1552+
octet_string attestationSignature = 1;
15551553
}
15561554

15571555
request struct AddNOCRequest {
1558-
long_octet_string<400> NOCValue = 0;
1559-
optional long_octet_string<400> ICACValue = 1;
1556+
octet_string<400> NOCValue = 0;
1557+
optional octet_string<400> ICACValue = 1;
15601558
octet_string<16> IPKValue = 2;
15611559
int64u caseAdminSubject = 3;
15621560
vendor_id adminVendorId = 4;
15631561
}
15641562

15651563
request struct UpdateNOCRequest {
1566-
long_octet_string<400> NOCValue = 0;
1567-
optional long_octet_string<400> ICACValue = 1;
1564+
octet_string NOCValue = 0;
1565+
optional octet_string ICACValue = 1;
15681566
}
15691567

15701568
response struct NOCResponse = 8 {
@@ -1582,46 +1580,25 @@ cluster OperationalCredentials = 62 {
15821580
}
15831581

15841582
request struct AddTrustedRootCertificateRequest {
1585-
long_octet_string<400> rootCACertificate = 0;
1586-
}
1587-
1588-
request struct SetVidVerificationStatementRequest {
1589-
optional vendor_id vendorID = 0;
1590-
optional octet_string<85> vidVerificationStatement = 1;
1591-
optional long_octet_string<400> vvsc = 2;
1592-
}
1593-
1594-
request struct SignVidVerificationRequestRequest {
1595-
fabric_idx fabricIndex = 0;
1596-
octet_string<32> clientChallenge = 1;
1597-
}
1598-
1599-
response struct SignVidVerificationResponse = 14 {
1600-
fabric_idx fabricIndex = 0;
1601-
int8u fabricBindingVersion = 1;
1602-
octet_string signature = 2;
1583+
octet_string rootCACertificate = 0;
16031584
}
16041585

1605-
/** This command SHALL be generated to request the Attestation Information, in the form of an AttestationResponse Command. */
1586+
/** Sender is requesting attestation information from the receiver. */
16061587
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
1607-
/** If the CertificateType is not a valid value per CertificateChainTypeEnum then the command SHALL fail with a Status Code of INVALID_COMMAND. */
1588+
/** Sender is requesting a device attestation certificate from the receiver. */
16081589
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
1609-
/** This command SHALL be generated to execute the Node Operational CSR Procedure and subsequently return the NOCSR Information, in the form of a CSRResponse Command. */
1590+
/** Sender is requesting a certificate signing request (CSR) from the receiver. */
16101591
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
1611-
/** This command SHALL add a new NOC chain to the device and commission a new Fabric association upon successful validation of all arguments and preconditions. */
1592+
/** Sender is requesting to add the new node operational certificates. */
16121593
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1613-
/** This command SHALL replace the NOC and optional associated ICAC (if present) scoped under the accessing fabric upon successful validation of all arguments and preconditions. */
1594+
/** Sender is requesting to update the node operational certificates. */
16141595
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
1615-
/** This command SHALL be used by an Administrator to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
1596+
/** This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
16161597
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
1617-
/** This command is used by Administrators to remove a given Fabric and delete all associated fabric-scoped data. */
1598+
/** This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data. */
16181599
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
1619-
/** This command SHALL add a Trusted Root CA Certificate, provided as its Matter Certificate Encoding representation, to the TrustedRootCertificates Attribute list and SHALL ensure the next AddNOC command executed uses the provided certificate as its root of trust. */
1600+
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
16201601
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
1621-
/** This command SHALL be used to one or many of the following: */
1622-
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1623-
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given by generating the response described in Fabric Table Vendor ID Verification Procedure. */
1624-
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
16251602
}
16261603

16271604
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */

0 commit comments

Comments
 (0)
Please sign in to comment.