Skip to content

Commit 4e9ec45

Browse files
gmarcosbgmarcosb
committed
Generated using ./scripts/tools/zap_regen_all.py
1 parent 51af4cb commit 4e9ec45

File tree

151 files changed

+7325
-2962
lines changed

Some content is hidden

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

151 files changed

+7325
-2962
lines changed

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

+46-23
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
213213
}
214214

215215
enum ThreeLevelAutoEnum : enum8 {
216-
kLow = 0;
217-
kMedium = 1;
218-
kHigh = 2;
219-
kAutomatic = 3;
216+
kAuto = 0;
217+
kLow = 1;
218+
kMedium = 2;
219+
kHigh = 3;
220220
}
221221

222222
bitmap TestGlobalBitmap : bitmap32 {
@@ -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 1; // NOTE: Default/not specifically set
1205+
revision 2;
12061206

12071207
enum CertificateChainTypeEnum : enum8 {
12081208
kDACCertificate = 1;
@@ -1228,12 +1228,14 @@ 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;
12311232
fabric_idx fabricIndex = 254;
12321233
}
12331234

12341235
fabric_scoped struct NOCStruct {
1235-
fabric_sensitive octet_string noc = 1;
1236-
nullable fabric_sensitive octet_string icac = 2;
1236+
long_octet_string<400> noc = 1;
1237+
nullable long_octet_string<400> icac = 2;
1238+
optional long_octet_string<400> vvsc = 3;
12371239
fabric_idx fabricIndex = 254;
12381240
}
12391241

@@ -1255,7 +1257,7 @@ cluster OperationalCredentials = 62 {
12551257
}
12561258

12571259
response struct AttestationResponse = 1 {
1258-
octet_string<900> attestationElements = 0;
1260+
octet_string attestationElements = 0;
12591261
octet_string<64> attestationSignature = 1;
12601262
}
12611263

@@ -1264,7 +1266,7 @@ cluster OperationalCredentials = 62 {
12641266
}
12651267

12661268
response struct CertificateChainResponse = 3 {
1267-
octet_string<600> certificate = 0;
1269+
long_octet_string<600> certificate = 0;
12681270
}
12691271

12701272
request struct CSRRequestRequest {
@@ -1274,20 +1276,20 @@ cluster OperationalCredentials = 62 {
12741276

12751277
response struct CSRResponse = 5 {
12761278
octet_string NOCSRElements = 0;
1277-
octet_string attestationSignature = 1;
1279+
octet_string<64> attestationSignature = 1;
12781280
}
12791281

12801282
request struct AddNOCRequest {
1281-
octet_string<400> NOCValue = 0;
1282-
optional octet_string<400> ICACValue = 1;
1283+
long_octet_string<400> NOCValue = 0;
1284+
optional long_octet_string<400> ICACValue = 1;
12831285
octet_string<16> IPKValue = 2;
12841286
int64u caseAdminSubject = 3;
12851287
vendor_id adminVendorId = 4;
12861288
}
12871289

12881290
request struct UpdateNOCRequest {
1289-
octet_string NOCValue = 0;
1290-
optional octet_string ICACValue = 1;
1291+
long_octet_string<400> NOCValue = 0;
1292+
optional long_octet_string<400> ICACValue = 1;
12911293
}
12921294

12931295
response struct NOCResponse = 8 {
@@ -1305,25 +1307,46 @@ cluster OperationalCredentials = 62 {
13051307
}
13061308

13071309
request struct AddTrustedRootCertificateRequest {
1308-
octet_string rootCACertificate = 0;
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;
13091328
}
13101329

1311-
/** Sender is requesting attestation information from the receiver. */
1330+
/** This command SHALL be generated to request the Attestation Information, in the form of an AttestationResponse Command. */
13121331
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
1313-
/** Sender is requesting a device attestation certificate from the receiver. */
1332+
/** If the CertificateType is not a valid value per CertificateChainTypeEnum then the command SHALL fail with a Status Code of INVALID_COMMAND. */
13141333
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
1315-
/** Sender is requesting a certificate signing request (CSR) from the receiver. */
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. */
13161335
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
1317-
/** Sender is requesting to add the new node operational certificates. */
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. */
13181337
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1319-
/** Sender is requesting to update the node operational certificates. */
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. */
13201339
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
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. */
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. */
13221341
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
1323-
/** This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data. */
1342+
/** This command is used by Administrators to remove a given Fabric and delete all associated fabric-scoped data. */
13241343
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
1325-
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
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. */
13261345
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;
13271350
}
13281351

13291352
/** 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

+46-23
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
213213
}
214214

215215
enum ThreeLevelAutoEnum : enum8 {
216-
kLow = 0;
217-
kMedium = 1;
218-
kHigh = 2;
219-
kAutomatic = 3;
216+
kAuto = 0;
217+
kLow = 1;
218+
kMedium = 2;
219+
kHigh = 3;
220220
}
221221

222222
bitmap TestGlobalBitmap : bitmap32 {
@@ -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 1; // NOTE: Default/not specifically set
1480+
revision 2;
14811481

14821482
enum CertificateChainTypeEnum : enum8 {
14831483
kDACCertificate = 1;
@@ -1503,12 +1503,14 @@ 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;
15061507
fabric_idx fabricIndex = 254;
15071508
}
15081509

15091510
fabric_scoped struct NOCStruct {
1510-
fabric_sensitive octet_string noc = 1;
1511-
nullable fabric_sensitive octet_string icac = 2;
1511+
long_octet_string<400> noc = 1;
1512+
nullable long_octet_string<400> icac = 2;
1513+
optional long_octet_string<400> vvsc = 3;
15121514
fabric_idx fabricIndex = 254;
15131515
}
15141516

@@ -1530,7 +1532,7 @@ cluster OperationalCredentials = 62 {
15301532
}
15311533

15321534
response struct AttestationResponse = 1 {
1533-
octet_string<900> attestationElements = 0;
1535+
octet_string attestationElements = 0;
15341536
octet_string<64> attestationSignature = 1;
15351537
}
15361538

@@ -1539,7 +1541,7 @@ cluster OperationalCredentials = 62 {
15391541
}
15401542

15411543
response struct CertificateChainResponse = 3 {
1542-
octet_string<600> certificate = 0;
1544+
long_octet_string<600> certificate = 0;
15431545
}
15441546

15451547
request struct CSRRequestRequest {
@@ -1549,20 +1551,20 @@ cluster OperationalCredentials = 62 {
15491551

15501552
response struct CSRResponse = 5 {
15511553
octet_string NOCSRElements = 0;
1552-
octet_string attestationSignature = 1;
1554+
octet_string<64> attestationSignature = 1;
15531555
}
15541556

15551557
request struct AddNOCRequest {
1556-
octet_string<400> NOCValue = 0;
1557-
optional octet_string<400> ICACValue = 1;
1558+
long_octet_string<400> NOCValue = 0;
1559+
optional long_octet_string<400> ICACValue = 1;
15581560
octet_string<16> IPKValue = 2;
15591561
int64u caseAdminSubject = 3;
15601562
vendor_id adminVendorId = 4;
15611563
}
15621564

15631565
request struct UpdateNOCRequest {
1564-
octet_string NOCValue = 0;
1565-
optional octet_string ICACValue = 1;
1566+
long_octet_string<400> NOCValue = 0;
1567+
optional long_octet_string<400> ICACValue = 1;
15661568
}
15671569

15681570
response struct NOCResponse = 8 {
@@ -1580,25 +1582,46 @@ cluster OperationalCredentials = 62 {
15801582
}
15811583

15821584
request struct AddTrustedRootCertificateRequest {
1583-
octet_string rootCACertificate = 0;
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;
15841603
}
15851604

1586-
/** Sender is requesting attestation information from the receiver. */
1605+
/** This command SHALL be generated to request the Attestation Information, in the form of an AttestationResponse Command. */
15871606
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
1588-
/** Sender is requesting a device attestation certificate from the receiver. */
1607+
/** If the CertificateType is not a valid value per CertificateChainTypeEnum then the command SHALL fail with a Status Code of INVALID_COMMAND. */
15891608
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
1590-
/** Sender is requesting a certificate signing request (CSR) from the receiver. */
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. */
15911610
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
1592-
/** Sender is requesting to add the new node operational certificates. */
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. */
15931612
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1594-
/** Sender is requesting to update the node operational certificates. */
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. */
15951614
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
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. */
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. */
15971616
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
1598-
/** This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data. */
1617+
/** This command is used by Administrators to remove a given Fabric and delete all associated fabric-scoped data. */
15991618
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
1600-
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
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. */
16011620
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;
16021625
}
16031626

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

0 commit comments

Comments
 (0)