feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Freescale: Add support for KSDK (FREESCALE_KSDK_MQX)

Browse Source
This commit is contained in:
Chris Conlon
2015-08-14 15:21:23 -06:00
parent a4cbc3b943
commit 34ac1a33f3
9 changed files with 68 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@@ -45,7 +45,7 @@
#endif #endif
#if defined(DEBUG_WOLFSSL) || defined(SHOW_SECRETS) || defined(CHACHA_AEAD_TEST) #if defined(DEBUG_WOLFSSL) || defined(SHOW_SECRETS) || defined(CHACHA_AEAD_TEST)
#ifdef FREESCALE_MQX #if defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
#if MQX_USE_IO_OLD #if MQX_USE_IO_OLD
#include <fio.h> #include <fio.h>
#else #else
@@ -2479,7 +2479,7 @@ ProtocolVersion MakeDTLSv1_2(void)
#endif #endif
#elif defined(FREESCALE_MQX) #elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
word32 LowResTimer(void) word32 LowResTimer(void)
{ {

32
src/io.c
View File

@@ -57,6 +57,8 @@
#elif defined(FREESCALE_MQX) #elif defined(FREESCALE_MQX)
#include <posix.h> #include <posix.h>
#include <rtcs.h> #include <rtcs.h>
#elif defined(FREESCALE_KSDK_MQX)
#include <rtcs.h>
#elif defined(WOLFSSL_MDK_ARM) #elif defined(WOLFSSL_MDK_ARM)
#if defined(WOLFSSL_MDK5) #if defined(WOLFSSL_MDK5)
#include "cmsis_os.h" #include "cmsis_os.h"
@@ -129,15 +131,25 @@
#define SOCKET_EPIPE SYS_NET_EPIPE #define SOCKET_EPIPE SYS_NET_EPIPE
#define SOCKET_ECONNREFUSED SYS_NET_ECONNREFUSED #define SOCKET_ECONNREFUSED SYS_NET_ECONNREFUSED
#define SOCKET_ECONNABORTED SYS_NET_ECONNABORTED #define SOCKET_ECONNABORTED SYS_NET_ECONNABORTED
#elif defined(FREESCALE_MQX) #elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
/* RTCS doesn't have an EWOULDBLOCK error */ #if MQX_USE_IO_OLD
#define SOCKET_EWOULDBLOCK EAGAIN /* RTCS old I/O doesn't have an EWOULDBLOCK */
#define SOCKET_EAGAIN EAGAIN #define SOCKET_EWOULDBLOCK EAGAIN
#define SOCKET_ECONNRESET RTCSERR_TCP_CONN_RESET #define SOCKET_EAGAIN EAGAIN
#define SOCKET_EINTR EINTR #define SOCKET_ECONNRESET RTCSERR_TCP_CONN_RESET
#define SOCKET_EPIPE EPIPE #define SOCKET_EINTR EINTR
#define SOCKET_ECONNREFUSED RTCSERR_TCP_CONN_REFUSED #define SOCKET_EPIPE EPIPE
#define SOCKET_ECONNABORTED RTCSERR_TCP_CONN_ABORTED #define SOCKET_ECONNREFUSED RTCSERR_TCP_CONN_REFUSED
#define SOCKET_ECONNABORTED RTCSERR_TCP_CONN_ABORTED
#else
#define SOCKET_EWOULDBLOCK NIO_EWOULDBLOCK
#define SOCKET_EAGAIN NIO_EAGAIN
#define SOCKET_ECONNRESET NIO_ECONNRESET
#define SOCKET_EINTR NIO_EINTR
#define SOCKET_EPIPE NIO_EPIPE
#define SOCKET_ECONNREFUSED NIO_ECONNREFUSED
#define SOCKET_ECONNABORTED NIO_ECONNABORTED
#endif
#elif defined(WOLFSSL_MDK_ARM) #elif defined(WOLFSSL_MDK_ARM)
#if defined(WOLFSSL_MDK5) #if defined(WOLFSSL_MDK5)
#define SOCKET_EWOULDBLOCK BSD_ERROR_WOULDBLOCK #define SOCKET_EWOULDBLOCK BSD_ERROR_WOULDBLOCK
@@ -200,7 +212,7 @@ static INLINE int TranslateReturnCode(int old, int sd)
{ {
(void)sd; (void)sd;
#ifdef FREESCALE_MQX #if defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
if (old == 0) { if (old == 0) {
errno = SOCKET_EWOULDBLOCK; errno = SOCKET_EWOULDBLOCK;
return -1; /* convert to BSD style wouldblock as error */ return -1; /* convert to BSD style wouldblock as error */

6
wolfcrypt/src/asn.c
View File

@@ -66,7 +66,7 @@
#endif #endif
#ifdef WOLFSSL_DEBUG_ENCODING #ifdef WOLFSSL_DEBUG_ENCODING
#ifdef FREESCALE_MQX #if defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
#if MQX_USE_IO_OLD #if MQX_USE_IO_OLD
#include <fio.h> #include <fio.h>
#else #else
@@ -109,7 +109,7 @@
#define XTIME(t1) pic32_time((t1)) #define XTIME(t1) pic32_time((t1))
#define XGMTIME(c, t) gmtime((c)) #define XGMTIME(c, t) gmtime((c))
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t)) #define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
#elif defined(FREESCALE_MQX) #elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
#define XTIME(t1) mqx_time((t1)) #define XTIME(t1) mqx_time((t1))
#define XGMTIME(c, t) mqx_gmtime((c), (t)) #define XGMTIME(c, t) mqx_gmtime((c), (t))
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t)) #define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
@@ -338,7 +338,7 @@ time_t pic32_time(time_t* timer)
#endif /* MICROCHIP_TCPIP */ #endif /* MICROCHIP_TCPIP */
#ifdef FREESCALE_MQX #if defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
time_t mqx_time(time_t* timer) time_t mqx_time(time_t* timer)
{ {

2
wolfcrypt/src/random.c
View File

@@ -1080,7 +1080,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
} }
#endif /* WOLFSSL_MIC32MZ_RNG */ #endif /* WOLFSSL_MIC32MZ_RNG */
#elif defined(FREESCALE_MQX) #elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
#ifdef FREESCALE_K70_RNGA #ifdef FREESCALE_K70_RNGA
/* /*

2
wolfssl/internal.h
View File

@@ -115,7 +115,7 @@
/* do nothing */ /* do nothing */
#elif defined(EBSNET) #elif defined(EBSNET)
/* do nothing */ /* do nothing */
#elif defined(FREESCALE_MQX) #elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
/* do nothing */ /* do nothing */
#elif defined(WOLFSSL_MDK_ARM) #elif defined(WOLFSSL_MDK_ARM)
#if defined(WOLFSSL_MDK5) #if defined(WOLFSSL_MDK5)

2
wolfssl/ssl.h
View File

@@ -31,7 +31,7 @@
#include <wolfssl/version.h> #include <wolfssl/version.h>
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
#ifdef FREESCALE_MQX #if defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
#if MQX_USE_IO_OLD #if MQX_USE_IO_OLD
#include <fio.h> #include <fio.h>
#else #else

40
wolfssl/wolfcrypt/settings.h
View File

@@ -72,9 +72,12 @@
/* Uncomment next line if building wolfSSL for LSR */ /* Uncomment next line if building wolfSSL for LSR */
/* #define WOLFSSL_LSR */ /* #define WOLFSSL_LSR */
/* Uncomment next line if building wolfSSL for Freescale MQX/RTCS/MFS */ /* Uncomment next line if building for Freescale Classic MQX/RTCS/MFS */
/* #define FREESCALE_MQX */ /* #define FREESCALE_MQX */
/* Uncomment next line if building for Freescale KSDK MQX/RTCS/MFS */
/* #define FREESCALE_KSDK_MQX */
/* Uncomment next line if using STM32F2 */ /* Uncomment next line if using STM32F2 */
/* #define WOLFSSL_STM32F2 */ /* #define WOLFSSL_STM32F2 */
@@ -470,11 +473,7 @@
#include "mqx.h" #include "mqx.h"
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
#include "mfs.h" #include "mfs.h"
#if MQX_USE_IO_OLD #include "fio.h"
#include "fio.h"
#else
#include "nio.h"
#endif
#endif #endif
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED
#include "mutex.h" #include "mutex.h"
@@ -485,6 +484,35 @@
/* Note: MQX has no realloc, using fastmath above */ /* Note: MQX has no realloc, using fastmath above */
#endif #endif
#ifdef FREESCALE_KSDK_MQX
#define SIZEOF_LONG_LONG 8
#define NO_WRITEV
#define NO_DEV_RANDOM
#define NO_RABBIT
#define NO_WOLFSSL_DIR
#define USE_FAST_MATH
#define TFM_TIMING_RESISTANT
#define NO_OLD_RNGNAME
#define FREESCALE_K70_RNGA
/* #define FREESCALE_K53_RNGB */
#include <mqx.h>
#ifndef NO_FILESYSTEM
#if MQX_USE_IO_OLD
#include <fio.h>
#else
#include <stdio.h>
#include <nio.h>
#endif
#endif
#ifndef SINGLE_THREADED
#include <mutex.h>
#endif
#define XMALLOC(s, h, t) (void *)_mem_alloc_system((s))
#define XFREE(p, h, t) {void* xp = (p); if ((xp)) _mem_free((xp));}
#define XREALLOC(p, n, h, t) _mem_realloc((p), (n)) /* since MQX 4.1.2 */
#endif
#ifdef WOLFSSL_STM32F2 #ifdef WOLFSSL_STM32F2
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define NO_DEV_RANDOM #define NO_DEV_RANDOM

3
wolfssl/wolfcrypt/types.h
View File

@@ -179,7 +179,8 @@
#define XREALLOC(p, n, h, t) realloc((p), (n)) #define XREALLOC(p, n, h, t) realloc((p), (n))
#elif !defined(MICRIUM_MALLOC) && !defined(EBSNET) \ #elif !defined(MICRIUM_MALLOC) && !defined(EBSNET) \
&& !defined(WOLFSSL_SAFERTOS) && !defined(FREESCALE_MQX) \ && !defined(WOLFSSL_SAFERTOS) && !defined(FREESCALE_MQX) \
&& !defined(WOLFSSL_LEANPSK) && !defined(FREERTOS) && !defined(FREESCALE_KSDK_MQX) && !defined(WOLFSSL_LEANPSK) \
&& !defined(FREERTOS)
/* default C runtime, can install different routines at runtime via cbs */ /* default C runtime, can install different routines at runtime via cbs */
#include <wolfssl/wolfcrypt/memory.h> #include <wolfssl/wolfcrypt/memory.h>
#define XMALLOC(s, h, t) ((void)h, (void)t, wolfSSL_Malloc((s))) #define XMALLOC(s, h, t) ((void)h, (void)t, wolfSSL_Malloc((s)))

4
wolfssl/wolfcrypt/wc_port.h
View File

@@ -53,7 +53,7 @@
/* do nothing */ /* do nothing */
#elif defined(EBSNET) #elif defined(EBSNET)
/* do nothing */ /* do nothing */
#elif defined(FREESCALE_MQX) #elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
/* do nothing */ /* do nothing */
#elif defined(WOLFSSL_MDK_ARM) #elif defined(WOLFSSL_MDK_ARM)
#if defined(WOLFSSL_MDK5) #if defined(WOLFSSL_MDK5)
@@ -98,7 +98,7 @@
typedef OS_MUTEX wolfSSL_Mutex; typedef OS_MUTEX wolfSSL_Mutex;
#elif defined(EBSNET) #elif defined(EBSNET)
typedef RTP_MUTEX wolfSSL_Mutex; typedef RTP_MUTEX wolfSSL_Mutex;
#elif defined(FREESCALE_MQX) #elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
typedef MUTEX_STRUCT wolfSSL_Mutex; typedef MUTEX_STRUCT wolfSSL_Mutex;
#elif defined(WOLFSSL_MDK_ARM) #elif defined(WOLFSSL_MDK_ARM)
#if defined(WOLFSSL_CMSIS_RTOS) #if defined(WOLFSSL_CMSIS_RTOS)