enable hashlib and zlib in zephyr port and add tests for them

FoamyGuy · FoamyGuy · commit e234e622e821 · 2026-04-12T13:14:33.000-05:00
diff --git a/ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/native/native_sim/autogen_board_info.toml b/ports/zephyr-cp/boards/native/native_sim/autogen_board_info.toml
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = true # Zephyr board has zephyr_display
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/native/nrf5340bsim/autogen_board_info.toml b/ports/zephyr-cp/boards/native/nrf5340bsim/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/nordic/nrf5340dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf5340dk/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/nordic/nrf54h20dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf54h20dk/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/nordic/nrf54l15dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf54l15dk/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml
@@ -117,4 +117,4 @@ watchdog = false
 wifi = true # Zephyr board has wifi
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/nxp/frdm_mcxn947/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/frdm_mcxn947/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/nxp/frdm_rw612/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/frdm_rw612/autogen_board_info.toml
@@ -117,4 +117,4 @@ watchdog = false
 wifi = true # Zephyr board has wifi
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/autogen_board_info.toml
@@ -117,4 +117,4 @@ watchdog = false
 wifi = true # Zephyr board has wifi
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/autogen_board_info.toml
@@ -117,4 +117,4 @@ watchdog = false
 wifi = true # Zephyr board has wifi
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/renesas/da14695_dk_usb/autogen_board_info.toml b/ports/zephyr-cp/boards/renesas/da14695_dk_usb/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/renesas/ek_ra6m5/autogen_board_info.toml b/ports/zephyr-cp/boards/renesas/ek_ra6m5/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/renesas/ek_ra8d1/autogen_board_info.toml b/ports/zephyr-cp/boards/renesas/ek_ra8d1/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = true # Zephyr board has zephyr_display
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/st/nucleo_n657x0_q/autogen_board_info.toml b/ports/zephyr-cp/boards/st/nucleo_n657x0_q/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/st/nucleo_u575zi_q/autogen_board_info.toml b/ports/zephyr-cp/boards/st/nucleo_u575zi_q/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/st/stm32h750b_dk/autogen_board_info.toml b/ports/zephyr-cp/boards/st/stm32h750b_dk/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = true # Zephyr board has zephyr_display
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/st/stm32h7b3i_dk/autogen_board_info.toml b/ports/zephyr-cp/boards/st/stm32h7b3i_dk/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = true # Zephyr board has zephyr_display
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/boards/st/stm32wba65i_dk1/autogen_board_info.toml b/ports/zephyr-cp/boards/st/stm32wba65i_dk1/autogen_board_info.toml
@@ -50,7 +50,7 @@ frequencyio = false
 getpass = false
 gifio = false
 gnss = false
-hashlib = false
+hashlib = true
 hostnetwork = false
 i2cdisplaybus = true # Zephyr board has busio
 i2cioexpander = false
@@ -117,4 +117,4 @@ watchdog = false
 wifi = false
 zephyr_display = false
 zephyr_kernel = false
-zlib = false
+zlib = true
diff --git a/ports/zephyr-cp/cptools/build_circuitpython.py b/ports/zephyr-cp/cptools/build_circuitpython.py
@@ -62,6 +62,8 @@
     "math",
     "msgpack",
     "aesio",
+    "hashlib",
+    "zlib",
 ]
 # Flags that don't match with with a *bindings module. Some used by adafruit_requests
 MPCONFIG_FLAGS = ["array", "errno", "io", "json", "math"]
@@ -108,6 +110,13 @@
 # No QSTR processing or CIRCUITPY specific flags
 LIBRARY_SOURCE = {
     "audiomp3": ["lib/mp3/src/*.c"],
+    "zlib": [
+        "lib/uzlib/tinflate.c",
+        "lib/uzlib/tinfzlib.c",
+        "lib/uzlib/tinfgzip.c",
+        "lib/uzlib/adler32.c",
+        "lib/uzlib/crc32.c",
+    ],
 }
 
 SHARED_MODULE_AND_COMMON_HAL = ["_bleio", "os", "rotaryio"]
diff --git a/ports/zephyr-cp/prj.conf b/ports/zephyr-cp/prj.conf
@@ -49,3 +49,8 @@ CONFIG_I2S=y
 CONFIG_DYNAMIC_THREAD=y
 CONFIG_DYNAMIC_THREAD_ALLOC=y
 CONFIG_DYNAMIC_THREAD_PREFER_ALLOC=y
+
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_MBEDTLS_SHA1=y
+CONFIG_MBEDTLS_SHA256=y
diff --git a/ports/zephyr-cp/tests/test_hashlib.py b/ports/zephyr-cp/tests/test_hashlib.py
diff --git a/ports/zephyr-cp/tests/test_zlib.py b/ports/zephyr-cp/tests/test_zlib.py
