diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig index 1a637694d36b12..7a9e3ab54323c6 100644 --- a/config/esp32/components/chip/Kconfig +++ b/config/esp32/components/chip/Kconfig @@ -716,13 +716,6 @@ menu "CHIP Device Layer" The supplied address must be a dot-notation IP address--not a host name. The port number is optional; if present it should be separated from the IP address with a colon (e.g. 192.168.1.100:5540). - config LOG_PROVISIONING_HASH - bool "Enable Provisioning Hash Logging" - default n - help - Compute and log a hash of the device's provisioning data on boot. The generated hash value confirms - to the form described in the CHIP: Factory Provisioning Specification. - endmenu menu "Network Telemetry Options" diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h index f0e6f92fdce9fb..2eca4e43012810 100644 --- a/src/include/platform/CHIPDeviceConfig.h +++ b/src/include/platform/CHIPDeviceConfig.h @@ -91,18 +91,6 @@ #define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 100 #endif -/** - * CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH - * - * Compute and log a hash of the device's provisioning data on boot. - * - * The generated hash value confirms to the form described in the CHIP: Factory - * Provisioning Specification. - */ -#ifndef CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 1 -#endif - /** * CHIP_DEVICE_CONFIG_ENABLE_SED * diff --git a/src/platform/Ameba/CHIPDevicePlatformConfig.h b/src/platform/Ameba/CHIPDevicePlatformConfig.h index f0bf671f2ec625..bddca5e26a9001 100644 --- a/src/platform/Ameba/CHIPDevicePlatformConfig.h +++ b/src/platform/Ameba/CHIPDevicePlatformConfig.h @@ -56,7 +56,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_LAYER_NONE 0 diff --git a/src/platform/Beken/CHIPDevicePlatformConfig.h b/src/platform/Beken/CHIPDevicePlatformConfig.h index 622faa03e9110f..e0d60d4bb0c942 100755 --- a/src/platform/Beken/CHIPDevicePlatformConfig.h +++ b/src/platform/Beken/CHIPDevicePlatformConfig.h @@ -58,7 +58,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_LAYER_NONE 0 diff --git a/src/platform/Darwin/CHIPDevicePlatformConfig.h b/src/platform/Darwin/CHIPDevicePlatformConfig.h index 690a5eaf97b36d..6d0306b5ed829e 100644 --- a/src/platform/Darwin/CHIPDevicePlatformConfig.h +++ b/src/platform/Darwin/CHIPDevicePlatformConfig.h @@ -75,9 +75,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -// TODO: CHIP has redesigned the crypto interface, pending on the final version of CHIP HASH APIs -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 - // Reserve a single dynamic endpoint that we can use to host things like OTA // Provider server. #if !defined(CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT) || CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT == 0 diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/EFR32/CHIPDevicePlatformConfig.h index f11cd7a560429e..aacb441d2ad787 100644 --- a/src/platform/EFR32/CHIPDevicePlatformConfig.h +++ b/src/platform/EFR32/CHIPDevicePlatformConfig.h @@ -98,6 +98,5 @@ #ifndef CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME #define CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME "BLE_EVENT" #endif // CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 25 diff --git a/src/platform/ESP32/CHIPDevicePlatformConfig.h b/src/platform/ESP32/CHIPDevicePlatformConfig.h index e67623ad959e49..2186b37e201bc1 100644 --- a/src/platform/ESP32/CHIPDevicePlatformConfig.h +++ b/src/platform/ESP32/CHIPDevicePlatformConfig.h @@ -95,7 +95,6 @@ #define CHIP_DEVICE_CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE #define CHIP_DEVICE_CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE #define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH CONFIG_LOG_PROVISIONING_HASH #define CHIP_DEVICE_CONFIG_CHIP_FACTORY_NAMESPACE_PARTITION CONFIG_CHIP_FACTORY_NAMESPACE_PARTITION_LABEL #define CHIP_DEVICE_CONFIG_CHIP_CONFIG_NAMESPACE_PARTITION CONFIG_CHIP_CONFIG_NAMESPACE_PARTITION_LABEL #define CHIP_DEVICE_CONFIG_CHIP_COUNTERS_NAMESPACE_PARTITION CONFIG_CHIP_COUNTERS_NAMESPACE_PARTITION_LABEL diff --git a/src/platform/Infineon/CYW30739/CHIPDevicePlatformConfig.h b/src/platform/Infineon/CYW30739/CHIPDevicePlatformConfig.h index be32222cf4f9fd..f66eab30f51e68 100644 --- a/src/platform/Infineon/CYW30739/CHIPDevicePlatformConfig.h +++ b/src/platform/Infineon/CYW30739/CHIPDevicePlatformConfig.h @@ -26,7 +26,6 @@ // -------------------- General Configuration -------------------- #define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 0x00001300 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 // -------------------- WiFi Station Configuration -------------------- diff --git a/src/platform/Infineon/PSOC6/CHIPDevicePlatformConfig.h b/src/platform/Infineon/PSOC6/CHIPDevicePlatformConfig.h index 51aae4d025170d..83ed0970338f75 100644 --- a/src/platform/Infineon/PSOC6/CHIPDevicePlatformConfig.h +++ b/src/platform/Infineon/PSOC6/CHIPDevicePlatformConfig.h @@ -29,8 +29,6 @@ #define CHIP_DEVICE_CONFIG_LWIP_WIFI_STATION_IF_NAME "infineon" -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 - /* The VendorName attribute of the Basic cluster. */ #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME "Infineon" diff --git a/src/platform/Linux/CHIPDevicePlatformConfig.h b/src/platform/Linux/CHIPDevicePlatformConfig.h index 23aaff4ace2ab2..78cd07d33a7564 100644 --- a/src/platform/Linux/CHIPDevicePlatformConfig.h +++ b/src/platform/Linux/CHIPDevicePlatformConfig.h @@ -81,6 +81,3 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 - -// TODO: CHIP has redesigned the crypto interface, pending on the final version of CHIP HASH APIs -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 diff --git a/src/platform/Tizen/CHIPDevicePlatformConfig.h b/src/platform/Tizen/CHIPDevicePlatformConfig.h index 0095102140f7cd..76febdb9762cd8 100644 --- a/src/platform/Tizen/CHIPDevicePlatformConfig.h +++ b/src/platform/Tizen/CHIPDevicePlatformConfig.h @@ -57,5 +57,3 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 - -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 diff --git a/src/platform/Zephyr/CHIPDevicePlatformConfig.h b/src/platform/Zephyr/CHIPDevicePlatformConfig.h index d66d95a2bdd868..9a13d719794333 100644 --- a/src/platform/Zephyr/CHIPDevicePlatformConfig.h +++ b/src/platform/Zephyr/CHIPDevicePlatformConfig.h @@ -93,7 +93,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0 diff --git a/src/platform/android/CHIPDevicePlatformConfig.h b/src/platform/android/CHIPDevicePlatformConfig.h index f7ee1b21c6a2c1..8753721015ff0a 100644 --- a/src/platform/android/CHIPDevicePlatformConfig.h +++ b/src/platform/android/CHIPDevicePlatformConfig.h @@ -83,6 +83,3 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 - -// TODO: CHIP has redesigned the crypto interface, pending on the final version of CHIP HASH APIs -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 diff --git a/src/platform/bouffalolab/BL602/CHIPDevicePlatformConfig.h b/src/platform/bouffalolab/BL602/CHIPDevicePlatformConfig.h index 572a988fccb832..a8d041d9e443c1 100644 --- a/src/platform/bouffalolab/BL602/CHIPDevicePlatformConfig.h +++ b/src/platform/bouffalolab/BL602/CHIPDevicePlatformConfig.h @@ -128,6 +128,5 @@ #ifndef CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME #define CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME "BLE_EVENT" #endif // CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 25 diff --git a/src/platform/bouffalolab/BL702/CHIPDevicePlatformConfig.h b/src/platform/bouffalolab/BL702/CHIPDevicePlatformConfig.h index e54231f2198166..935956430f6f51 100644 --- a/src/platform/bouffalolab/BL702/CHIPDevicePlatformConfig.h +++ b/src/platform/bouffalolab/BL702/CHIPDevicePlatformConfig.h @@ -28,7 +28,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 #define CHIP_DEVICE_CONFIG_ENABLE_TUNNEL_TELEMETRY 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 // ========== CHIP Platform Configuration ========= #define CHIP_DEVICE_CONFIG_THREAD_TASK_STACK_SIZE (4 * 1024) diff --git a/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h b/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h index 0a6cb406d9ca52..cc2470e9c3a7b6 100644 --- a/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h +++ b/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h @@ -35,7 +35,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 #define CHIP_DEVICE_CONFIG_ENABLE_TUNNEL_TELEMETRY 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 // ========== CHIP Platform Configuration ========= diff --git a/src/platform/cc32xx/CHIPDevicePlatformConfig.h b/src/platform/cc32xx/CHIPDevicePlatformConfig.h index 0a3b387aa4df0e..2427ce682e2493 100644 --- a/src/platform/cc32xx/CHIPDevicePlatformConfig.h +++ b/src/platform/cc32xx/CHIPDevicePlatformConfig.h @@ -40,7 +40,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 #define CHIP_DEVICE_CONFIG_ENABLE_TUNNEL_TELEMETRY 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 // ========== CHIP Platform Configuration ========= #define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE (8192) diff --git a/src/platform/mbed/CHIPDevicePlatformConfig.h b/src/platform/mbed/CHIPDevicePlatformConfig.h index cc88b4d081cef1..7ae08288bbe76d 100644 --- a/src/platform/mbed/CHIPDevicePlatformConfig.h +++ b/src/platform/mbed/CHIPDevicePlatformConfig.h @@ -51,8 +51,6 @@ // ========== Platform-specific Configuration Overrides ========= -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 - #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE #define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 8192 #endif // CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE diff --git a/src/platform/mt793x/CHIPDevicePlatformConfig.h b/src/platform/mt793x/CHIPDevicePlatformConfig.h index 4539dc7e774ce4..808c37bf3417b2 100644 --- a/src/platform/mt793x/CHIPDevicePlatformConfig.h +++ b/src/platform/mt793x/CHIPDevicePlatformConfig.h @@ -90,7 +90,6 @@ #ifndef CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME #define CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME "BLE_EVENT" #endif // CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 25 diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h index d18c4af235cb3d..7e0b8af9fd0883 100644 --- a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h +++ b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h @@ -189,7 +189,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0 diff --git a/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h b/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h index c5cc9287e5c97e..91281fff0cd51c 100644 --- a/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h +++ b/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h @@ -163,7 +163,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0 diff --git a/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h b/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h index 2beb635075ab34..c5e64c054a4a06 100644 --- a/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h +++ b/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h @@ -61,7 +61,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 // mdns/mdns_sd ++ //#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DISCOVERY 1 diff --git a/src/platform/qpg/CHIPDevicePlatformConfig.h b/src/platform/qpg/CHIPDevicePlatformConfig.h index dd2434ce95f897..d546b0a5bdcb6e 100644 --- a/src/platform/qpg/CHIPDevicePlatformConfig.h +++ b/src/platform/qpg/CHIPDevicePlatformConfig.h @@ -61,7 +61,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 // Per 5.2.5.2. Commencement Section of CHIP spec, BLE advertisement is // disabled for Locks and Barrier Access Devices. diff --git a/src/platform/telink/CHIPDevicePlatformConfig.h b/src/platform/telink/CHIPDevicePlatformConfig.h index dadbf34fb2ddde..64e099981552b2 100644 --- a/src/platform/telink/CHIPDevicePlatformConfig.h +++ b/src/platform/telink/CHIPDevicePlatformConfig.h @@ -95,7 +95,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 #define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0 diff --git a/src/platform/webos/CHIPDevicePlatformConfig.h b/src/platform/webos/CHIPDevicePlatformConfig.h index 3b37c5ccfcf1ad..eb5de503df06ae 100644 --- a/src/platform/webos/CHIPDevicePlatformConfig.h +++ b/src/platform/webos/CHIPDevicePlatformConfig.h @@ -81,6 +81,3 @@ #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 - -// TODO: CHIP has redesigned the crypto interface, pending on the final version of CHIP HASH APIs -#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0