Well, it compiles . .

annejan · annejan · commit 4ebc773bfcc8 · 2017-07-04T14:57:09.000+02:00
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -53,6 +53,7 @@ INC += -I../lib/timeutils
 INC += -I../../components/badge
 INC += -I../../components/ugfx
 INC += -I../../components/graph
+INC += -I../../components/sha2017
 INC += -I../../main
 INC += -I../../ugfx/src/gdisp/mcufont
 INC += -I../../ugfx
@@ -155,7 +156,6 @@ SRC_C = \
 	$(SRC_MOD)
 
 ### TODO remove hardcoded images when loader works ;)
-
 BADGE_MAIN_SRC_C = $(addprefix ../../main/,\
 	imgv2_menu.c \
 	imgv2_nick.c \
@@ -590,7 +590,7 @@ OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_WPA_SUPPLICANT_O))
 ####################
 # Badge magic
 
-$(BUILD)/components/%.o: CFLAGS += -Wno-strict-aliasing
+$(BUILD)/components/%.o:
 BADGE_COMPONENTS_O = $(addprefix $(BADGE)/components/,\
 	badge/badge_base.o \
 	badge/badge_eink.o \
@@ -613,6 +613,7 @@ BADGE_COMPONENTS_O = $(addprefix $(BADGE)/components/,\
 	ugfx/gdisp_lld_framebuffer.o \
 	ugfx/ginput_lld_toggle.o \
 	ugfx/gfx_mk.o \
+	sha2017/wildcard_sha2017_org.o \
 	)
 
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(BADGE_COMPONENTS_O))
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
@@ -45,8 +45,7 @@
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/debug.h"
 
-extern const uint8_t server_root_cert_pem_start[] asm("_binary_server_root_cert_pem_start");
-extern const uint8_t server_root_cert_pem_end[]   asm("_binary_server_root_cert_pem_end");
+#include "wildcard_sha2017_org.h"
 
 typedef struct _mp_obj_ssl_socket_t {
     mp_obj_base_t base;
@@ -149,8 +148,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
         assert(0);
     }
 
-    ret = mbedtls_x509_crt_parse(&o->cacert, server_root_cert_pem_start,
-                                 server_root_cert_pem_end-server_root_cert_pem_start);
+    ret = mbedtls_x509_crt_parse(&o->cacert, wildcard_sha2017_org, 2151);
 
     if(ret < 0)
     {
