Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple spec compliance fixes to NOC cluster #18965

Merged
merged 20 commits into from
Jun 1, 2022
Merged

Multiple spec compliance fixes to NOC cluster #18965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fe67e05
Multiple spec compliance fixes to NOC cluster
tcarmelveilleux May 30, 2022
88c3b94
ZAP changes
tcarmelveilleux May 30, 2022
8dcce75
Restyled by clang-format
restyled-commits May 30, 2022
287352e
Merge remote-tracking branch 'upstream/master' into remove-remove-tru…
tcarmelveilleux May 30, 2022
5f81b3f
regen zap
tcarmelveilleux May 30, 2022
ab5b231
Restyled by clang-format
restyled-commits May 30, 2022
23ccf83
Add missing root cert size validation
tcarmelveilleux May 30, 2022
e1744e4
Fix CI
tcarmelveilleux May 30, 2022
8c5d5cd
Restyled by clang-format
restyled-commits May 30, 2022
5c29287
Fix CI
tcarmelveilleux May 31, 2022
99a865a
Merge remote-tracking branch 'upstream/master' into remove-remove-tru…
tcarmelveilleux May 31, 2022
6a60406
Apply review comments
tcarmelveilleux May 31, 2022
462ffa9
ZAP regen
tcarmelveilleux May 31, 2022
28cc15f
Restyled by whitespace
restyled-commits May 31, 2022
c70957a
Restyled by clang-format
restyled-commits May 31, 2022
c9d6588
Fix a constant move to wrong context
tcarmelveilleux Jun 1, 2022
e65dc9f
Add FAILSAFE_REQUIRED and TIMED_REQUEST_MISMATCH
tcarmelveilleux Jun 1, 2022
9475c94
ZAP regen
tcarmelveilleux Jun 1, 2022
d149a47
Restyled by whitespace
restyled-commits Jun 1, 2022
c192af8
Restyled by clang-format
restyled-commits Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2588,10 +2588,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -2620,7 +2616,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster PowerSource = 47 {
Expand Down
8 changes: 0 additions & 8 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5642,14 +5642,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
}
],
"attributes": [
Expand Down
5 changes: 0 additions & 5 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2105,10 +2105,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -2137,7 +2133,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster PowerSource = 47 {
Expand Down
8 changes: 0 additions & 8 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5642,14 +5642,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
}
],
"attributes": [
Expand Down
5 changes: 0 additions & 5 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -826,7 +822,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster SoftwareDiagnostics = 52 {
Expand Down
8 changes: 0 additions & 8 deletions examples/bridge-app/bridge-common/bridge-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3628,14 +3628,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
}
],
"attributes": [
Expand Down
8 changes: 0 additions & 8 deletions examples/chef/devices/lighting-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4784,14 +4784,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
}
],
"attributes": [
Expand Down
5 changes: 0 additions & 5 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,10 +1228,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -1260,7 +1256,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

client cluster Scenes = 5 {
Expand Down
8 changes: 0 additions & 8 deletions examples/light-switch-app/light-switch-common/light-switch-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4783,14 +4783,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
}
],
"attributes": [
Expand Down
5 changes: 0 additions & 5 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,10 +1318,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -1350,7 +1346,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster SoftwareDiagnostics = 52 {
Expand Down
8 changes: 0 additions & 8 deletions examples/lighting-app/lighting-common/lighting-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4800,14 +4800,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
}
],
"attributes": [
Expand Down
5 changes: 0 additions & 5 deletions examples/lock-app/lock-common/lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,10 +1455,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -1487,7 +1483,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster PowerSource = 47 {
Expand Down
8 changes: 0 additions & 8 deletions examples/lock-app/lock-common/lock-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4915,14 +4915,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
}
],
"attributes": [
Expand Down
5 changes: 0 additions & 5 deletions examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,10 +568,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -600,7 +596,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster TimeFormatLocalization = 44 {
Expand Down
8 changes: 0 additions & 8 deletions examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2438,14 +2438,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
}
],
"attributes": [
Expand Down
10 changes: 0 additions & 10 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,10 +1601,6 @@ client cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
Expand All @@ -1613,7 +1609,6 @@ client cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster OperationalCredentials = 62 {
Expand Down Expand Up @@ -1685,10 +1680,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -1717,7 +1708,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster PowerSource = 47 {
Expand Down
8 changes: 0 additions & 8 deletions examples/placeholder/linux/apps/app1/config.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3343,14 +3343,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
}
],
"attributes": [
Expand Down
10 changes: 0 additions & 10 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,10 +1601,6 @@ client cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
Expand All @@ -1613,7 +1609,6 @@ client cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster OperationalCredentials = 62 {
Expand Down Expand Up @@ -1685,10 +1680,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -1717,7 +1708,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

server cluster PowerSource = 47 {
Expand Down
8 changes: 0 additions & 8 deletions examples/placeholder/linux/apps/app2/config.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3343,14 +3343,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveTrustedRootCertificate",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
}
],
"attributes": [
Expand Down
3 changes: 1 addition & 2 deletions examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_
break;

case DeviceEventType::kCommissioningComplete:
PLAT_LOG("Commissioning complete (%x,%d)", event->CommissioningComplete.PeerNodeId,
event->CommissioningComplete.PeerFabricIndex);
PLAT_LOG("Commissioning complete for fabric 0x%x", event->CommissioningComplete.fabricIndex);
break;

case DeviceEventType::kOperationalNetworkEnabled:
Expand Down
5 changes: 0 additions & 5 deletions examples/pump-app/pump-common/pump-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,10 +1038,6 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING rootCertificate = 0;
}

request struct RemoveTrustedRootCertificateRequest {
OCTET_STRING trustedRootIdentifier = 0;
}

response struct AttestationResponse = 1 {
OCTET_STRING attestationElements = 0;
OCTET_STRING signature = 1;
Expand Down Expand Up @@ -1070,7 +1066,6 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
command access(invoke: administer) RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12;
}

client cluster PressureMeasurement = 1027 {
Expand Down
Loading