TLS client

Author: kojo1

RPi-Pico/CMakeLists.txt

@@ -13,103 +13,93 @@ endif()
 project(wolf_pico_examples C CXX ASM)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+
 
 # Initialize the SDK
 pico_sdk_init()
 
-message("Example cmake project including wolfSSL with user_settings.h")
-
-# add global define to include user_settings.h
-add_compile_definitions(WOLFSSL_USER_SETTINGS)
-add_compile_definitions(WOLFSSL_USER_SETTINGS_ASM)
-set(BUILD_SHARED_LIBS OFF)
-set(WOLFSSL_EXAMPLES OFF)
-set(WOLFSSL_CRYPT_TESTS OFF)
-set(WOLFSSL_USER_SETTINGS ON)
-
 include_directories(config)
 include_directories(include)
 include_directories(${PICO_SDK_PATH}/src/rp2_common/pico_lwip/include)
 include_directories(${PICO_SDK_PATH}/lib/lwip/contrib/ports/freertos/include)
 include_directories(${PICO_SDK_PATH}/lib/lwip/src/include)
 include_directories(${PICO_SDK_PATH}/src/rp2_common/pico_async_context/include)
 
-add_subdirectory(wolfssl)
-target_link_libraries(wolfssl PRIVATE
+set(WOLFSSL_ROOT $ENV{WOLFSSL_ROOT})
+include_directories(${WOLFSSL_ROOT})
+
+file(GLOB_RECURSE WOLFSSL_SRC
+    "${WOLFSSL_ROOT}/src/*.c"
+    "${WOLFSSL_ROOT}/wolfcrypt/src/*.c"
+)
+list(REMOVE_ITEM WOLFSSL_SRC EXCLUDE REGEX
+    "${WOLFSSL_ROOT}/src/bio.c"
+    "${WOLFSSL_ROOT}/src/conf.c"
+    "${WOLFSSL_ROOT}/src/pk.c"
+    "${WOLFSSL_ROOT}/src/ssl_asn1.c"
+    "${WOLFSSL_ROOT}/src/ssl_bn.c"
+    "${WOLFSSL_ROOT}/src/ssl_misc.c"
+    "${WOLFSSL_ROOT}/src/x509.c"
+    "${WOLFSSL_ROOT}/src/x509_str.c"
+    "${WOLFSSL_ROOT}/wolfcrypt/src/evp.c"
+    "${WOLFSSL_ROOT}/wolfcrypt/src/misc.c"
+)
+
+add_library(wolfssl STATIC
+    ${WOLFSSL_SRC}
+)
+target_include_directories(wolfssl PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/config
+    )
+target_compile_definitions(wolfssl PRIVATE
+    WOLFSSL_USER_SETTINGS
+    WOLFSSL_SP_ARM_THUMB_ASM
+)
+
+
+add_executable(testwolfcrypt
+    src/test_main.c
+    src/blink.c
+    ${WOLFSSL_ROOT}/wolfcrypt/test/test.c
+)
+
+pico_enable_stdio_usb(testwolfcrypt 1)
+pico_enable_stdio_uart(testwolfcrypt 0)
+target_compile_definitions(testwolfcrypt PRIVATE
+    WOLFSSL_USER_SETTINGS
 )
 
+target_link_libraries(testwolfcrypt
+    wolfssl
+    pico_stdlib
+    pico_cyw43_arch_none
+    pico_rand
+)
+pico_add_extra_outputs(testwolfcrypt)
+
+
 add_executable(benchmark
     src/bench_main.c
     src/blink.c
-    wolfssl/wolfcrypt/benchmark/benchmark.c
+    ${WOLFSSL_ROOT}/wolfcrypt/benchmark/benchmark.c
 )
 
 pico_enable_stdio_usb(benchmark 1)
 pico_enable_stdio_uart(benchmark 0)
 target_compile_definitions(benchmark PRIVATE
-
+    WOLFSSL_USER_SETTINGS
 )
+
 target_link_libraries(benchmark
     wolfssl
     pico_stdlib
     pico_cyw43_arch_none
     pico_rand
-    #FreeRTOS-Kernel-Heap4 # FreeRTOS kernel and dynamic heap
 )
 pico_add_extra_outputs(benchmark)
 
-if(0)
-    add_executable(TCPclient
-        src/blink.c
-        # src/TCPclient.c
-        src/TCPclient_main.c
-    )
-
-    # enable usb output, disable uart output
-    pico_enable_stdio_usb(TCPclient 1)
-    pico_enable_stdio_uart(TCPclient 0)
-
-    target_compile_definitions(TCPclient PRIVATE
-
-        # CYW43_NETUTILS
-        # PICO_CYW43_ARCH_FREERTOS
-        TEST_TCP_SERVER_IP=\"${TEST_TCP_SERVER_IP}\"
-        WIFI_SSID=\"${WIFI_SSID}\"
-        WIFI_PASSWORD=\"${WIFI_PASSWORD}\"
-        PICO_CYW43_ARCH_POLL
-        NO_SYS=1
-
-        # SYS_LIGHTWEIGHT_PROT=1
-    )
-
-    target_link_libraries(TCPclient
-        pico_stdlib
-        pico_rand
-
-        # pico_cyw43_arch_lwip_sys_freertos
-        # pico_cyw43_arch_lwip_poll
-        # pico_cyw43_arch_none
-
-        pico_lwip
-        # pico_lwip_core4
-        # pico_lwip_core6
-        pico_cyw43_arch
-        pico_lwip_nosys
-        pico_async_context_poll
-        # pico_lwip_iperf
-
-        # pico_lwip_freertos
-        # pico_async_context_freertos
-        # pico_lwip_port
-        # pico_cyw43_driver
-        # pico_lwip_api
-        pico_lwip_netif
-        # FreeRTOS-Kernel
-        # FreeRTOS-Kernel-Heap4 # FreeRTOS kernel and dynamic heap
-    )
-
-    pico_add_extra_outputs(TCPclient)
-endif()
 
 add_executable(Wifi
     src/blink.c
@@ -151,6 +141,7 @@ pico_enable_stdio_usb(tcp_Client 1)
 pico_enable_stdio_uart(tcp_Client 0)
 
 target_compile_definitions(tcp_Client PRIVATE
+    WOLFSSL_USER_SETTINGS
     WIFI_SSID=\"${WIFI_SSID}\"
     WIFI_PASSWORD=\"${WIFI_PASSWORD}\"
     TEST_TCP_SERVER_IP=\"${TEST_TCP_SERVER_IP}\"
@@ -167,4 +158,37 @@ target_link_libraries(tcp_Client
     pico_async_context_poll
 )
 
-pico_add_extra_outputs(tcp_Client)
+pico_add_extra_outputs(tcp_Client)
+
+
+add_executable(tls_Client
+    src/blink.c
+    src/wifi.c
+    src/tcp.c
+    src/tlsClient_main.c
+)
+
+# enable usb output, disable uart output
+pico_enable_stdio_usb(tls_Client 1)
+pico_enable_stdio_uart(tls_Client 0)
+
+target_compile_definitions(tls_Client PRIVATE
+    WOLFSSL_USER_SETTINGS
+    WIFI_SSID=\"${WIFI_SSID}\"
+    WIFI_PASSWORD=\"${WIFI_PASSWORD}\"
+    TEST_TCP_SERVER_IP=\"${TEST_TCP_SERVER_IP}\"
+    PICO_CYW43_ARCH_POLL
+    NO_SYS=1
+)
+
+target_link_libraries(tls_Client
+    pico_stdlib
+    pico_rand
+    pico_lwip
+    pico_cyw43_arch
+    pico_lwip_nosys
+    pico_async_context_poll
+    wolfssl
+)
+
+pico_add_extra_outputs(tls_Client)

RPi-Pico/config/user_settings.h

@@ -32,8 +32,12 @@ extern "C"
 {
 #endif
 
+#include <stdio.h>
 #define TARGET_EMBEDDED
 
+extern time_t myTime(time_t *);
+#define XTIME(t) myTime(t)
+
 /* ------------------------------------------------------------------------- */
 /* Platform */
 /* ------------------------------------------------------------------------- */
@@ -106,7 +110,9 @@ extern "C"
 /* Maximum math bits (Max RSA key bits * 2) */
 #define FP_MAX_BITS 4096
 #endif
+#endif
 
+#if 1
 /* half as much memory but twice as slow */
 // #define RSA_LOW_MEM
 
@@ -121,7 +127,7 @@ extern "C"
 
 /* DH */
 #undef NO_DH
-#if 0
+#if 1
 /* Use table for DH instead of -lm (math) lib dependency */
 #if 1
 #define WOLFSSL_DH_CONST
@@ -140,7 +146,7 @@ extern "C"
 #define HAVE_ECC
 
 /* Manually define enabled curves */
-#define ECC_USER_CURVES
+//#define ECC_USER_CURVES
 
 #ifdef ECC_USER_CURVES
 /* Manual Curve Selection */

RPi-Pico/include/wolf/tcp.h

@@ -29,7 +29,7 @@
 #include "wolf/common.h"
 
 #define DEBUG_printf printf
-#define BUF_SIZE 2048
+#define BUF_SIZE (4096*2)
 
 typedef struct {
     struct tcp_pcb *tcp_pcb;
@@ -45,5 +45,5 @@ typedef struct {
 WOLF_SOCKET_T *wolf_TCPsocket(void);
 static err_t wolf_TCPfree(WOLF_SOCKET_T *);
 bool wolf_TCPconnect(WOLF_SOCKET_T *, const char*, uint32_t);
-size_t wolf_TCPwrite(WOLF_SOCKET_T *, const unsigned char *, uint32_t);
-size_t wolf_TCPread(WOLF_SOCKET_T *, unsigned char *, uint32_t);
+int wolf_TCPread (WOLF_SOCKET_T *,       unsigned char *, long unsigned int);
+int wolf_TCPwrite(WOLF_SOCKET_T *, const unsigned char *, long unsigned int);

RPi-Pico/src/bench_main.c

@@ -20,13 +20,18 @@
  */
 
 #include <stdint.h>
+
+#include "wolfssl/wolfcrypt/settings.h"
+#include "wolfssl/ssl.h"
 #include <wolfcrypt/benchmark/benchmark.h>
 
 #include <stdio.h>
 #include "pico/stdlib.h"
 #include "pico/cyw43_arch.h"
 #include "wolf/blink.h"
 
+
+
 int main(int argc, char **argv)
 {
     int i;
@@ -37,3 +42,10 @@ int main(int argc, char **argv)
     printf("End: %d\n", ret);
     return ret;
 }
+
+#include <time.h>
+time_t myTime(time_t *t)
+{
+    *t = (((2023 - 1970) * 12 + 8) * 30 * 24 * 60 * 60);
+    return *t;
+}