Share the implementation of hashlib across ports

.. many platforms can use mbedtls to implement hashlib.

Compile-tested with pico-w. Tested on feather rp2040 dvi.

Author: jepler

ports/raspberrypi/mbedtls/crt_bundle.c renamed to lib/mbedtls_config/crt_bundle.c

@@ -19,8 +19,8 @@
 
 #include "py/runtime.h"
 #include "py/mperrno.h"
-#include "mbedtls/x509_crt.h"
-#include "mbedtls/crt_bundle.h"
+#include "lib/mbedtls/include/mbedtls/x509_crt.h"
+#include "lib/mbedtls_config/crt_bundle.h"
 
 #define BUNDLE_HEADER_OFFSET 2
 #define CRT_HEADER_OFFSET 4

ports/raspberrypi/mbedtls/crt_bundle.h renamed to lib/mbedtls_config/crt_bundle.h

@@ -0,0 +1,59 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+
+// If you want to debug MBEDTLS uncomment the following and
+// Pass 3 to mbedtls_debug_set_threshold in socket_new
+// #define MBEDTLS_DEBUG_C
+
+// Set mbedtls configuration
+#define MBEDTLS_PLATFORM_C
+#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+#define MBEDTLS_DEPRECATED_REMOVED
+#define MBEDTLS_ENTROPY_HARDWARE_ALT
+
+// Enable mbedtls modules
+#define MBEDTLS_MD_C
+#define MBEDTLS_MD5_C
+#define MBEDTLS_SHA1_C
+#define MBEDTLS_SHA256_C
+#define MBEDTLS_SHA512_C
+#undef MBEDTLS_HAVE_TIME_DATE
+
+// Memory allocation hooks
+#include <stdlib.h>
+#include <stdio.h>
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr);
+#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
+#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
+#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
+
+#include "mbedtls/check_config.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */

ports/raspberrypi/mbedtls/mbedtls_config.h renamed to lib/mbedtls_config/mbedtls_config.h

@@ -354,10 +354,10 @@ SRC_MBEDTLS := $(addprefix lib/mbedtls/library/, \
         x509write_csr.c \
         xtea.c \
 	)
-SRC_C += $(SRC_MBEDTLS) mbedtls/mbedtls_port.c mbedtls/crt_bundle.c
+SRC_C += $(SRC_MBEDTLS) $(TOP)/lib/mbedtls_config/mbedtls_port.c $(TOP)/lib/mbedtls_config/crt_bundle.c
 CFLAGS += \
 	  -isystem $(TOP)/lib/mbedtls/include \
-	  -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"' \
+	  -DMBEDTLS_CONFIG_FILE='"$(TOP)/lib/mbedtls_config/mbedtls_config.h"' \
 
 $(BUILD)/x509_crt_bundle.S: $(TOP)/lib/certificates/data/roots.pem $(TOP)/tools/gen_crt_bundle.py
 	$(Q)$(PYTHON) $(TOP)/tools/gen_crt_bundle.py -i $< -o $@ --asm

lib/mbedtls_config/mbedtls_config_hashlib.h

@@ -31,7 +31,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 
-#include "mbedtls/crt_bundle.h"
+#include "lib/mbedtls_config/crt_bundle.h"
 
 void common_hal_ssl_sslcontext_construct(ssl_sslcontext_obj_t *self) {
     common_hal_ssl_sslcontext_set_default_verify_paths(self);

ports/raspberrypi/mbedtls/mbedtls_port.c renamed to lib/mbedtls_config/mbedtls_port.c

@@ -28,7 +28,7 @@
 #include "common-hal/ssl/__init__.h"
 #include "shared-bindings/ssl/__init__.h"
 #include "shared-bindings/ssl/SSLContext.h"
-#include "mbedtls/crt_bundle.h"
+#include "lib/mbedtls_config/crt_bundle.h"
 
 void common_hal_ssl_create_default_context(ssl_sslcontext_obj_t *self) {
     common_hal_ssl_sslcontext_construct(self);

ports/raspberrypi/Makefile

@@ -6,14 +6,15 @@ CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS = 0
 
 CIRCUITPY_ALARM ?= 1
-
 CIRCUITPY_RP2PIO ?= 1
 CIRCUITPY_NEOPIXEL_WRITE ?= $(CIRCUITPY_RP2PIO)
 CIRCUITPY_FLOPPYIO ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_DISPLAYIO)
 CIRCUITPY_FULL_BUILD ?= 1
 CIRCUITPY_AUDIOMP3 ?= 1
 CIRCUITPY_BITOPS ?= 1
+CIRCUITPY_HASHLIB ?= 1
+CIRCUITPY_HASHLIB_MBEDTLS ?= 1
 CIRCUITPY_IMAGECAPTURE ?= 1
 CIRCUITPY_MEMORYMAP ?= 1
 CIRCUITPY_PWMIO ?= 1
@@ -24,8 +25,9 @@ CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
 CIRCUITPY_USB_HOST ?= 1
 
 # Things that need to be implemented.
-# Use PWM internally
 CIRCUITPY_FREQUENCYIO = 0
+
+# Use PWM internally
 CIRCUITPY_I2CTARGET = 1
 CIRCUITPY_NVM = 1
 # Use PIO internally

ports/raspberrypi/common-hal/ssl/SSLContext.c

@@ -474,8 +474,6 @@ SRC_COMMON_HAL_ALL = \
 	gnss/GNSS.c \
 	gnss/PositionFix.c \
 	gnss/SatelliteSystem.c \
-	hashlib/__init__.c \
-	hashlib/Hash.c \
 	i2ctarget/I2CTarget.c \
 	i2ctarget/__init__.c \
 	memorymap/__init__.c \
@@ -761,6 +759,29 @@ SRC_MOD += lib/tjpgd/src/tjpgd.c
 $(BUILD)/lib/tjpgd/src/tjpgd.o: CFLAGS += -Wno-shadow -Wno-cast-align
 endif
 
+ifeq ($(CIRCUITPY_HASHLIB_MBEDTLS_ONLY),1)
+SRC_MOD += $(addprefix lib/mbedtls/library/, \
+        sha1.c \
+        sha256.c \
+        sha512.c \
+        platform_util.c \
+	)
+CFLAGS += \
+	  -isystem $(TOP)/lib/mbedtls/include \
+	  -DMBEDTLS_CONFIG_FILE='"$(TOP)/lib/mbedtls_config/mbedtls_config_hashlib.h"' \
+
+endif
+
+ifeq ($(CIRCUITPY_HASHLIB_MBEDTLS),1)
+SRC_SHARED_MODULE_ALL += \
+	hashlib/Hash.c \
+	hashlib/__init__.c
+else
+SRC_COMMON_HAL_ALL += \
+	hashlib/Hash.c \
+	hashlib/__init__.c
+endif
+
 ifeq ($(CIRCUITPY_RGBMATRIX),1)
 SRC_MOD += $(addprefix lib/protomatter/src/, \
 	core.c \