diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index e867cd1fc6be2e..d5ddba278558ae 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -1860,7 +1860,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1880,7 +1880,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 1a4cb57456cd15..6702db23e9c78e 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1655,7 +1655,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1675,7 +1675,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 1e9b38131fcd3a..ddb107eeb44fff 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1419,7 +1419,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1439,7 +1439,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index ff6e1d89abe3d5..4e374f4636d992 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1292,7 +1292,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1312,7 +1312,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index b7c3398ff4f42c..30ec3ed4a293db 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -1079,7 +1079,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1099,7 +1099,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 914794336412aa..7308575c4bcc88 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -1011,7 +1011,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1031,7 +1031,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index af8655d2ede1bc..70288ad0a97258 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1158,7 +1158,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1178,7 +1178,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 3d3c17dcf318e9..7e9c35dbe425b3 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -1011,7 +1011,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1031,7 +1031,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index f744f98f2e6e38..cc27e70898f651 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1158,7 +1158,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1178,7 +1178,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index f25e30b8a93398..7615fee68ea590 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -1012,7 +1012,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1032,7 +1032,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 75f98960af3ff6..8a1da9fefa9eac 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -1025,7 +1025,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1045,7 +1045,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 30bd99d8ae6615..6d6e48c7307546 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1151,7 +1151,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1171,7 +1171,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index f21bd9dce8d570..13799708c62a29 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -1025,7 +1025,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1045,7 +1045,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index abe0ec16c0f868..09ad29add8ba20 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -1025,7 +1025,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1045,7 +1045,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 4b94421c8bc00f..e9ff6f8b2eaf62 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -1025,7 +1025,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1045,7 +1045,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index ef092933beeddc..61d607ec9c06e4 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1158,7 +1158,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1178,7 +1178,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 0a64802c98f1d1..de2dc4d117bd60 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1097,7 +1097,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1117,7 +1117,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 37f9e14df4a52e..e4f253e5f91216 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -1058,7 +1058,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1078,7 +1078,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 59c93833361bae..bd8246330dc24c 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -1030,7 +1030,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1050,7 +1050,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index ecf26ab96ab327..5602c8f1abf7ee 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1152,7 +1152,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1172,7 +1172,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index dfda123cdfa2d7..6bb8e3844a014b 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -1025,7 +1025,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1045,7 +1045,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index d984f47f0301d6..4e3895926ef309 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1011,7 +1011,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1031,7 +1031,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index d9696c30336450..299c8b97d88dbf 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -1011,7 +1011,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1031,7 +1031,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index ed32526863a0f9..9dde56ad33b4bb 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -1240,7 +1240,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1260,7 +1260,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 2fdb718365673c..63e83cda05eda3 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -1419,7 +1419,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1439,7 +1439,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 685a337eb450e8..d3e91a8ad61659 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -1503,7 +1503,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1523,7 +1523,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index b796597f58fbff..f4392a598e6445 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1457,7 +1457,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1477,7 +1477,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 51351cbd2c4e03..fc10c420c57029 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -1172,7 +1172,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1192,7 +1192,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter index 4f7528e0671a6f..9783baccbb3679 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter @@ -1298,7 +1298,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1318,7 +1318,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter index 864f52ecebeaa8..72b3162a9f9d1f 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter @@ -1208,7 +1208,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1228,7 +1228,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index a2a5e9185ec820..46b92fd288b8cd 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1324,7 +1324,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1344,7 +1344,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 0c93ada0a2e67c..de2ea9558dcf6a 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -803,7 +803,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -823,7 +823,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index e8f336047f46a4..48756c37c25f6c 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -785,7 +785,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -805,7 +805,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 2f09e3db5ef4fc..b6cb8a7639552e 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -960,7 +960,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -980,7 +980,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index b24dc3a98b7fdc..5ba73b670ec830 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1040,7 +1040,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1060,7 +1060,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index c246648be074b7..f12d352a37cf81 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -942,7 +942,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -962,7 +962,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index cc0e826786f862..cfcdf79300acd6 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -824,7 +824,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -844,7 +844,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index ea931fef29f83f..02bc93354b97f9 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1425,7 +1425,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1445,7 +1445,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 68575fe6c53ee2..b3807738baa11f 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1572,7 +1572,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1592,7 +1592,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 0c5130f3e4704a..4feb6cc9ff7154 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1695,7 +1695,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1715,7 +1715,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 75138274260fdc..ca4045501d3870 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1433,7 +1433,7 @@ server cluster OperationalCredentials = 62 { } server cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1453,7 +1453,7 @@ server cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp index 1ba0e7b7212ebc..118e46ba6c6d50 100644 --- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp +++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp @@ -655,7 +655,7 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co // Set the Identity Protection Key (IPK) // The IPK SHALL be the operational group key under GroupKeySetID of 0 keyset.keyset_id = Credentials::GroupDataProvider::kIdentityProtectionKeySetId; - keyset.policy = GroupKeyManagement::GroupKeySecurityPolicy::kTrustFirst; + keyset.policy = GroupKeyManagement::GroupKeySecurityPolicyEnum::kTrustFirst; keyset.num_keys_used = 1; memcpy(keyset.epoch_keys[0].key, ipkValue.data(), Crypto::CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES); diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml index 26f58bf58b92d2..3b4961ea816505 100644 --- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml @@ -33,7 +33,7 @@ limitations under the License. - + @@ -42,7 +42,7 @@ limitations under the License. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index a7c67911b83024..493ef03cf0725e 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1977,7 +1977,7 @@ client cluster OperationalCredentials = 62 { } client cluster GroupKeyManagement = 63 { - enum GroupKeySecurityPolicy : ENUM8 { + enum GroupKeySecurityPolicyEnum : ENUM8 { kTrustFirst = 0; kCacheAndSync = 1; } @@ -1997,7 +1997,7 @@ client cluster GroupKeyManagement = 63 { struct GroupKeySetStruct { int16u groupKeySetID = 0; - GroupKeySecurityPolicy groupKeySecurityPolicy = 1; + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1; nullable octet_string<16> epochKey0 = 2; nullable epoch_us epochStartTime0 = 3; nullable octet_string<16> epochKey1 = 4; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index d471823584da23..e23ebb7e895319 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -12991,7 +12991,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class GroupKeySecurityPolicy(MatterIntEnum): + class GroupKeySecurityPolicyEnum(MatterIntEnum): kTrustFirst = 0x00 kCacheAndSync = 0x01 # All received enum values that are not listed above will be mapped @@ -13042,7 +13042,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="groupKeySetID", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupKeySecurityPolicy", Tag=1, Type=GroupKeyManagement.Enums.GroupKeySecurityPolicy), + ClusterObjectFieldDescriptor(Label="groupKeySecurityPolicy", Tag=1, Type=GroupKeyManagement.Enums.GroupKeySecurityPolicyEnum), ClusterObjectFieldDescriptor(Label="epochKey0", Tag=2, Type=typing.Union[Nullable, bytes]), ClusterObjectFieldDescriptor(Label="epochStartTime0", Tag=3, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="epochKey1", Tag=4, Type=typing.Union[Nullable, bytes]), @@ -13052,7 +13052,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) groupKeySetID: 'uint' = 0 - groupKeySecurityPolicy: 'GroupKeyManagement.Enums.GroupKeySecurityPolicy' = 0 + groupKeySecurityPolicy: 'GroupKeyManagement.Enums.GroupKeySecurityPolicyEnum' = 0 epochKey0: 'typing.Union[Nullable, bytes]' = NullValue epochStartTime0: 'typing.Union[Nullable, uint]' = NullValue epochKey1: 'typing.Union[Nullable, bytes]' = NullValue diff --git a/src/credentials/GroupDataProvider.h b/src/credentials/GroupDataProvider.h index d714134149598c..30d519d9b83dee 100644 --- a/src/credentials/GroupDataProvider.h +++ b/src/credentials/GroupDataProvider.h @@ -33,7 +33,7 @@ namespace Credentials { class GroupDataProvider { public: - using SecurityPolicy = app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy; + using SecurityPolicy = app::Clusters::GroupKeyManagement::GroupKeySecurityPolicyEnum; static constexpr KeysetId kIdentityProtectionKeySetId = 0; struct GroupInfo diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 6562fe05bed6e6..143606547a17e3 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -3124,7 +3124,10 @@ OperationalCredentials: - OperationalCertStatus GroupKeyManagement: - - GroupKeySecurityPolicy + # GroupKeySecurityPolicyEnum was originally just named + # GroupKeySecurityPolicy, but we generate the same API for both of + # those names, so the name can just change here. + - GroupKeySecurityPolicyEnum DoorLock: - DlAlarmCode - DlCredentialRule @@ -3576,7 +3579,10 @@ - LabelConflict - InvalidFabricIndex GroupKeyManagement: - GroupKeySecurityPolicy: + # GroupKeySecurityPolicyEnum was originally just named + # GroupKeySecurityPolicy, but we generate the same API for both of + # those names, so the name can just change here. + GroupKeySecurityPolicyEnum: - TrustFirst - CacheAndSync DoorLock: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 06d1db9b81a3bd..5e1c137c498eff 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -351,10 +351,10 @@ typedef void (*OperationalCredentialsClusterNodeOperationalCertStatusEnumAttribu void *, chip::app::Clusters::OperationalCredentials::NodeOperationalCertStatusEnum); typedef void (*NullableOperationalCredentialsClusterNodeOperationalCertStatusEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*GroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallback)( - void *, chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy); -typedef void (*NullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*GroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallback)( + void *, chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicyEnum); +typedef void (*NullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*DoorLockClusterAlarmCodeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::AlarmCodeEnum); typedef void (*NullableDoorLockClusterAlarmCodeEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); @@ -17983,72 +17983,74 @@ class MTRNullableOperationalCredentialsClusterNodeOperationalCertStatusEnumAttri MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge - : public MTRCallbackBridge +class MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy value); + static void OnSuccessFn(void * context, chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicyEnum value); }; -class MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackSubscriptionBridge - : public MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge +class MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackSubscriptionBridge + : public MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge { public: - MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackSubscriptionBridge( + MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge(queue, handler, action), + MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge::KeepAliveOnCallback; - using MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge::OnDone; + using MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackSubscriptionBridge - : public MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge +class MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackSubscriptionBridge + : public MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge { public: - MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackSubscriptionBridge( + MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge(queue, handler, action), + MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge::OnDone; + using MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 06ccb67aa9d099..dfe50dd7293698 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -18546,15 +18546,15 @@ } } -void MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy value) +void MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicyEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -18569,8 +18569,8 @@ } } -void MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -18581,7 +18581,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/python_testing/TC_RR_1_1.py b/src/python_testing/TC_RR_1_1.py index 2caad6233ce6e9..754b9dbf62a819 100644 --- a/src/python_testing/TC_RR_1_1.py +++ b/src/python_testing/TC_RR_1_1.py @@ -736,7 +736,7 @@ def build_group_key(self, fabric_index: int, group_key_index: int, keys_per_fabr asserts.assert_less_equal( set_id, 0xFFFF, "Invalid Key Set ID. This may be a limitation of the test harness, not the device under test.") return Clusters.GroupKeyManagement.Structs.GroupKeySetStruct(groupKeySetID=set_id, - groupKeySecurityPolicy=Clusters.GroupKeyManagement.Enums.GroupKeySecurityPolicy.kTrustFirst, + groupKeySecurityPolicy=Clusters.GroupKeyManagement.Enums.GroupKeySecurityPolicyEnum.kTrustFirst, epochKey0=self.random_string(16).encode(), epochStartTime0=(set_id * 4), epochKey1=self.random_string(16).encode(), diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index b4ac0a3c912e5b..e3c28c52eabe28 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -1033,9 +1033,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OperationalCredentials: } } -static auto __attribute__((unused)) EnsureKnownEnumValue(GroupKeyManagement::GroupKeySecurityPolicy val) +static auto __attribute__((unused)) EnsureKnownEnumValue(GroupKeyManagement::GroupKeySecurityPolicyEnum val) { - using EnumType = GroupKeyManagement::GroupKeySecurityPolicy; + using EnumType = GroupKeyManagement::GroupKeySecurityPolicyEnum; switch (val) { case EnumType::kTrustFirst: diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index dffd67bc144165..f72e77a6624ebf 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -1205,8 +1205,8 @@ enum class NodeOperationalCertStatusEnum : uint8_t namespace GroupKeyManagement { -// Enum for GroupKeySecurityPolicy -enum class GroupKeySecurityPolicy : uint8_t +// Enum for GroupKeySecurityPolicyEnum +enum class GroupKeySecurityPolicyEnum : uint8_t { kTrustFirst = 0x00, kCacheAndSync = 0x01, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 8d1c6919fe6955..3f7322050702d4 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -12300,8 +12300,8 @@ enum class Fields struct Type { public: - uint16_t groupKeySetID = static_cast(0); - GroupKeySecurityPolicy groupKeySecurityPolicy = static_cast(0); + uint16_t groupKeySetID = static_cast(0); + GroupKeySecurityPolicyEnum groupKeySecurityPolicy = static_cast(0); DataModel::Nullable epochKey0; DataModel::Nullable epochStartTime0; DataModel::Nullable epochKey1; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 6af25550e4d4ec..691d46a2ddfcc2 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -41750,7 +41750,7 @@ class Test_TC_SC_5_1Suite : public TestCommand value.groupKeySet.groupKeySetID = 419U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char("0x00000000000000000000000000000001garbage: not in length on purpose"), 34); @@ -41779,7 +41779,7 @@ class Test_TC_SC_5_1Suite : public TestCommand value.groupKeySet.groupKeySetID = 419U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char("0xd0d1d2d3d4d5d6d7d8d9dadbdcdddedfgarbage: not in length on purpose"), 34); @@ -42150,7 +42150,7 @@ class Test_TC_SC_5_2Suite : public TestCommand value.groupKeySet.groupKeySetID = 419U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -85889,7 +85889,7 @@ class TestGroupMessagingSuite : public TestCommand value.groupKeySet.groupKeySetID = 417U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -85924,7 +85924,7 @@ class TestGroupMessagingSuite : public TestCommand value.groupKeySet.groupKeySetID = 418U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -86158,7 +86158,7 @@ class TestGroupMessagingSuite : public TestCommand value.groupKeySet.groupKeySetID = 417U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -86193,7 +86193,7 @@ class TestGroupMessagingSuite : public TestCommand value.groupKeySet.groupKeySetID = 418U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -86729,7 +86729,7 @@ class TestGroupsClusterSuite : public TestCommand value.groupKeySet.groupKeySetID = 417U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -87446,7 +87446,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand value.groupKeySet.groupKeySetID = 417U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -87481,7 +87481,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand value.groupKeySet.groupKeySetID = 418U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(1); + static_cast(1); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -87744,7 +87744,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand value.groupKeySet.groupKeySetID = 417U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -87779,7 +87779,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand value.groupKeySet.groupKeySetID = 418U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(1); + static_cast(1); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char( @@ -90402,7 +90402,7 @@ class TestGroupDemoConfigSuite : public TestCommand value.groupKeySet.groupKeySetID = 417U; value.groupKeySet.groupKeySecurityPolicy = - static_cast(0); + static_cast(0); value.groupKeySet.epochKey0.SetNonNull(); value.groupKeySet.epochKey0.Value() = chip::ByteSpan( chip::Uint8::from_const_char(