Skip to content

Commit 9e0eeb4

Browse files
authored
Move the TLS clusters to EP0, where they are mandated by the spec. (project-chip#71592)
* Move the TLS clusters to EP0, where they are mandated by the spec. * Address linter error and code comments * Update Darwin to use EP0 for TLS clusters
1 parent cac9db8 commit 9e0eeb4

43 files changed

Lines changed: 1177 additions & 1650 deletions

Some content is hidden

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

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

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3225,16 +3225,13 @@ cluster ModeSelect = 80 {
32253225
readonly attribute attrib_id attributeList[] = 65531;
32263226
readonly attribute bitmap32 featureMap = 65532;
32273227
readonly attribute int16u clusterRevision = 65533;
3228-
readonly attribute optional int8u manufacturerExtension = 4293984257;
32293228

32303229
request struct ChangeToModeRequest {
32313230
int8u newMode = 0;
32323231
}
32333232

32343233
/** On receipt of this command, if the NewMode field indicates a valid mode transition within the supported list, the server SHALL set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response. */
32353234
command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
3236-
/** Sample manufacturer specific extension command */
3237-
command SampleMfgExtensionCommand(): DefaultSuccess = 4293984257;
32383235
}
32393236

32403237
/** Attributes and commands for selecting a mode from a list of supported options. */
@@ -7570,6 +7567,42 @@ endpoint 0 {
75707567
callback attribute clusterRevision;
75717568
}
75727569

7570+
server cluster TlsCertificateManagement {
7571+
callback attribute maxRootCertificates;
7572+
callback attribute provisionedRootCertificates;
7573+
callback attribute maxClientCertificates;
7574+
callback attribute provisionedClientCertificates;
7575+
callback attribute generatedCommandList;
7576+
callback attribute acceptedCommandList;
7577+
callback attribute attributeList;
7578+
ram attribute featureMap default = 0;
7579+
callback attribute clusterRevision;
7580+
7581+
handle command ProvisionRootCertificate;
7582+
handle command FindRootCertificate;
7583+
handle command LookupRootCertificate;
7584+
handle command RemoveRootCertificate;
7585+
handle command ClientCSR;
7586+
handle command ProvisionClientCertificate;
7587+
handle command FindClientCertificate;
7588+
handle command LookupClientCertificate;
7589+
handle command RemoveClientCertificate;
7590+
}
7591+
7592+
server cluster TlsClientManagement {
7593+
callback attribute maxProvisioned;
7594+
callback attribute provisionedEndpoints;
7595+
callback attribute generatedCommandList;
7596+
callback attribute acceptedCommandList;
7597+
callback attribute attributeList;
7598+
ram attribute featureMap default = 0;
7599+
callback attribute clusterRevision;
7600+
7601+
handle command ProvisionEndpoint;
7602+
handle command FindEndpoint;
7603+
handle command RemoveEndpoint;
7604+
}
7605+
75737606
server cluster FaultInjection {
75747607
callback attribute generatedCommandList;
75757608
callback attribute acceptedCommandList;
@@ -7799,7 +7832,6 @@ endpoint 1 {
77997832
callback attribute attributeList;
78007833
ram attribute featureMap default = 1;
78017834
ram attribute clusterRevision default = 2;
7802-
ram attribute manufacturerExtension default = 255;
78037835

78047836
handle command ChangeToMode;
78057837
}
@@ -8637,42 +8669,6 @@ endpoint 1 {
86378669
handle command PlayChimeSound;
86388670
}
86398671

8640-
server cluster TlsCertificateManagement {
8641-
callback attribute maxRootCertificates;
8642-
callback attribute provisionedRootCertificates;
8643-
callback attribute maxClientCertificates;
8644-
callback attribute provisionedClientCertificates;
8645-
callback attribute generatedCommandList;
8646-
callback attribute acceptedCommandList;
8647-
callback attribute attributeList;
8648-
ram attribute featureMap default = 0;
8649-
callback attribute clusterRevision;
8650-
8651-
handle command ProvisionRootCertificate;
8652-
handle command FindRootCertificate;
8653-
handle command LookupRootCertificate;
8654-
handle command RemoveRootCertificate;
8655-
handle command ClientCSR;
8656-
handle command ProvisionClientCertificate;
8657-
handle command FindClientCertificate;
8658-
handle command LookupClientCertificate;
8659-
handle command RemoveClientCertificate;
8660-
}
8661-
8662-
server cluster TlsClientManagement {
8663-
callback attribute maxProvisioned;
8664-
callback attribute provisionedEndpoints;
8665-
callback attribute generatedCommandList;
8666-
callback attribute acceptedCommandList;
8667-
callback attribute attributeList;
8668-
ram attribute featureMap default = 0;
8669-
callback attribute clusterRevision;
8670-
8671-
handle command ProvisionEndpoint;
8672-
handle command FindEndpoint;
8673-
handle command RemoveEndpoint;
8674-
}
8675-
86768672
server cluster UnitTesting {
86778673
emits event TestEvent;
86788674
emits event TestFabricScopedEvent;

0 commit comments

Comments
 (0)