Skip to content

Commit

Permalink
Merge branch 'typo_fix_diagnostics' of github.com:andy31415/connected…
Browse files Browse the repository at this point in the history
…homeip into typo_fix_diagnostics
  • Loading branch information
andreilitvin committed Feb 20, 2025
2 parents 0440ed5 + 377d3e0 commit 119d06e
Show file tree
Hide file tree
Showing 154 changed files with 4,592 additions and 282 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1228,12 +1228,14 @@ cluster OperationalCredentials = 62 {
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
optional octet_string<85> vidVerificationStatement = 6;
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
octet_string noc = 1;
nullable octet_string icac = 2;
optional octet_string vvsc = 3;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -1308,6 +1310,23 @@ cluster OperationalCredentials = 62 {
octet_string rootCACertificate = 0;
}

request struct SetVidVerificationStatementRequest {
optional vendor_id vendorID = 0;
optional octet_string vidVerificationStatement = 1;
optional octet_string vvsc = 2;
}

request struct SignVidVerificationRequestRequest {
fabric_idx fabricIndex = 0;
octet_string<32> clientChallenge = 1;
}

response struct SignVidVerificationResponse = 14 {
fabric_idx fabricIndex = 0;
int8u fabricBindingVersion = 1;
octet_string signature = 2;
}

/** Sender is requesting attestation information from the receiver. */
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
/** Sender is requesting a device attestation certificate from the receiver. */
Expand All @@ -1324,6 +1343,10 @@ cluster OperationalCredentials = 62 {
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
}

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1503,12 +1503,14 @@ cluster OperationalCredentials = 62 {
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
optional octet_string<85> vidVerificationStatement = 6;
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
octet_string noc = 1;
nullable octet_string icac = 2;
optional octet_string vvsc = 3;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -1583,6 +1585,23 @@ cluster OperationalCredentials = 62 {
octet_string rootCACertificate = 0;
}

request struct SetVidVerificationStatementRequest {
optional vendor_id vendorID = 0;
optional octet_string vidVerificationStatement = 1;
optional octet_string vvsc = 2;
}

request struct SignVidVerificationRequestRequest {
fabric_idx fabricIndex = 0;
octet_string<32> clientChallenge = 1;
}

response struct SignVidVerificationResponse = 14 {
fabric_idx fabricIndex = 0;
int8u fabricBindingVersion = 1;
octet_string signature = 2;
}

/** Sender is requesting attestation information from the receiver. */
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
/** Sender is requesting a device attestation certificate from the receiver. */
Expand All @@ -1599,6 +1618,10 @@ cluster OperationalCredentials = 62 {
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
}

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2657,12 +2657,14 @@ cluster OperationalCredentials = 62 {
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
optional octet_string<85> vidVerificationStatement = 6;
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
octet_string noc = 1;
nullable octet_string icac = 2;
optional octet_string vvsc = 3;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -2737,6 +2739,23 @@ cluster OperationalCredentials = 62 {
octet_string rootCACertificate = 0;
}

request struct SetVidVerificationStatementRequest {
optional vendor_id vendorID = 0;
optional octet_string vidVerificationStatement = 1;
optional octet_string vvsc = 2;
}

request struct SignVidVerificationRequestRequest {
fabric_idx fabricIndex = 0;
octet_string<32> clientChallenge = 1;
}

response struct SignVidVerificationResponse = 14 {
fabric_idx fabricIndex = 0;
int8u fabricBindingVersion = 1;
octet_string signature = 2;
}

/** Sender is requesting attestation information from the receiver. */
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
/** Sender is requesting a device attestation certificate from the receiver. */
Expand All @@ -2753,6 +2772,10 @@ cluster OperationalCredentials = 62 {
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
}

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2424,12 +2424,14 @@ cluster OperationalCredentials = 62 {
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
optional octet_string<85> vidVerificationStatement = 6;
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
octet_string noc = 1;
nullable octet_string icac = 2;
optional octet_string vvsc = 3;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -2504,6 +2506,23 @@ cluster OperationalCredentials = 62 {
octet_string rootCACertificate = 0;
}

request struct SetVidVerificationStatementRequest {
optional vendor_id vendorID = 0;
optional octet_string vidVerificationStatement = 1;
optional octet_string vvsc = 2;
}

request struct SignVidVerificationRequestRequest {
fabric_idx fabricIndex = 0;
octet_string<32> clientChallenge = 1;
}

response struct SignVidVerificationResponse = 14 {
fabric_idx fabricIndex = 0;
int8u fabricBindingVersion = 1;
octet_string signature = 2;
}

/** Sender is requesting attestation information from the receiver. */
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
/** Sender is requesting a device attestation certificate from the receiver. */
Expand All @@ -2520,6 +2539,10 @@ cluster OperationalCredentials = 62 {
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
}

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
Expand Down
27 changes: 25 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1913,12 +1913,14 @@ cluster OperationalCredentials = 62 {
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
optional octet_string<85> vidVerificationStatement = 6;
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
octet_string noc = 1;
nullable octet_string icac = 2;
optional octet_string vvsc = 3;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -1993,6 +1995,23 @@ cluster OperationalCredentials = 62 {
octet_string rootCACertificate = 0;
}

request struct SetVidVerificationStatementRequest {
optional vendor_id vendorID = 0;
optional octet_string vidVerificationStatement = 1;
optional octet_string vvsc = 2;
}

request struct SignVidVerificationRequestRequest {
fabric_idx fabricIndex = 0;
octet_string<32> clientChallenge = 1;
}

response struct SignVidVerificationResponse = 14 {
fabric_idx fabricIndex = 0;
int8u fabricBindingVersion = 1;
octet_string signature = 2;
}

/** Sender is requesting attestation information from the receiver. */
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
/** Sender is requesting a device attestation certificate from the receiver. */
Expand All @@ -2009,6 +2028,10 @@ cluster OperationalCredentials = 62 {
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
}

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
Expand Down
27 changes: 25 additions & 2 deletions examples/camera-app/camera-common/camera-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1883,12 +1883,14 @@ cluster OperationalCredentials = 62 {
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
optional octet_string<85> vidVerificationStatement = 6;
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
octet_string noc = 1;
nullable octet_string icac = 2;
optional octet_string vvsc = 3;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -1963,6 +1965,23 @@ cluster OperationalCredentials = 62 {
octet_string rootCACertificate = 0;
}

request struct SetVidVerificationStatementRequest {
optional vendor_id vendorID = 0;
optional octet_string vidVerificationStatement = 1;
optional octet_string vvsc = 2;
}

request struct SignVidVerificationRequestRequest {
fabric_idx fabricIndex = 0;
octet_string<32> clientChallenge = 1;
}

response struct SignVidVerificationResponse = 14 {
fabric_idx fabricIndex = 0;
int8u fabricBindingVersion = 1;
octet_string signature = 2;
}

/** Sender is requesting attestation information from the receiver. */
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
/** Sender is requesting a device attestation certificate from the receiver. */
Expand All @@ -1979,6 +1998,10 @@ cluster OperationalCredentials = 62 {
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
}

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1665,12 +1665,14 @@ cluster OperationalCredentials = 62 {
fabric_id fabricID = 3;
node_id nodeID = 4;
char_string<32> label = 5;
optional octet_string<85> vidVerificationStatement = 6;
fabric_idx fabricIndex = 254;
}

fabric_scoped struct NOCStruct {
fabric_sensitive octet_string noc = 1;
nullable fabric_sensitive octet_string icac = 2;
octet_string noc = 1;
nullable octet_string icac = 2;
optional octet_string vvsc = 3;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -1745,6 +1747,23 @@ cluster OperationalCredentials = 62 {
octet_string rootCACertificate = 0;
}

request struct SetVidVerificationStatementRequest {
optional vendor_id vendorID = 0;
optional octet_string vidVerificationStatement = 1;
optional octet_string vvsc = 2;
}

request struct SignVidVerificationRequestRequest {
fabric_idx fabricIndex = 0;
octet_string<32> clientChallenge = 1;
}

response struct SignVidVerificationResponse = 14 {
fabric_idx fabricIndex = 0;
int8u fabricBindingVersion = 1;
octet_string signature = 2;
}

/** Sender is requesting attestation information from the receiver. */
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
/** Sender is requesting a device attestation certificate from the receiver. */
Expand All @@ -1761,6 +1780,10 @@ cluster OperationalCredentials = 62 {
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
}

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

0 comments on commit 119d06e

Please sign in to comment.