Skip to content

Commit

Permalink
Align naming in Operational Credentials cluster with the spec. (#24472)
Browse files Browse the repository at this point in the history 
* Align naming in Operational Credentials cluster with the spec.

* Regenerate generated files.
  • Loading branch information
@bzbarsky-apple @pull
bzbarsky-apple authored and pull[bot] committed Nov 14, 2023
1 parent 587efa9 commit aaa42ae
Show file tree
Hide file tree
Showing 92 changed files with 1,600 additions and 1,000 deletions.
27 changes: 16 additions & 11 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1577,8 +1577,13 @@ server cluster AdministratorCommissioning = 60 {
}

server cluster OperationalCredentials = 62 {
enum OperationalCertStatus : ENUM8 {
kSuccess = 0;
enum CertificateChainTypeEnum : ENUM8 {
kDACCertificate = 1;
kPAICertificate = 2;
}

enum NodeOperationalCertStatusEnum : ENUM8 {
kOk = 0;
kInvalidPublicKey = 1;
kInvalidNodeOpId = 2;
kInvalidNOC = 3;
Expand All @@ -1596,17 +1601,17 @@ server cluster OperationalCredentials = 62 {
fabric_idx fabricIndex = 254;
}

fabric_scoped struct FabricDescriptor {
fabric_scoped struct FabricDescriptorStruct {
octet_string<65> rootPublicKey = 1;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
vendor_id vendorID = 2;
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
fabric_idx fabricIndex = 254;
}

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

request struct CertificateChainRequestRequest {
INT8U certificateType = 0;
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
Expand Down Expand Up @@ -1649,12 +1654,12 @@ server cluster OperationalCredentials = 62 {
}

request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
OCTET_STRING rootCACertificate = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
OCTET_STRING attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
Expand All @@ -1667,7 +1672,7 @@ server cluster OperationalCredentials = 62 {
}

response struct NOCResponse = 8 {
OperationalCertStatus statusCode = 0;
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional CHAR_STRING debugText = 2;
}
Expand Down
27 changes: 16 additions & 11 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1422,8 +1422,13 @@ server cluster AdministratorCommissioning = 60 {
}

server cluster OperationalCredentials = 62 {
enum OperationalCertStatus : ENUM8 {
kSuccess = 0;
enum CertificateChainTypeEnum : ENUM8 {
kDACCertificate = 1;
kPAICertificate = 2;
}

enum NodeOperationalCertStatusEnum : ENUM8 {
kOk = 0;
kInvalidPublicKey = 1;
kInvalidNodeOpId = 2;
kInvalidNOC = 3;
Expand All @@ -1441,17 +1446,17 @@ server cluster OperationalCredentials = 62 {
fabric_idx fabricIndex = 254;
}

fabric_scoped struct FabricDescriptor {
fabric_scoped struct FabricDescriptorStruct {
octet_string<65> rootPublicKey = 1;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
vendor_id vendorID = 2;
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
fabric_idx fabricIndex = 254;
}

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

request struct CertificateChainRequestRequest {
INT8U certificateType = 0;
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
Expand Down Expand Up @@ -1494,12 +1499,12 @@ server cluster OperationalCredentials = 62 {
}

request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
OCTET_STRING rootCACertificate = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
OCTET_STRING attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
Expand All @@ -1512,7 +1517,7 @@ server cluster OperationalCredentials = 62 {
}

response struct NOCResponse = 8 {
OperationalCertStatus statusCode = 0;
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional CHAR_STRING debugText = 2;
}
Expand Down
27 changes: 16 additions & 11 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1252,8 +1252,13 @@ server cluster AdministratorCommissioning = 60 {
}

server cluster OperationalCredentials = 62 {
enum OperationalCertStatus : ENUM8 {
kSuccess = 0;
enum CertificateChainTypeEnum : ENUM8 {
kDACCertificate = 1;
kPAICertificate = 2;
}

enum NodeOperationalCertStatusEnum : ENUM8 {
kOk = 0;
kInvalidPublicKey = 1;
kInvalidNodeOpId = 2;
kInvalidNOC = 3;
Expand All @@ -1271,17 +1276,17 @@ server cluster OperationalCredentials = 62 {
fabric_idx fabricIndex = 254;
}

fabric_scoped struct FabricDescriptor {
fabric_scoped struct FabricDescriptorStruct {
octet_string<65> rootPublicKey = 1;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
vendor_id vendorID = 2;
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
fabric_idx fabricIndex = 254;
}

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

request struct CertificateChainRequestRequest {
INT8U certificateType = 0;
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
Expand Down Expand Up @@ -1327,12 +1332,12 @@ server cluster OperationalCredentials = 62 {
}

request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
OCTET_STRING rootCACertificate = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
OCTET_STRING attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
Expand All @@ -1345,7 +1350,7 @@ server cluster OperationalCredentials = 62 {
}

response struct NOCResponse = 8 {
OperationalCertStatus statusCode = 0;
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional CHAR_STRING debugText = 2;
}
Expand Down
27 changes: 16 additions & 11 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1104,8 +1104,13 @@ server cluster AdministratorCommissioning = 60 {
}

server cluster OperationalCredentials = 62 {
enum OperationalCertStatus : ENUM8 {
kSuccess = 0;
enum CertificateChainTypeEnum : ENUM8 {
kDACCertificate = 1;
kPAICertificate = 2;
}

enum NodeOperationalCertStatusEnum : ENUM8 {
kOk = 0;
kInvalidPublicKey = 1;
kInvalidNodeOpId = 2;
kInvalidNOC = 3;
Expand All @@ -1123,17 +1128,17 @@ server cluster OperationalCredentials = 62 {
fabric_idx fabricIndex = 254;
}

fabric_scoped struct FabricDescriptor {
fabric_scoped struct FabricDescriptorStruct {
octet_string<65> rootPublicKey = 1;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
vendor_id vendorID = 2;
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
fabric_idx fabricIndex = 254;
}

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

request struct CertificateChainRequestRequest {
INT8U certificateType = 0;
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
Expand Down Expand Up @@ -1176,12 +1181,12 @@ server cluster OperationalCredentials = 62 {
}

request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
OCTET_STRING rootCACertificate = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
OCTET_STRING attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
Expand All @@ -1194,7 +1199,7 @@ server cluster OperationalCredentials = 62 {
}

response struct NOCResponse = 8 {
OperationalCertStatus statusCode = 0;
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional CHAR_STRING debugText = 2;
}
Expand Down
27 changes: 16 additions & 11 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -923,8 +923,13 @@ server cluster AdministratorCommissioning = 60 {
}

server cluster OperationalCredentials = 62 {
enum OperationalCertStatus : ENUM8 {
kSuccess = 0;
enum CertificateChainTypeEnum : ENUM8 {
kDACCertificate = 1;
kPAICertificate = 2;
}

enum NodeOperationalCertStatusEnum : ENUM8 {
kOk = 0;
kInvalidPublicKey = 1;
kInvalidNodeOpId = 2;
kInvalidNOC = 3;
Expand All @@ -942,17 +947,17 @@ server cluster OperationalCredentials = 62 {
fabric_idx fabricIndex = 254;
}

fabric_scoped struct FabricDescriptor {
fabric_scoped struct FabricDescriptorStruct {
octet_string<65> rootPublicKey = 1;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
vendor_id vendorID = 2;
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
fabric_idx fabricIndex = 254;
}

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

request struct CertificateChainRequestRequest {
INT8U certificateType = 0;
CertificateChainTypeEnum certificateType = 0;
}

request struct CSRRequestRequest {
Expand Down Expand Up @@ -995,12 +1000,12 @@ server cluster OperationalCredentials = 62 {
}

request struct AddTrustedRootCertificateRequest {
OCTET_STRING rootCertificate = 0;
OCTET_STRING rootCACertificate = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
OCTET_STRING attestationSignature = 1;
}

response struct CertificateChainResponse = 3 {
Expand All @@ -1013,7 +1018,7 @@ server cluster OperationalCredentials = 62 {
}

response struct NOCResponse = 8 {
OperationalCertStatus statusCode = 0;
NodeOperationalCertStatusEnum statusCode = 0;
optional fabric_idx fabricIndex = 1;
optional CHAR_STRING debugText = 2;
}
Expand Down
Loading

0 comments on commit aaa42ae

Please sign in to comment.