Merge branch 'refactor/remove_ot_cmac' into 'master'

chshu · chshu · commit 1e87d43f1ae1 · 2025-12-19T02:02:15.000Z
refactor(openthread/zigbee): remove CMAC from sdkconfig.defaults

See merge request espressif/esp-idf!44008
diff --git a/examples/openthread/ot_br/sdkconfig.defaults b/examples/openthread/ot_br/sdkconfig.defaults
@@ -11,7 +11,6 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 # mbedTLS
 #
-CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
 # end of TLS Key Exchange Methods
diff --git a/examples/openthread/ot_cli/sdkconfig.defaults b/examples/openthread/ot_cli/sdkconfig.defaults
@@ -11,7 +11,6 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 # mbedTLS
 #
-CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
 CONFIG_MBEDTLS_ECJPAKE_C=y
diff --git a/examples/openthread/ot_sleepy_device/deep_sleep/sdkconfig.defaults b/examples/openthread/ot_sleepy_device/deep_sleep/sdkconfig.defaults
@@ -9,7 +9,6 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 #
 # mbedTLS
 #
-CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
 CONFIG_MBEDTLS_ECJPAKE_C=y
diff --git a/examples/openthread/ot_sleepy_device/light_sleep/sdkconfig.defaults b/examples/openthread/ot_sleepy_device/light_sleep/sdkconfig.defaults
@@ -9,7 +9,6 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 #
 # mbedTLS
 #
-CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
 CONFIG_MBEDTLS_ECJPAKE_C=y
diff --git a/examples/openthread/ot_trel/sdkconfig.defaults b/examples/openthread/ot_trel/sdkconfig.defaults
@@ -11,7 +11,6 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 # mbedTLS
 #
-CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
 CONFIG_MBEDTLS_ECJPAKE_C=y
diff --git a/examples/zigbee/esp_zigbee_gateway/sdkconfig.defaults b/examples/zigbee/esp_zigbee_gateway/sdkconfig.defaults
@@ -8,20 +8,6 @@ CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
 
-#
-# mbedTLS
-#
-CONFIG_MBEDTLS_HARDWARE_AES=n
-CONFIG_MBEDTLS_HARDWARE_MPI=n
-CONFIG_MBEDTLS_HARDWARE_SHA=n
-CONFIG_MBEDTLS_CMAC_C=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
-# end of TLS Key Exchange Methods
-
-CONFIG_MBEDTLS_ECJPAKE_C=y
-# end of mbedTLS
-
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 
 #
diff --git a/examples/zigbee/light_sample/HA_on_off_light/sdkconfig.defaults b/examples/zigbee/light_sample/HA_on_off_light/sdkconfig.defaults
@@ -8,20 +8,6 @@ CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
 
-#
-# mbedTLS
-#
-CONFIG_MBEDTLS_HARDWARE_AES=n
-CONFIG_MBEDTLS_HARDWARE_MPI=n
-CONFIG_MBEDTLS_HARDWARE_SHA=n
-CONFIG_MBEDTLS_CMAC_C=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
-# end of TLS Key Exchange Methods
-
-CONFIG_MBEDTLS_ECJPAKE_C=y
-# end of mbedTLS
-
 #
 # Zboss
 #
diff --git a/examples/zigbee/light_sample/HA_on_off_switch/sdkconfig.defaults b/examples/zigbee/light_sample/HA_on_off_switch/sdkconfig.defaults
@@ -8,20 +8,6 @@ CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
 
-#
-# mbedTLS
-#
-CONFIG_MBEDTLS_HARDWARE_AES=n
-CONFIG_MBEDTLS_HARDWARE_MPI=n
-CONFIG_MBEDTLS_HARDWARE_SHA=n
-CONFIG_MBEDTLS_CMAC_C=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
-# end of TLS Key Exchange Methods
-
-CONFIG_MBEDTLS_ECJPAKE_C=y
-# end of mbedTLS
-
 #
 # Zboss
 #

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ CONFIG_PARTITION_TABLE_MD5=y`
`11`	`11`	`#`
`12`	`12`	`# mbedTLS`
`13`	`13`	`#`
`14`		`-CONFIG_MBEDTLS_CMAC_C=y`
`15`	`14`	`CONFIG_MBEDTLS_SSL_PROTO_DTLS=y`
`16`	`15`	`CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y`
`17`	`16`	`# end of TLS Key Exchange Methods`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"`
`9`	`9`	`#`
`10`	`10`	`# mbedTLS`
`11`	`11`	`#`
`12`		`-CONFIG_MBEDTLS_CMAC_C=y`
`13`	`12`	`CONFIG_MBEDTLS_SSL_PROTO_DTLS=y`
`14`	`13`	`CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y`
`15`	`14`	`CONFIG_MBEDTLS_ECJPAKE_C=y`