Skip to content

Commit cccce01

Browse files
bzbarsky-applebzbarsky-apple
authored
Align naming in Operational Credentials cluster with the spec. (#24472)
* Align naming in Operational Credentials cluster with the spec. * Regenerate generated files.
1 parent de765cf commit cccce01

File tree

92 files changed

+1600
-1000
lines changed

Some content is hidden

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

92 files changed

+1600
-1000
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+16-11
Original file line numberDiff line numberDiff line change
@@ -1577,8 +1577,13 @@ server cluster AdministratorCommissioning = 60 {
15771577
}
15781578

15791579
server cluster OperationalCredentials = 62 {
1580-
enum OperationalCertStatus : ENUM8 {
1581-
kSuccess = 0;
1580+
enum CertificateChainTypeEnum : ENUM8 {
1581+
kDACCertificate = 1;
1582+
kPAICertificate = 2;
1583+
}
1584+
1585+
enum NodeOperationalCertStatusEnum : ENUM8 {
1586+
kOk = 0;
15821587
kInvalidPublicKey = 1;
15831588
kInvalidNodeOpId = 2;
15841589
kInvalidNOC = 3;
@@ -1596,17 +1601,17 @@ server cluster OperationalCredentials = 62 {
15961601
fabric_idx fabricIndex = 254;
15971602
}
15981603

1599-
fabric_scoped struct FabricDescriptor {
1604+
fabric_scoped struct FabricDescriptorStruct {
16001605
octet_string<65> rootPublicKey = 1;
1601-
vendor_id vendorId = 2;
1602-
fabric_id fabricId = 3;
1603-
node_id nodeId = 4;
1606+
vendor_id vendorID = 2;
1607+
fabric_id fabricID = 3;
1608+
node_id nodeID = 4;
16041609
char_string<32> label = 5;
16051610
fabric_idx fabricIndex = 254;
16061611
}
16071612

16081613
readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
1609-
readonly attribute FabricDescriptor fabrics[] = 1;
1614+
readonly attribute FabricDescriptorStruct fabrics[] = 1;
16101615
readonly attribute int8u supportedFabrics = 2;
16111616
readonly attribute int8u commissionedFabrics = 3;
16121617
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
@@ -1619,7 +1624,7 @@ server cluster OperationalCredentials = 62 {
16191624
}
16201625

16211626
request struct CertificateChainRequestRequest {
1622-
INT8U certificateType = 0;
1627+
CertificateChainTypeEnum certificateType = 0;
16231628
}
16241629

16251630
request struct CSRRequestRequest {
@@ -1649,12 +1654,12 @@ server cluster OperationalCredentials = 62 {
16491654
}
16501655

16511656
request struct AddTrustedRootCertificateRequest {
1652-
OCTET_STRING rootCertificate = 0;
1657+
OCTET_STRING rootCACertificate = 0;
16531658
}
16541659

16551660
response struct AttestationResponse = 1 {
16561661
OCTET_STRING attestationElements = 0;
1657-
OCTET_STRING signature = 1;
1662+
OCTET_STRING attestationSignature = 1;
16581663
}
16591664

16601665
response struct CertificateChainResponse = 3 {
@@ -1667,7 +1672,7 @@ server cluster OperationalCredentials = 62 {
16671672
}
16681673

16691674
response struct NOCResponse = 8 {
1670-
OperationalCertStatus statusCode = 0;
1675+
NodeOperationalCertStatusEnum statusCode = 0;
16711676
optional fabric_idx fabricIndex = 1;
16721677
optional CHAR_STRING debugText = 2;
16731678
}

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+16-11
Original file line numberDiff line numberDiff line change
@@ -1422,8 +1422,13 @@ server cluster AdministratorCommissioning = 60 {
14221422
}
14231423

14241424
server cluster OperationalCredentials = 62 {
1425-
enum OperationalCertStatus : ENUM8 {
1426-
kSuccess = 0;
1425+
enum CertificateChainTypeEnum : ENUM8 {
1426+
kDACCertificate = 1;
1427+
kPAICertificate = 2;
1428+
}
1429+
1430+
enum NodeOperationalCertStatusEnum : ENUM8 {
1431+
kOk = 0;
14271432
kInvalidPublicKey = 1;
14281433
kInvalidNodeOpId = 2;
14291434
kInvalidNOC = 3;
@@ -1441,17 +1446,17 @@ server cluster OperationalCredentials = 62 {
14411446
fabric_idx fabricIndex = 254;
14421447
}
14431448

1444-
fabric_scoped struct FabricDescriptor {
1449+
fabric_scoped struct FabricDescriptorStruct {
14451450
octet_string<65> rootPublicKey = 1;
1446-
vendor_id vendorId = 2;
1447-
fabric_id fabricId = 3;
1448-
node_id nodeId = 4;
1451+
vendor_id vendorID = 2;
1452+
fabric_id fabricID = 3;
1453+
node_id nodeID = 4;
14491454
char_string<32> label = 5;
14501455
fabric_idx fabricIndex = 254;
14511456
}
14521457

14531458
readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
1454-
readonly attribute FabricDescriptor fabrics[] = 1;
1459+
readonly attribute FabricDescriptorStruct fabrics[] = 1;
14551460
readonly attribute int8u supportedFabrics = 2;
14561461
readonly attribute int8u commissionedFabrics = 3;
14571462
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
@@ -1464,7 +1469,7 @@ server cluster OperationalCredentials = 62 {
14641469
}
14651470

14661471
request struct CertificateChainRequestRequest {
1467-
INT8U certificateType = 0;
1472+
CertificateChainTypeEnum certificateType = 0;
14681473
}
14691474

14701475
request struct CSRRequestRequest {
@@ -1494,12 +1499,12 @@ server cluster OperationalCredentials = 62 {
14941499
}
14951500

14961501
request struct AddTrustedRootCertificateRequest {
1497-
OCTET_STRING rootCertificate = 0;
1502+
OCTET_STRING rootCACertificate = 0;
14981503
}
14991504

15001505
response struct AttestationResponse = 1 {
15011506
OCTET_STRING attestationElements = 0;
1502-
OCTET_STRING signature = 1;
1507+
OCTET_STRING attestationSignature = 1;
15031508
}
15041509

15051510
response struct CertificateChainResponse = 3 {
@@ -1512,7 +1517,7 @@ server cluster OperationalCredentials = 62 {
15121517
}
15131518

15141519
response struct NOCResponse = 8 {
1515-
OperationalCertStatus statusCode = 0;
1520+
NodeOperationalCertStatusEnum statusCode = 0;
15161521
optional fabric_idx fabricIndex = 1;
15171522
optional CHAR_STRING debugText = 2;
15181523
}

‎examples/bridge-app/bridge-common/bridge-app.matter

+16-11
Original file line numberDiff line numberDiff line change
@@ -1252,8 +1252,13 @@ server cluster AdministratorCommissioning = 60 {
12521252
}
12531253

12541254
server cluster OperationalCredentials = 62 {
1255-
enum OperationalCertStatus : ENUM8 {
1256-
kSuccess = 0;
1255+
enum CertificateChainTypeEnum : ENUM8 {
1256+
kDACCertificate = 1;
1257+
kPAICertificate = 2;
1258+
}
1259+
1260+
enum NodeOperationalCertStatusEnum : ENUM8 {
1261+
kOk = 0;
12571262
kInvalidPublicKey = 1;
12581263
kInvalidNodeOpId = 2;
12591264
kInvalidNOC = 3;
@@ -1271,17 +1276,17 @@ server cluster OperationalCredentials = 62 {
12711276
fabric_idx fabricIndex = 254;
12721277
}
12731278

1274-
fabric_scoped struct FabricDescriptor {
1279+
fabric_scoped struct FabricDescriptorStruct {
12751280
octet_string<65> rootPublicKey = 1;
1276-
vendor_id vendorId = 2;
1277-
fabric_id fabricId = 3;
1278-
node_id nodeId = 4;
1281+
vendor_id vendorID = 2;
1282+
fabric_id fabricID = 3;
1283+
node_id nodeID = 4;
12791284
char_string<32> label = 5;
12801285
fabric_idx fabricIndex = 254;
12811286
}
12821287

12831288
readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
1284-
readonly attribute FabricDescriptor fabrics[] = 1;
1289+
readonly attribute FabricDescriptorStruct fabrics[] = 1;
12851290
readonly attribute int8u supportedFabrics = 2;
12861291
readonly attribute int8u commissionedFabrics = 3;
12871292
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
@@ -1297,7 +1302,7 @@ server cluster OperationalCredentials = 62 {
12971302
}
12981303

12991304
request struct CertificateChainRequestRequest {
1300-
INT8U certificateType = 0;
1305+
CertificateChainTypeEnum certificateType = 0;
13011306
}
13021307

13031308
request struct CSRRequestRequest {
@@ -1327,12 +1332,12 @@ server cluster OperationalCredentials = 62 {
13271332
}
13281333

13291334
request struct AddTrustedRootCertificateRequest {
1330-
OCTET_STRING rootCertificate = 0;
1335+
OCTET_STRING rootCACertificate = 0;
13311336
}
13321337

13331338
response struct AttestationResponse = 1 {
13341339
OCTET_STRING attestationElements = 0;
1335-
OCTET_STRING signature = 1;
1340+
OCTET_STRING attestationSignature = 1;
13361341
}
13371342

13381343
response struct CertificateChainResponse = 3 {
@@ -1345,7 +1350,7 @@ server cluster OperationalCredentials = 62 {
13451350
}
13461351

13471352
response struct NOCResponse = 8 {
1348-
OperationalCertStatus statusCode = 0;
1353+
NodeOperationalCertStatusEnum statusCode = 0;
13491354
optional fabric_idx fabricIndex = 1;
13501355
optional CHAR_STRING debugText = 2;
13511356
}

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+16-11
Original file line numberDiff line numberDiff line change
@@ -1104,8 +1104,13 @@ server cluster AdministratorCommissioning = 60 {
11041104
}
11051105

11061106
server cluster OperationalCredentials = 62 {
1107-
enum OperationalCertStatus : ENUM8 {
1108-
kSuccess = 0;
1107+
enum CertificateChainTypeEnum : ENUM8 {
1108+
kDACCertificate = 1;
1109+
kPAICertificate = 2;
1110+
}
1111+
1112+
enum NodeOperationalCertStatusEnum : ENUM8 {
1113+
kOk = 0;
11091114
kInvalidPublicKey = 1;
11101115
kInvalidNodeOpId = 2;
11111116
kInvalidNOC = 3;
@@ -1123,17 +1128,17 @@ server cluster OperationalCredentials = 62 {
11231128
fabric_idx fabricIndex = 254;
11241129
}
11251130

1126-
fabric_scoped struct FabricDescriptor {
1131+
fabric_scoped struct FabricDescriptorStruct {
11271132
octet_string<65> rootPublicKey = 1;
1128-
vendor_id vendorId = 2;
1129-
fabric_id fabricId = 3;
1130-
node_id nodeId = 4;
1133+
vendor_id vendorID = 2;
1134+
fabric_id fabricID = 3;
1135+
node_id nodeID = 4;
11311136
char_string<32> label = 5;
11321137
fabric_idx fabricIndex = 254;
11331138
}
11341139

11351140
readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
1136-
readonly attribute FabricDescriptor fabrics[] = 1;
1141+
readonly attribute FabricDescriptorStruct fabrics[] = 1;
11371142
readonly attribute int8u supportedFabrics = 2;
11381143
readonly attribute int8u commissionedFabrics = 3;
11391144
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
@@ -1146,7 +1151,7 @@ server cluster OperationalCredentials = 62 {
11461151
}
11471152

11481153
request struct CertificateChainRequestRequest {
1149-
INT8U certificateType = 0;
1154+
CertificateChainTypeEnum certificateType = 0;
11501155
}
11511156

11521157
request struct CSRRequestRequest {
@@ -1176,12 +1181,12 @@ server cluster OperationalCredentials = 62 {
11761181
}
11771182

11781183
request struct AddTrustedRootCertificateRequest {
1179-
OCTET_STRING rootCertificate = 0;
1184+
OCTET_STRING rootCACertificate = 0;
11801185
}
11811186

11821187
response struct AttestationResponse = 1 {
11831188
OCTET_STRING attestationElements = 0;
1184-
OCTET_STRING signature = 1;
1189+
OCTET_STRING attestationSignature = 1;
11851190
}
11861191

11871192
response struct CertificateChainResponse = 3 {
@@ -1194,7 +1199,7 @@ server cluster OperationalCredentials = 62 {
11941199
}
11951200

11961201
response struct NOCResponse = 8 {
1197-
OperationalCertStatus statusCode = 0;
1202+
NodeOperationalCertStatusEnum statusCode = 0;
11981203
optional fabric_idx fabricIndex = 1;
11991204
optional CHAR_STRING debugText = 2;
12001205
}

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+16-11
Original file line numberDiff line numberDiff line change
@@ -923,8 +923,13 @@ server cluster AdministratorCommissioning = 60 {
923923
}
924924

925925
server cluster OperationalCredentials = 62 {
926-
enum OperationalCertStatus : ENUM8 {
927-
kSuccess = 0;
926+
enum CertificateChainTypeEnum : ENUM8 {
927+
kDACCertificate = 1;
928+
kPAICertificate = 2;
929+
}
930+
931+
enum NodeOperationalCertStatusEnum : ENUM8 {
932+
kOk = 0;
928933
kInvalidPublicKey = 1;
929934
kInvalidNodeOpId = 2;
930935
kInvalidNOC = 3;
@@ -942,17 +947,17 @@ server cluster OperationalCredentials = 62 {
942947
fabric_idx fabricIndex = 254;
943948
}
944949

945-
fabric_scoped struct FabricDescriptor {
950+
fabric_scoped struct FabricDescriptorStruct {
946951
octet_string<65> rootPublicKey = 1;
947-
vendor_id vendorId = 2;
948-
fabric_id fabricId = 3;
949-
node_id nodeId = 4;
952+
vendor_id vendorID = 2;
953+
fabric_id fabricID = 3;
954+
node_id nodeID = 4;
950955
char_string<32> label = 5;
951956
fabric_idx fabricIndex = 254;
952957
}
953958

954959
readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
955-
readonly attribute FabricDescriptor fabrics[] = 1;
960+
readonly attribute FabricDescriptorStruct fabrics[] = 1;
956961
readonly attribute int8u supportedFabrics = 2;
957962
readonly attribute int8u commissionedFabrics = 3;
958963
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
@@ -965,7 +970,7 @@ server cluster OperationalCredentials = 62 {
965970
}
966971

967972
request struct CertificateChainRequestRequest {
968-
INT8U certificateType = 0;
973+
CertificateChainTypeEnum certificateType = 0;
969974
}
970975

971976
request struct CSRRequestRequest {
@@ -995,12 +1000,12 @@ server cluster OperationalCredentials = 62 {
9951000
}
9961001

9971002
request struct AddTrustedRootCertificateRequest {
998-
OCTET_STRING rootCertificate = 0;
1003+
OCTET_STRING rootCACertificate = 0;
9991004
}
10001005

10011006
response struct AttestationResponse = 1 {
10021007
OCTET_STRING attestationElements = 0;
1003-
OCTET_STRING signature = 1;
1008+
OCTET_STRING attestationSignature = 1;
10041009
}
10051010

10061011
response struct CertificateChainResponse = 3 {
@@ -1013,7 +1018,7 @@ server cluster OperationalCredentials = 62 {
10131018
}
10141019

10151020
response struct NOCResponse = 8 {
1016-
OperationalCertStatus statusCode = 0;
1021+
NodeOperationalCertStatusEnum statusCode = 0;
10171022
optional fabric_idx fabricIndex = 1;
10181023
optional CHAR_STRING debugText = 2;
10191024
}

0 commit comments

Comments
 (0)