Fixed V1.1.4

Support SHA384 and SHA256

Author: wiznet-mason

CMakeLists.txt

@@ -109,13 +109,13 @@ add_definitions(-DPICO_FLASH_SPI_CLKDIV=4)
 add_definitions(-DPICO_DEFAULT_UART_BAUD_RATE=921600)
 
 # Set compile options
-add_compile_options(
-        -Wall
-        -Wno-format          # int != int32_t as far as the compiler is concerned because gcc has int32_t as long int
-        -Wno-unused-function # we have some for the docs that aren't called
-        -Wno-maybe-uninitialized
-        -O3
-        )
+#add_compile_options(
+#        -Wall
+#        -Wno-format          # int != int32_t as far as the compiler is concerned because gcc has int32_t as long int
+#        -Wno-unused-function # we have some for the docs that aren't called
+#        -Wno-maybe-uninitialized
+#        -O3
+#        )
 
 add_subdirectory(main)
 # Add libraries in subdirectories

port/app/configuration/inc/common.h

@@ -9,7 +9,7 @@
 /* Application Firmware Version */
 #define MAJOR_VER               1
 #define MINOR_VER               1
-#define MAINTENANCE_VER         3
+#define MAINTENANCE_VER         4
 
 #define DEV_CONFIG_VER          103
 

port/app/mbedtls/inc/SSLConfig.h

@@ -36,6 +36,10 @@
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
 
+//#define MBEDTLS_DEBUG_C
+//#define MBEDTLS_DEBUG_LEVEL 4
+//#define MBEDTLS_ERROR_C
+
 #define MBEDTLS_HAVE_ASM
 #define MBEDTLS_CIPHER_MODE_CBC
 #define MBEDTLS_REMOVE_ARC4_CIPHERSUITES
@@ -79,6 +83,8 @@
 #define MBEDTLS_ECP_C
 #define MBEDTLS_ECP_DP_SECP384R1_ENABLED
 #define MBEDTLS_SHA256_C
+#define MBEDTLS_SHA384_C
+#define MBEDTLS_SHA512_C
 
 #define MBEDTLS_SSL_CLI_C
 #define MBEDTLS_SSL_TLS_C

port/app/mbedtls/src/SSLInterface.c

@@ -121,7 +121,13 @@ int wiz_tls_init(wiz_tls_context* tlsContext, int* socket_fd)
     mbedtls_x509_crt_init(tlsContext->cacert);
     mbedtls_x509_crt_init(tlsContext->clicert);
     mbedtls_pk_init(tlsContext->pkey);
-
+    const int *ciphersuite_list = mbedtls_ssl_list_ciphersuites();
+    while (*ciphersuite_list != 0) {
+        const char *name = mbedtls_ssl_get_ciphersuite_name(*ciphersuite_list);
+        if (name != NULL)
+            PRT_SSL("%s\r\n", name);
+        ciphersuite_list++;
+    }
   /*
     Initialize certificates
   */
@@ -316,6 +322,9 @@ int wiz_tls_socket_connect(wiz_tls_context* tlsContext, char * addr, unsigned in
     int ret;
     uint8_t sock = (uint8_t)(tlsContext->socket_fd);
 
+#if defined(MBEDTLS_ERROR_C)
+     char error_buf[1024];
+#endif
     /*socket open*/
     ret = socket(sock, Sn_MR_TCP, 0, 0x00);
     if(ret != sock)
@@ -335,9 +344,9 @@ int wiz_tls_socket_connect(wiz_tls_context* tlsContext, char * addr, unsigned in
         if( ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE )
         {
 #if defined(MBEDTLS_ERROR_C)
-            memset(tempBuf, 0, 1024);
-            mbedtls_strerror(ret, (char *) tempBuf, DEBUG_BUFFER_SIZE );
-            printf( " failed\n\r  ! mbedtls_ssl_handshake returned %d: %s\n\r", ret, tempBuf );
+            memset(error_buf, 0, 1024);
+            mbedtls_strerror(ret, (char *) error_buf, DEBUG_BUFFER_SIZE );
+            printf( " failed\n\r  ! mbedtls_ssl_handshake returned %d: %s\n\r", ret, error_buf );
 #endif
             return( -1 );
         }

port/app/serial_to_ethernet/src/seg.c

@@ -458,10 +458,11 @@ void proc_SEG_tcp_client_over_tls(uint8_t sock)
                                   (char *)network_connection->remote_ip,
                                   (unsigned int)network_connection->remote_port);
 
-            reg_val = (SIK_CONNECTED | SIK_DISCONNECTED | SIK_RECEIVED | SIK_TIMEOUT) & 0x00FF;
-            ctlsocket(sock, CS_CLR_INTERRUPT, (void *)&reg_val);
 #if 1
-            reg_val = (SIK_CONNECTED | SIK_DISCONNECTED | SIK_RECEIVED | SIK_TIMEOUT) & 0x00FF; // except SIK_SENT(send OK) interrupt
+            reg_val = SIK_RECEIVED & 0x00FF;
+            ctlsocket(sock, CS_CLR_INTERRUPT, (void *)&reg_val);
+
+            reg_val =  SIK_RECEIVED & 0x00FF; // except SIK_SENT(send OK) interrupt
             ctlsocket(sock, CS_SET_INTMASK, (void *)&reg_val);
 
             ctlwizchip(CW_GET_INTRMASK, (void *)&reg_val);
@@ -724,7 +725,6 @@ void proc_SEG_mqtt_client(uint8_t sock)
                 first_established = 0;
             }
             mqtt_transport_yield(&g_mqtt_config);
-            vTaskDelay(1);
             break;
 
         case SOCK_CLOSE_WAIT:
@@ -927,7 +927,6 @@ void proc_SEG_mqtts_client(uint8_t sock)
                 first_established = 0;
             }
             mqtt_transport_yield(&g_mqtt_config);
-            vTaskDelay(1);
             break;
 
         case SOCK_CLOSE_WAIT: