Skip to content

Commit dfcade5

Browse files
pankorepankore
committed
[Realtek] Update .matter files
1 parent 386c487 commit dfcade5

File tree

5 files changed

+101
-9
lines changed

5 files changed

+101
-9
lines changed

‎examples/light-switch-app/realtek_bee/data_model/light-switch-app-1_to_11.matter

+25-2
Original file line numberDiff line numberDiff line change
@@ -2035,12 +2035,14 @@ cluster OperationalCredentials = 62 {
20352035
fabric_id fabricID = 3;
20362036
node_id nodeID = 4;
20372037
char_string<32> label = 5;
2038+
optional octet_string<85> vidVerificationStatement = 6;
20382039
fabric_idx fabricIndex = 254;
20392040
}
20402041

20412042
fabric_scoped struct NOCStruct {
2042-
fabric_sensitive octet_string noc = 1;
2043-
nullable fabric_sensitive octet_string icac = 2;
2043+
octet_string noc = 1;
2044+
nullable octet_string icac = 2;
2045+
optional octet_string vvsc = 3;
20442046
fabric_idx fabricIndex = 254;
20452047
}
20462048

@@ -2115,6 +2117,23 @@ cluster OperationalCredentials = 62 {
21152117
octet_string rootCACertificate = 0;
21162118
}
21172119

2120+
request struct SetVidVerificationStatementRequest {
2121+
optional vendor_id vendorID = 0;
2122+
optional octet_string vidVerificationStatement = 1;
2123+
optional octet_string vvsc = 2;
2124+
}
2125+
2126+
request struct SignVidVerificationRequestRequest {
2127+
fabric_idx fabricIndex = 0;
2128+
octet_string<32> clientChallenge = 1;
2129+
}
2130+
2131+
response struct SignVidVerificationResponse = 14 {
2132+
fabric_idx fabricIndex = 0;
2133+
int8u fabricBindingVersion = 1;
2134+
octet_string signature = 2;
2135+
}
2136+
21182137
/** Sender is requesting attestation information from the receiver. */
21192138
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
21202139
/** Sender is requesting a device attestation certificate from the receiver. */
@@ -2131,6 +2150,10 @@ cluster OperationalCredentials = 62 {
21312150
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
21322151
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
21332152
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
2153+
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
2154+
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
2155+
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
2156+
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
21342157
}
21352158

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

‎examples/light-switch-app/realtek_bee/data_model/light-switch-app-1_to_2.matter

+25-2
Original file line numberDiff line numberDiff line change
@@ -2035,12 +2035,14 @@ cluster OperationalCredentials = 62 {
20352035
fabric_id fabricID = 3;
20362036
node_id nodeID = 4;
20372037
char_string<32> label = 5;
2038+
optional octet_string<85> vidVerificationStatement = 6;
20382039
fabric_idx fabricIndex = 254;
20392040
}
20402041

20412042
fabric_scoped struct NOCStruct {
2042-
fabric_sensitive octet_string noc = 1;
2043-
nullable fabric_sensitive octet_string icac = 2;
2043+
octet_string noc = 1;
2044+
nullable octet_string icac = 2;
2045+
optional octet_string vvsc = 3;
20442046
fabric_idx fabricIndex = 254;
20452047
}
20462048

@@ -2115,6 +2117,23 @@ cluster OperationalCredentials = 62 {
21152117
octet_string rootCACertificate = 0;
21162118
}
21172119

2120+
request struct SetVidVerificationStatementRequest {
2121+
optional vendor_id vendorID = 0;
2122+
optional octet_string vidVerificationStatement = 1;
2123+
optional octet_string vvsc = 2;
2124+
}
2125+
2126+
request struct SignVidVerificationRequestRequest {
2127+
fabric_idx fabricIndex = 0;
2128+
octet_string<32> clientChallenge = 1;
2129+
}
2130+
2131+
response struct SignVidVerificationResponse = 14 {
2132+
fabric_idx fabricIndex = 0;
2133+
int8u fabricBindingVersion = 1;
2134+
octet_string signature = 2;
2135+
}
2136+
21182137
/** Sender is requesting attestation information from the receiver. */
21192138
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
21202139
/** Sender is requesting a device attestation certificate from the receiver. */
@@ -2131,6 +2150,10 @@ cluster OperationalCredentials = 62 {
21312150
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
21322151
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
21332152
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
2153+
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
2154+
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
2155+
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
2156+
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
21342157
}
21352158

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

‎examples/light-switch-app/realtek_bee/data_model/light-switch-app-1_to_8.matter

+25-2
Original file line numberDiff line numberDiff line change
@@ -2035,12 +2035,14 @@ cluster OperationalCredentials = 62 {
20352035
fabric_id fabricID = 3;
20362036
node_id nodeID = 4;
20372037
char_string<32> label = 5;
2038+
optional octet_string<85> vidVerificationStatement = 6;
20382039
fabric_idx fabricIndex = 254;
20392040
}
20402041

20412042
fabric_scoped struct NOCStruct {
2042-
fabric_sensitive octet_string noc = 1;
2043-
nullable fabric_sensitive octet_string icac = 2;
2043+
octet_string noc = 1;
2044+
nullable octet_string icac = 2;
2045+
optional octet_string vvsc = 3;
20442046
fabric_idx fabricIndex = 254;
20452047
}
20462048

@@ -2115,6 +2117,23 @@ cluster OperationalCredentials = 62 {
21152117
octet_string rootCACertificate = 0;
21162118
}
21172119

2120+
request struct SetVidVerificationStatementRequest {
2121+
optional vendor_id vendorID = 0;
2122+
optional octet_string vidVerificationStatement = 1;
2123+
optional octet_string vvsc = 2;
2124+
}
2125+
2126+
request struct SignVidVerificationRequestRequest {
2127+
fabric_idx fabricIndex = 0;
2128+
octet_string<32> clientChallenge = 1;
2129+
}
2130+
2131+
response struct SignVidVerificationResponse = 14 {
2132+
fabric_idx fabricIndex = 0;
2133+
int8u fabricBindingVersion = 1;
2134+
octet_string signature = 2;
2135+
}
2136+
21182137
/** Sender is requesting attestation information from the receiver. */
21192138
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
21202139
/** Sender is requesting a device attestation certificate from the receiver. */
@@ -2131,6 +2150,10 @@ cluster OperationalCredentials = 62 {
21312150
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
21322151
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
21332152
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
2153+
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
2154+
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
2155+
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
2156+
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
21342157
}
21352158

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

‎examples/lighting-app/realtek_bee/data_model/lighting-app.matter

+25-2
Original file line numberDiff line numberDiff line change
@@ -1941,12 +1941,14 @@ cluster OperationalCredentials = 62 {
19411941
fabric_id fabricID = 3;
19421942
node_id nodeID = 4;
19431943
char_string<32> label = 5;
1944+
optional octet_string<85> vidVerificationStatement = 6;
19441945
fabric_idx fabricIndex = 254;
19451946
}
19461947

19471948
fabric_scoped struct NOCStruct {
1948-
fabric_sensitive octet_string noc = 1;
1949-
nullable fabric_sensitive octet_string icac = 2;
1949+
octet_string noc = 1;
1950+
nullable octet_string icac = 2;
1951+
optional octet_string vvsc = 3;
19501952
fabric_idx fabricIndex = 254;
19511953
}
19521954

@@ -2021,6 +2023,23 @@ cluster OperationalCredentials = 62 {
20212023
octet_string rootCACertificate = 0;
20222024
}
20232025

2026+
request struct SetVidVerificationStatementRequest {
2027+
optional vendor_id vendorID = 0;
2028+
optional octet_string vidVerificationStatement = 1;
2029+
optional octet_string vvsc = 2;
2030+
}
2031+
2032+
request struct SignVidVerificationRequestRequest {
2033+
fabric_idx fabricIndex = 0;
2034+
octet_string<32> clientChallenge = 1;
2035+
}
2036+
2037+
response struct SignVidVerificationResponse = 14 {
2038+
fabric_idx fabricIndex = 0;
2039+
int8u fabricBindingVersion = 1;
2040+
octet_string signature = 2;
2041+
}
2042+
20242043
/** Sender is requesting attestation information from the receiver. */
20252044
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
20262045
/** Sender is requesting a device attestation certificate from the receiver. */
@@ -2037,6 +2056,10 @@ cluster OperationalCredentials = 62 {
20372056
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
20382057
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
20392058
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
2059+
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
2060+
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
2061+
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
2062+
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
20402063
}
20412064

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

‎src/platform/Realtek_bee/DiagnosticDataProviderImpl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
3939

4040
// ===== Methods that implement the DiagnosticDataProvider abstract interface.
4141

42-
bool SupportsWatermarks() override { return false; }
42+
bool SupportsWatermarks() override { return true; }
4343
// Heap diag
4444
CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
4545
CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;

0 commit comments

Comments
 (0)