From 8255748e27fbc6f99246e2af8a044d5b04ec7b4a Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 10 Jan 2023 11:07:55 -0500 Subject: [PATCH] Align naming in Administrator Commissioning cluster XML with the spec. (#24318) * Align naming in Administrator Commissioning cluster XML with the spec. * Regenerate generated code. --- .../all-clusters-app.matter | 2 +- .../all-clusters-minimal-app.matter | 2 +- .../bridge-common/bridge-app.matter | 2 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 2 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 2 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 2 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 2 +- .../rootnode_doorlock_aNKYAreMXE.matter | 2 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 2 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 2 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 2 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 2 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 2 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 2 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 2 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 2 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 2 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 2 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 2 +- .../rootnode_speaker_RpzeXdimqA.matter | 2 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 2 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 2 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 2 +- .../contact-sensor-app.matter | 2 +- .../bridge-common/bridge-app.matter | 2 +- .../light-switch-app.matter | 2 +- .../lighting-common/lighting-app.matter | 2 +- .../nxp/zap/lighting-on-off.matter | 2 +- examples/lock-app/lock-common/lock-app.matter | 2 +- .../ota-provider-app.matter | 2 +- .../ota-requestor-app.matter | 2 +- .../placeholder/linux/apps/app1/config.matter | 2 +- .../placeholder/linux/apps/app2/config.matter | 2 +- examples/pump-app/pump-common/pump-app.matter | 2 +- .../pump-controller-app.matter | 2 +- .../esp32/main/temperature-measurement.matter | 2 +- .../thermostat-common/thermostat.matter | 2 +- examples/tv-app/tv-common/tv-app.matter | 2 +- .../tv-casting-common/tv-casting-app.matter | 2 +- examples/window-app/common/window-app.matter | 2 +- .../administrator-commissioning-server.cpp | 2 +- .../certification/Test_TC_CADMIN_1_11.yaml | 8 +-- .../certification/Test_TC_CADMIN_1_13.yaml | 10 ++-- .../certification/Test_TC_CADMIN_1_15.yaml | 6 +-- .../certification/Test_TC_CADMIN_1_22.yaml | 4 +- .../certification/Test_TC_CADMIN_1_24.yaml | 4 +- .../certification/Test_TC_CADMIN_1_3.yaml | 6 +-- .../certification/Test_TC_CADMIN_1_5.yaml | 10 ++-- .../certification/Test_TC_CADMIN_1_9.yaml | 2 +- .../administrator-commissioning-cluster.xml | 2 +- src/controller/CommissioningWindowOpener.cpp | 2 +- .../data_model/controller-clusters.matter | 2 +- .../chip/devicecontroller/ChipClusters.java | 6 +-- .../devicecontroller/ClusterInfoMapping.java | 10 ++-- .../python/chip/clusters/CHIPClusters.py | 2 +- .../python/chip/clusters/Objects.py | 4 +- .../python/test/test_scripts/base.py | 2 +- .../CHIP/templates/availability.yaml | 9 ++++ .../CHIP/zap-generated/MTRBaseClusters.mm | 2 +- .../CHIP/zap-generated/MTRClusters.mm | 2 +- .../zap-generated/MTRCommandPayloadsObjc.h | 8 ++- .../zap-generated/MTRCommandPayloadsObjc.mm | 25 +++++++--- .../zap-generated/cluster-objects.cpp | 7 +-- .../zap-generated/cluster-objects.h | 6 +-- .../zap-generated/cluster/Commands.h | 2 +- .../chip-tool/zap-generated/test/Commands.h | 50 +++++++++---------- .../zap-generated/cluster/Commands.h | 5 +- 67 files changed, 154 insertions(+), 124 deletions(-) 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 e47d6c41fef035..808d781ce4ca27 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 @@ -1561,7 +1561,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 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 b8051b249c47f4..68437a196a1287 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 @@ -1411,7 +1411,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 26b4f71e684bb3..9a5e0494d24228 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1236,7 +1236,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 91d380df17e411..1cc0aa78347c7e 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1088,7 +1088,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 038fcb6de0977f..1895d3f6b39d6f 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -907,7 +907,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 2f043101bdcf2b..c69ee132add8c0 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 4bfa4d7b38575b..27653cb1f7f9ad 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index afb4daa4f02ab3..ce5e5271e3d548 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 838c58bbb56a8f..21f185e38eedc4 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index f08b1286aa8a62..5458817123f751 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -827,7 +827,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index b60b27a39c94a0..72618cd6321b30 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index ac781a675bfb8d..48469c89fffca6 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -965,7 +965,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 13a9e11f9edfa1..f265729fd104df 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 0af0d7ed7fdb3a..db7357e0ee1066 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 8cedada81e9c80..0be99f3c8d0c9c 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 70b088eefe1682..59102bd916ab9f 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 7a51377ff42501..a7784c6df29601 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -915,7 +915,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index a0501828d5e951..2c32faa6b37c00 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -873,7 +873,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 8c510898487586..0f9d11dfa62f60 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -841,7 +841,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 700353c7f58506..7ae15fd75b220d 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -963,7 +963,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index be2615969272ce..2049ec09dfdeac 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 2a693e4b1e6fd6..27132a0f02235a 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index fa49aa6362caab..58e6dd7c2391f1 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 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 611cd6b8306dfb..098518172743c1 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 @@ -1033,7 +1033,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 26b4f71e684bb3..9a5e0494d24228 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -1236,7 +1236,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 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 0d1a1c382bfaa5..a192969c34f31d 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 @@ -1283,7 +1283,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index c1c694608683a5..623877d919bb3c 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1234,7 +1234,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index f130629386ff02..df1e83a77a9e4a 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -1005,7 +1005,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 1ffe1367aee41b..4813d33f6da103 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1107,7 +1107,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 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 53e94893fd520a..9fe993dff84b3b 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 @@ -615,7 +615,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 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 0f6471521fd769..dd3281754047f5 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 @@ -780,7 +780,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 1cd80b3b84eb89..674d4eda7b6611 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1311,7 +1311,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index c2aa039292b92c..a8f8b0ebf2455c 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1288,7 +1288,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 756c8659f9acff..ec599d5e71b27e 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -894,7 +894,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 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 97239df2d8a114..e864254efb8cf7 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 @@ -793,7 +793,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 05de5a718a65e6..3a70af9fcdc61a 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -628,7 +628,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index b04286a27a899e..754def5c8d2883 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1187,7 +1187,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index e1ed622db28296..c0918a5bcfa1b4 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1234,7 +1234,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 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 99bd3c236c458a..06af5df490777d 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 @@ -1451,7 +1451,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 9af01b3bc696f2..58e3279f589036 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1246,7 +1246,7 @@ server cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp index 24d3e37d8635e4..a78ccaf4c6ab9f 100644 --- a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp +++ b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp @@ -82,7 +82,7 @@ bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback( const Commands::OpenCommissioningWindow::DecodableType & commandData) { auto commissioningTimeout = System::Clock::Seconds16(commandData.commissioningTimeout); - auto & pakeVerifier = commandData.PAKEVerifier; + auto & pakeVerifier = commandData.PAKEPasscodeVerifier; auto & discriminator = commandData.discriminator; auto & iterations = commandData.iterations; auto & salt = commandData.salt; diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml index eee3a87604bb41..01b4346d7dd741 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml @@ -77,7 +77,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -146,7 +146,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -186,7 +186,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -207,7 +207,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml index 83ef331cee1d76..942bebf92c6f7c 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml @@ -284,7 +284,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -331,7 +331,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -386,7 +386,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -433,7 +433,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -452,7 +452,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml index d26e0c6207da11..2ca257d2b6bb8d 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml @@ -77,7 +77,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -118,7 +118,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -268,7 +268,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml index 42a8d19b800339..84e037d2b82867 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml @@ -68,7 +68,7 @@ tests: values: - name: "CommissioningTimeout" value: 900 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -103,7 +103,7 @@ tests: values: - name: "CommissioningTimeout" value: 901 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml index 794fd7362998f4..5a2b03b10de03f 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml @@ -68,7 +68,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -103,7 +103,7 @@ tests: values: - name: "CommissioningTimeout" value: 179 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml index ee32c447850692..8a820898be43c4 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml @@ -71,7 +71,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -261,7 +261,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -297,7 +297,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml index b44ec1edf8ca01..b8e661252cc609 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml @@ -82,7 +82,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -144,7 +144,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -208,7 +208,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: IncorrectPakeVerifier - name: "discriminator" value: discriminator @@ -229,7 +229,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator @@ -247,7 +247,7 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml index aaedd3de548812..f1b77997567ffb 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml @@ -82,7 +82,7 @@ tests: values: - name: "CommissioningTimeout" value: 900 - - name: "PAKEVerifier" + - name: "PAKEPasscodeVerifier" value: PakeVerifier - name: "discriminator" value: discriminator diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml index be76275b14b6f1..ede89c9600affe 100644 --- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml @@ -45,7 +45,7 @@ limitations under the License. This command is used by a current Administrator to instruct a Node to go into commissioning mode using enhanced commissioning method. - + diff --git a/src/controller/CommissioningWindowOpener.cpp b/src/controller/CommissioningWindowOpener.cpp index 99f7a0946e8615..71cb87b88e080d 100644 --- a/src/controller/CommissioningWindowOpener.cpp +++ b/src/controller/CommissioningWindowOpener.cpp @@ -141,7 +141,7 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindowInternal(Messaging: AdministratorCommissioning::Commands::OpenCommissioningWindow::Type request; request.commissioningTimeout = mCommissioningWindowTimeout.count(); - request.PAKEVerifier = serializedVerifierSpan; + request.PAKEPasscodeVerifier = serializedVerifierSpan; request.discriminator = mSetupPayload.discriminator.GetLongValue(); request.iterations = mPBKDFIterations; request.salt = mPBKDFSalt; diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 69e6e0abf4b03f..c2b10d9cdc4978 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1792,7 +1792,7 @@ client cluster AdministratorCommissioning = 60 { request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; - OCTET_STRING PAKEVerifier = 1; + OCTET_STRING PAKEPasscodeVerifier = 1; INT16U discriminator = 2; INT32U iterations = 3; OCTET_STRING salt = 4; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index f5664141d65a9c..4ae3c8e5af58d2 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -9723,7 +9723,7 @@ public AdministratorCommissioningCluster(long devicePtr, int endpointId) { public void openCommissioningWindow( DefaultClusterCallback callback, Integer commissioningTimeout, - byte[] PAKEVerifier, + byte[] PAKEPasscodeVerifier, Integer discriminator, Long iterations, byte[] salt, @@ -9732,7 +9732,7 @@ public void openCommissioningWindow( chipClusterPtr, callback, commissioningTimeout, - PAKEVerifier, + PAKEPasscodeVerifier, discriminator, iterations, salt, @@ -9754,7 +9754,7 @@ private native void openCommissioningWindow( long chipClusterPtr, DefaultClusterCallback Callback, Integer commissioningTimeout, - byte[] PAKEVerifier, + byte[] PAKEPasscodeVerifier, Integer discriminator, Long iterations, byte[] salt, diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 511492a5027eac..3db3bbbe30e9de 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -9298,11 +9298,11 @@ public Map> getCommandMap() { administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo); CommandParameterInfo - administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo = - new CommandParameterInfo("PAKEVerifier", byte[].class, byte[].class); + administratorCommissioningopenCommissioningWindowPAKEPasscodeVerifierCommandParameterInfo = + new CommandParameterInfo("PAKEPasscodeVerifier", byte[].class, byte[].class); administratorCommissioningopenCommissioningWindowCommandParams.put( - "PAKEVerifier", - administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo); + "PAKEPasscodeVerifier", + administratorCommissioningopenCommissioningWindowPAKEPasscodeVerifierCommandParameterInfo); CommandParameterInfo administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo = @@ -9330,7 +9330,7 @@ public Map> getCommandMap() { .openCommissioningWindow( (DefaultClusterCallback) callback, (Integer) commandArguments.get("commissioningTimeout"), - (byte[]) commandArguments.get("PAKEVerifier"), + (byte[]) commandArguments.get("PAKEPasscodeVerifier"), (Integer) commandArguments.get("discriminator"), (Long) commandArguments.get("iterations"), (byte[]) commandArguments.get("salt"), diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index f8ec1b46585faa..38ad1730b57cc8 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -3020,7 +3020,7 @@ class ChipClusters: "commandName": "OpenCommissioningWindow", "args": { "commissioningTimeout": "int", - "PAKEVerifier": "bytes", + "PAKEPasscodeVerifier": "bytes", "discriminator": "int", "iterations": "int", "salt": "bytes", diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 303e47d8a5f551..58012b98909f7b 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -11271,7 +11271,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="commissioningTimeout", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="PAKEVerifier", Tag=1, Type=bytes), + ClusterObjectFieldDescriptor(Label="PAKEPasscodeVerifier", Tag=1, Type=bytes), ClusterObjectFieldDescriptor(Label="discriminator", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="iterations", Tag=3, Type=uint), ClusterObjectFieldDescriptor(Label="salt", Tag=4, Type=bytes), @@ -11282,7 +11282,7 @@ def must_use_timed_invoke(cls) -> bool: return True commissioningTimeout: 'uint' = 0 - PAKEVerifier: 'bytes' = b"" + PAKEPasscodeVerifier: 'bytes' = b"" discriminator: 'uint' = 0 iterations: 'uint' = 0 salt: 'bytes' = b"" diff --git a/src/controller/python/test/test_scripts/base.py b/src/controller/python/test/test_scripts/base.py index 5cefae37631d2a..cca12fdc992a85 100644 --- a/src/controller/python/test/test_scripts/base.py +++ b/src/controller/python/test/test_scripts/base.py @@ -347,7 +347,7 @@ def TestFailsafe(self, nodeid: int): "Attempting to open enhanced commissioning window - this should fail since the failsafe is armed") try: res = asyncio.run(self.devCtrl.SendCommand(nodeid, 0, Clusters.AdministratorCommissioning.Commands.OpenCommissioningWindow( - commissioningTimeout=180, PAKEVerifier=verifier, discriminator=discriminator, iterations=iterations, salt=salt), timedRequestTimeoutMs=10000)) + commissioningTimeout=180, PAKEPasscodeVerifier=verifier, discriminator=discriminator, iterations=iterations, salt=salt), timedRequestTimeoutMs=10000)) # we actually want the exception here because we want to see a failure, so return False here self.logger.error( 'Incorrectly succeeded in opening enhanced commissioning window') diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 174774dc9b3b26..f740554a682705 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -4949,6 +4949,9 @@ RetrieveLogsResponse: - logContent - utcTimeStamp + AdministratorCommissioning: + OpenCommissioningWindow: + - pakePasscodeVerifier structs: OTASoftwareUpdateRequestor: - ProviderLocation @@ -5354,6 +5357,9 @@ RetrieveLogsResponse: - content - timeStamp + AdministratorCommissioning: + OpenCommissioningWindow: + - pakeVerifier structs: Descriptor: - DeviceType @@ -5504,6 +5510,9 @@ RetrieveLogsResponse: logContent: content utcTimeStamp: timeStamp + AdministratorCommissioning: + OpenCommissioningWindow: + pakePasscodeVerifier: pakeVerifier structs: AccessControl: AccessControlEntryStruct: AccessControlEntry diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index c6513ae12384df..b81b29a9b371a1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -39428,7 +39428,7 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO timedInvokeTimeoutMs.SetValue(10000); } request.commissioningTimeout = params.commissioningTimeout.unsignedShortValue; - request.PAKEVerifier = [self asByteSpan:params.pakeVerifier]; + request.PAKEPasscodeVerifier = [self asByteSpan:params.pakePasscodeVerifier]; request.discriminator = params.discriminator.unsignedShortValue; request.iterations = params.iterations.unsignedIntValue; request.salt = [self asByteSpan:params.salt]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 4ee84b4908302a..671370f3e1624f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -9816,7 +9816,7 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO timedInvokeTimeoutMs.SetValue(10000); } request.commissioningTimeout = params.commissioningTimeout.unsignedShortValue; - request.PAKEVerifier = [self asByteSpan:params.pakeVerifier]; + request.PAKEPasscodeVerifier = [self asByteSpan:params.pakePasscodeVerifier]; request.discriminator = params.discriminator.unsignedShortValue; request.iterations = params.iterations.unsignedIntValue; request.salt = [self asByteSpan:params.salt]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 4daf8479567632..5175d794573f57 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -2263,7 +2263,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nonnull commissioningTimeout API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) ; -@property (nonatomic, copy) NSData * _Nonnull pakeVerifier API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSData * _Nonnull pakePasscodeVerifier MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull discriminator API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -2287,6 +2287,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; @end +@interface MTRAdministratorCommissioningClusterOpenCommissioningWindowParams (Deprecated) + +@property (nonatomic, copy) NSData * _Nonnull pakeVerifier API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use pakePasscodeVerifier"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRAdministratorCommissioningClusterOpenBasicCommissioningWindowParams : NSObject diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 861638c62c5da4..fc9d9c62e69f31 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -3168,7 +3168,7 @@ - (instancetype)init _commissioningTimeout = @(0); - _pakeVerifier = [NSData data]; + _pakePasscodeVerifier = [NSData data]; _discriminator = @(0); @@ -3185,7 +3185,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init]; other.commissioningTimeout = self.commissioningTimeout; - other.pakeVerifier = self.pakeVerifier; + other.pakePasscodeVerifier = self.pakePasscodeVerifier; other.discriminator = self.discriminator; other.iterations = self.iterations; other.salt = self.salt; @@ -3196,13 +3196,26 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: commissioningTimeout:%@; pakeVerifier:%@; discriminator:%@; iterations:%@; salt:%@; >", - NSStringFromClass([self class]), _commissioningTimeout, [_pakeVerifier base64EncodedStringWithOptions:0], - _discriminator, _iterations, [_salt base64EncodedStringWithOptions:0]]; + NSString * descriptionString = [NSString + stringWithFormat:@"<%@: commissioningTimeout:%@; pakePasscodeVerifier:%@; discriminator:%@; iterations:%@; salt:%@; >", + NSStringFromClass([self class]), _commissioningTimeout, [_pakePasscodeVerifier base64EncodedStringWithOptions:0], + _discriminator, _iterations, [_salt base64EncodedStringWithOptions:0]]; return descriptionString; } +@end + +@implementation MTRAdministratorCommissioningClusterOpenCommissioningWindowParams (Deprecated) + +- (void)setPakeVerifier:(NSData * _Nonnull)pakeVerifier +{ + self.pakePasscodeVerifier = pakeVerifier; +} + +- (NSData * _Nonnull)pakeVerifier +{ + return self.pakePasscodeVerifier; +} @end @implementation MTRAdministratorCommissioningClusterOpenBasicCommissioningWindowParams - (instancetype)init diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index f1e122f28d43f2..dae848078394c0 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -8715,7 +8715,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure( DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCommissioningTimeout)), commissioningTimeout)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPAKEVerifier)), PAKEVerifier)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPAKEPasscodeVerifier)), PAKEPasscodeVerifier)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDiscriminator)), discriminator)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIterations)), iterations)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSalt)), salt)); @@ -8740,8 +8741,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kCommissioningTimeout): ReturnErrorOnFailure(DataModel::Decode(reader, commissioningTimeout)); break; - case to_underlying(Fields::kPAKEVerifier): - ReturnErrorOnFailure(DataModel::Decode(reader, PAKEVerifier)); + case to_underlying(Fields::kPAKEPasscodeVerifier): + ReturnErrorOnFailure(DataModel::Decode(reader, PAKEPasscodeVerifier)); break; case to_underlying(Fields::kDiscriminator): ReturnErrorOnFailure(DataModel::Decode(reader, discriminator)); 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 4998f1b07f35f7..71c15d330b5576 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 @@ -11051,7 +11051,7 @@ namespace OpenCommissioningWindow { enum class Fields { kCommissioningTimeout = 0, - kPAKEVerifier = 1, + kPAKEPasscodeVerifier = 1, kDiscriminator = 2, kIterations = 3, kSalt = 4, @@ -11065,7 +11065,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; } uint16_t commissioningTimeout = static_cast(0); - chip::ByteSpan PAKEVerifier; + chip::ByteSpan PAKEPasscodeVerifier; uint16_t discriminator = static_cast(0); uint32_t iterations = static_cast(0); chip::ByteSpan salt; @@ -11084,7 +11084,7 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; } uint16_t commissioningTimeout = static_cast(0); - chip::ByteSpan PAKEVerifier; + chip::ByteSpan PAKEPasscodeVerifier; uint16_t discriminator = static_cast(0); uint32_t iterations = static_cast(0); chip::ByteSpan salt; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index a89e062b249ca8..fe85a94a241f75 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -3058,7 +3058,7 @@ class AdministratorCommissioningOpenCommissioningWindow : public ClusterCommand ClusterCommand("open-commissioning-window", credsIssuerConfig) { AddArgument("CommissioningTimeout", 0, UINT16_MAX, &mRequest.commissioningTimeout); - AddArgument("PAKEVerifier", &mRequest.PAKEVerifier); + AddArgument("PAKEPasscodeVerifier", &mRequest.PAKEPasscodeVerifier); AddArgument("Discriminator", 0, UINT16_MAX, &mRequest.discriminator); AddArgument("Iterations", 0, UINT32_MAX, &mRequest.iterations); AddArgument("Salt", &mRequest.salt); diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 290abe1ea66f01..5733c20be38e39 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -91731,7 +91731,7 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -91782,7 +91782,7 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -91823,7 +91823,7 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -91849,7 +91849,7 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -92297,7 +92297,7 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -92338,7 +92338,7 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -92433,7 +92433,7 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -93339,7 +93339,7 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 900U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -93376,7 +93376,7 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 901U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -93621,7 +93621,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -93739,7 +93739,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -93776,7 +93776,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -94345,7 +94345,7 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -94395,7 +94395,7 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -94465,7 +94465,7 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mIncorrectPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mIncorrectPakeVerifier.HasValue() ? mIncorrectPakeVerifier.Value() : chip::ByteSpan(chip::Uint8::from_const_char( "\x06\xc7\x56\xdf\xfc\xd7\x22\x65\x34\x52\xa1\x2d\xcd\x94\x5d\x8c\x54\xda\x2b\x0f\x3c\xbd\x1b" @@ -94488,7 +94488,7 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -94512,7 +94512,7 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -95089,7 +95089,7 @@ class Test_TC_CADMIN_1_9Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 900U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -96131,7 +96131,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -96168,7 +96168,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -96208,7 +96208,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -96245,7 +96245,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -96269,7 +96269,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -96599,7 +96599,7 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 180U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( @@ -96636,7 +96636,7 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type value; value.commissioningTimeout = 179U; - value.PAKEVerifier = mPakeVerifier.HasValue() + value.PAKEPasscodeVerifier = mPakeVerifier.HasValue() ? mPakeVerifier.Value() : chip::ByteSpan( chip::Uint8::from_const_char( diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index ff4856b9664bb6..da7b7867a33d39 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -32597,7 +32597,7 @@ class AdministratorCommissioningOpenCommissioningWindow : public ClusterCommand : ClusterCommand("open-commissioning-window") { AddArgument("CommissioningTimeout", 0, UINT16_MAX, &mRequest.commissioningTimeout); - AddArgument("PAKEVerifier", &mRequest.PAKEVerifier); + AddArgument("PAKEPasscodeVerifier", &mRequest.PAKEPasscodeVerifier); AddArgument("Discriminator", 0, UINT16_MAX, &mRequest.discriminator); AddArgument("Iterations", 0, UINT32_MAX, &mRequest.iterations); AddArgument("Salt", &mRequest.salt); @@ -32616,7 +32616,8 @@ class AdministratorCommissioningOpenCommissioningWindow : public ClusterCommand params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.commissioningTimeout = [NSNumber numberWithUnsignedShort:mRequest.commissioningTimeout]; - params.pakeVerifier = [NSData dataWithBytes:mRequest.PAKEVerifier.data() length:mRequest.PAKEVerifier.size()]; + params.pakePasscodeVerifier = [NSData dataWithBytes:mRequest.PAKEPasscodeVerifier.data() + length:mRequest.PAKEPasscodeVerifier.size()]; params.discriminator = [NSNumber numberWithUnsignedShort:mRequest.discriminator]; params.iterations = [NSNumber numberWithUnsignedInt:mRequest.iterations]; params.salt = [NSData dataWithBytes:mRequest.salt.data() length:mRequest.salt.size()];