From bd6633a31c1a2d6c19267d528c0c7375ad545e9d Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Fri, 21 Jul 2017 12:37:32 +0900 Subject: [PATCH 1/3] #elif defined(WOLFSSL_VXWORKS) in io.h --- wolfssl/io.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wolfssl/io.h b/wolfssl/io.h index c13419498..688a450d4 100644 --- a/wolfssl/io.h +++ b/wolfssl/io.h @@ -234,6 +234,9 @@ #elif defined(FREERTOS_TCP) #define RECV_FUNCTION(a,b,c,d) FreeRTOS_recv((Socket_t)(a),(void*)(b), (size_t)(c), (BaseType_t)(d)) #define SEND_FUNCTION(a,b,c,d) FreeRTOS_send((Socket_t)(a),(void*)(b), (size_t)(c), (BaseType_t)(d)) +#elif defined(WOLFSSL_VXWORKS) + #define SEND_FUNCTION send + #define RECV_FUNCTION recv #else #define SEND_FUNCTION send #define RECV_FUNCTION recv From 173283208b63ddf0f8522b372cc17cb0bb942ace Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Fri, 21 Jul 2017 12:42:24 +0900 Subject: [PATCH 2/3] add WOLFSSL_HAVE_MAX in settings.h --- wolfssl/wolfcrypt/settings.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 92bb3b2c0..239712211 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -210,6 +210,7 @@ #define TFM_TIMING_RESISTANT #define NEED_AES_TABLES #define WOLFSSL_HAVE_MIN + #define WOLFSSL_HAVE_MAX #endif #ifdef WOLFSSL_MICROCHIP_PIC32MZ @@ -321,6 +322,7 @@ #endif #define WOLFSSL_PTHREADS #define WOLFSSL_HAVE_MIN + #define WOLFSSL_HAVE_MAX #define USE_FAST_MATH #define TFM_TIMING_RESISTANT #define NO_MAIN_DRIVER @@ -354,6 +356,7 @@ #define SINGLE_THREADED #define NO_WOLFSSL_DIR #define WOLFSSL_HAVE_MIN + #define WOLFSSL_HAVE_MAX #define NO_WRITEV #define HAVE_ECC From 2329e37d97d6e2760a6064fa72287d55ea91d48f Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Tue, 25 Jul 2017 09:07:30 +0900 Subject: [PATCH 3/3] Remove options outside VxWorks --- wolfssl/wolfcrypt/settings.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 239712211..f1dc83cec 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -210,7 +210,6 @@ #define TFM_TIMING_RESISTANT #define NEED_AES_TABLES #define WOLFSSL_HAVE_MIN - #define WOLFSSL_HAVE_MAX #endif #ifdef WOLFSSL_MICROCHIP_PIC32MZ @@ -356,7 +355,6 @@ #define SINGLE_THREADED #define NO_WOLFSSL_DIR #define WOLFSSL_HAVE_MIN - #define WOLFSSL_HAVE_MAX #define NO_WRITEV #define HAVE_ECC