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

Set ICAC to nullable to align with spec #14411

Merged
merged 2 commits into from
Jan 27, 2022
Merged

Set ICAC to nullable to align with spec #14411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7320c8f
If no ICAC is present in the chain, this field SHALL be set to null
yufengwangca Jan 27, 2022
40e19ce
Run codegen
yufengwangca Jan 27, 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
2 changes: 1 addition & 1 deletion 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 @@ -2086,7 +2086,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -548,7 +548,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -1080,7 +1080,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -472,7 +472,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -382,7 +382,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -521,7 +521,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/thermostat-common/thermostat.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
4 changes: 2 additions & 2 deletions examples/tv-app/tv-common/tv-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,7 @@ client cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down Expand Up @@ -1431,7 +1431,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,7 +1854,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/common/window-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ server cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
9 changes: 8 additions & 1 deletion src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,15 @@ CHIP_ERROR OperationalCredentialsAttrAccess::ReadNOCs(EndpointId endpoint, Attri

if (accessingFabricIndex == fabricInfo.GetFabricIndex())
{
ByteSpan icac;

ReturnErrorOnFailure(fabricInfo.GetNOCCert(noc.noc));
ReturnErrorOnFailure(fabricInfo.GetICACert(noc.icac));
ReturnErrorOnFailure(fabricInfo.GetICACert(icac));

if (!icac.empty())
{
noc.icac.SetNonNull(icac);
}
}

ReturnErrorOnFailure(encoder.Encode(noc));
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ limitations under the License.
<cluster code="0x003E"/>
<item name="FabricIndex" type="fabric_idx"/>
<item name="NOC" type="OCTET_STRING"/>
<item name="ICAC" type="OCTET_STRING"/>
<item name="ICAC" type="OCTET_STRING" isNullable="true"/>
</struct>

<cluster>
Expand Down
2 changes: 1 addition & 1 deletion src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2306,7 +2306,7 @@ client cluster OperationalCredentials = 62 {
struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
nullable OCTET_STRING icac = 2;
}

struct FabricDescriptor {
Expand Down
15 changes: 11 additions & 4 deletions src/controller/java/zap-generated/CHIPReadCallbacks.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.