mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tirtos merge

Browse Source
This commit is contained in:
toddouska 2014-09-08 19:40:03 -07:00
parent 3a0837ffd5
commit 2c595139db
21 changed files with 109 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctaocrypt/benchmark/benchmark.c
View File

@ -1500,7 +1500,7 @@ void bench_eccKeyAgree(void)
return (double)tickCount / 1000; return (double)tickCount / 1000;
} }
#elif defined (TIRTOS) #elif defined (CYASSL_TIRTOS)
extern double current_time(int reset); extern double current_time(int reset);

4
ctaocrypt/src/asn.c
View File

@ -317,7 +317,7 @@ time_t mqx_time(time_t* timer)
#endif /* FREESCALE_MQX */ #endif /* FREESCALE_MQX */
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
time_t XTIME(time_t * timer) time_t XTIME(time_t * timer)
{ {
@ -331,7 +331,7 @@ time_t XTIME(time_t * timer)
return sec; return sec;
} }
#endif /* TIRTOS */ #endif /* CYASSL_TIRTOS */
static INLINE word32 btoi(byte b) static INLINE word32 btoi(byte b)
{ {

2
ctaocrypt/src/random.c
View File

@ -846,7 +846,7 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
return 0; return 0;
} }
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
#include <xdc/runtime/Timestamp.h> #include <xdc/runtime/Timestamp.h>
#include <stdlib.h> #include <stdlib.h>

2
ctaocrypt/src/wc_port.c
View File

@ -352,7 +352,7 @@ int UnLockMutex(CyaSSL_Mutex *m)
return BAD_MUTEX_E; return BAD_MUTEX_E;
} }
#elif defined (TIRTOS) #elif defined (CYASSL_TIRTOS)
int InitMutex(CyaSSL_Mutex* m) int InitMutex(CyaSSL_Mutex* m)
{ {

4
cyassl/ctaocrypt/settings.h
View File

@ -91,7 +91,7 @@
/* #define CYASSL_IAR_ARM */ /* #define CYASSL_IAR_ARM */
/* Uncomment next line if using TI-RTOS settings */ /* Uncomment next line if using TI-RTOS settings */
/* #define TIRTOS */ /* #define CYASSL_TIRTOS */
#include <cyassl/ctaocrypt/visibility.h> #include <cyassl/ctaocrypt/visibility.h>
@ -281,7 +281,7 @@
#endif #endif
#endif #endif
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define NO_WRITEV #define NO_WRITEV
#define NO_CYASSL_DIR #define NO_CYASSL_DIR

4
cyassl/ctaocrypt/wc_port.h
View File

@ -62,7 +62,7 @@
#endif #endif
#elif defined(CYASSL_CMSIS_RTOS) #elif defined(CYASSL_CMSIS_RTOS)
#include "cmsis_os.h" #include "cmsis_os.h"
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
#include <ti/sysbios/BIOS.h> #include <ti/sysbios/BIOS.h>
#include <ti/sysbios/knl/Semaphore.h> #include <ti/sysbios/knl/Semaphore.h>
#else #else
@ -107,7 +107,7 @@
#endif #endif
#elif defined(CYASSL_CMSIS_RTOS) #elif defined(CYASSL_CMSIS_RTOS)
typedef osMutexId CyaSSL_Mutex; typedef osMutexId CyaSSL_Mutex;
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
typedef ti_sysbios_knl_Semaphore_Handle CyaSSL_Mutex; typedef ti_sysbios_knl_Semaphore_Handle CyaSSL_Mutex;
#else #else
#error Need a mutex type in multithreaded mode #error Need a mutex type in multithreaded mode

2
cyassl/internal.h
View File

@ -98,7 +98,7 @@
#include <rtl.h> #include <rtl.h>
#endif #endif
#elif defined(MBED) #elif defined(MBED)
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
/* do nothing */ /* do nothing */
#else #else
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED

24
cyassl/test.h
View File

@ -35,7 +35,7 @@
#define SNPRINTF _snprintf #define SNPRINTF _snprintf
#elif defined(CYASSL_MDK_ARM) #elif defined(CYASSL_MDK_ARM)
#include <string.h> #include <string.h>
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
#include <string.h> #include <string.h>
#include <netdb.h> #include <netdb.h>
#include <sys/types.h> #include <sys/types.h>
@ -128,7 +128,7 @@
typedef unsigned int THREAD_RETURN; typedef unsigned int THREAD_RETURN;
typedef int THREAD_TYPE; typedef int THREAD_TYPE;
#define CYASSL_THREAD #define CYASSL_THREAD
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
typedef void THREAD_RETURN; typedef void THREAD_RETURN;
typedef Task_Handle THREAD_TYPE; typedef Task_Handle THREAD_TYPE;
#define CYASSL_THREAD #define CYASSL_THREAD
@ -480,7 +480,7 @@ static INLINE void tcp_socket(SOCKET_T* sockfd, int udp)
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
if (*sockfd == INVALID_SOCKET) if (*sockfd == INVALID_SOCKET)
err_sys("socket failed\n"); err_sys("socket failed\n");
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
if (*sockfd == -1) if (*sockfd == -1)
err_sys("socket failed\n"); err_sys("socket failed\n");
#else #else
@ -497,7 +497,7 @@ static INLINE void tcp_socket(SOCKET_T* sockfd, int udp)
if (res < 0) if (res < 0)
err_sys("setsockopt SO_NOSIGPIPE failed\n"); err_sys("setsockopt SO_NOSIGPIPE failed\n");
} }
#elif defined(CYASSL_MDK_ARM) || defined (TIRTOS) #elif defined(CYASSL_MDK_ARM) || defined (CYASSL_TIRTOS)
/* nothing to define */ /* nothing to define */
#else /* no S_NOSIGPIPE */ #else /* no S_NOSIGPIPE */
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
@ -545,7 +545,7 @@ enum {
}; };
#if !defined(CYASSL_MDK_ARM) && !defined(TIRTOS) #if !defined(CYASSL_MDK_ARM) && !defined(CYASSL_TIRTOS)
static INLINE int tcp_select(SOCKET_T socketfd, int to_sec) static INLINE int tcp_select(SOCKET_T socketfd, int to_sec)
{ {
fd_set recvfds, errfds; fd_set recvfds, errfds;
@ -571,7 +571,7 @@ static INLINE int tcp_select(SOCKET_T socketfd, int to_sec)
return TEST_SELECT_FAIL; return TEST_SELECT_FAIL;
} }
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
static INLINE int tcp_select(SOCKET_T socketfd, int to_sec) static INLINE int tcp_select(SOCKET_T socketfd, int to_sec)
{ {
return TEST_RECV_READY; return TEST_RECV_READY;
@ -686,7 +686,7 @@ static INLINE void udp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
pthread_cond_signal(&ready->cond); pthread_cond_signal(&ready->cond);
pthread_mutex_unlock(&ready->mutex); pthread_mutex_unlock(&ready->mutex);
} }
#elif defined (TIRTOS) #elif defined (CYASSL_TIRTOS)
/* Need mutex? */ /* Need mutex? */
tcp_ready* ready = args->signal; tcp_ready* ready = args->signal;
ready->ready = 1; ready->ready = 1;
@ -720,7 +720,7 @@ static INLINE void tcp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
pthread_cond_signal(&ready->cond); pthread_cond_signal(&ready->cond);
pthread_mutex_unlock(&ready->mutex); pthread_mutex_unlock(&ready->mutex);
} }
#elif defined (TIRTOS) #elif defined (CYASSL_TIRTOS)
/* Need mutex? */ /* Need mutex? */
tcp_ready* ready = args->signal; tcp_ready* ready = args->signal;
ready->ready = 1; ready->ready = 1;
@ -746,7 +746,7 @@ static INLINE void tcp_set_nonblocking(SOCKET_T* sockfd)
int ret = ioctlsocket(*sockfd, FIONBIO, &blocking); int ret = ioctlsocket(*sockfd, FIONBIO, &blocking);
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
err_sys("ioctlsocket failed"); err_sys("ioctlsocket failed");
#elif defined(CYASSL_MDK_ARM) || defined (TIRTOS) #elif defined(CYASSL_MDK_ARM) || defined (CYASSL_TIRTOS)
/* non blocking not suppported, for now */ /* non blocking not suppported, for now */
#else #else
int flags = fcntl(*sockfd, F_GETFL, 0); int flags = fcntl(*sockfd, F_GETFL, 0);
@ -829,7 +829,7 @@ static INLINE unsigned int my_psk_server_cb(CYASSL* ssl, const char* identity,
return (double)count.QuadPart / freq.QuadPart; return (double)count.QuadPart / freq.QuadPart;
} }
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
extern double current_time(); extern double current_time();
#else #else
@ -1088,7 +1088,7 @@ static INLINE int CurrentDir(const char* str)
#elif defined(CYASSL_MDK_ARM) #elif defined(CYASSL_MDK_ARM)
/* KEIL-RL File System does not support relative directry */ /* KEIL-RL File System does not support relative directry */
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
#else #else
#ifndef MAX_PATH #ifndef MAX_PATH
@ -1756,7 +1756,7 @@ static INLINE void SetupPkCallbacks(CYASSL_CTX* ctx, CYASSL* ssl)
#if defined(__hpux__) || defined(__MINGW32__) || defined (TIRTOS) #if defined(__hpux__) || defined(__MINGW32__) || defined (CYASSL_TIRTOS)
/* HP/UX doesn't have strsep, needed by test/suites.c */ /* HP/UX doesn't have strsep, needed by test/suites.c */
static INLINE char* strsep(char **stringp, const char *delim) static INLINE char* strsep(char **stringp, const char *delim)

6
examples/client/client.c
View File

@ -732,7 +732,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
SOCKADDR_IN_T addr; SOCKADDR_IN_T addr;
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
Sleep(500); Sleep(500);
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
Task_sleep(1); Task_sleep(1);
#else #else
sleep(1); sleep(1);
@ -774,7 +774,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
/* give server a chance to bounce a message back to client */ /* give server a chance to bounce a message back to client */
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
Sleep(500); Sleep(500);
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
Task_sleep(1); Task_sleep(1);
#else #else
sleep(1); sleep(1);
@ -805,7 +805,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
ShowMemoryTracker(); ShowMemoryTracker();
#endif /* USE_CYASSL_MEMORY */ #endif /* USE_CYASSL_MEMORY */
#if !defined(TIRTOS) #if !defined(CYASSL_TIRTOS)
return 0; return 0;
#endif #endif
} }

2
examples/echoclient/echoclient.c
View File

@ -262,7 +262,7 @@ void echoclient_test(void* args)
#if defined(DEBUG_CYASSL) && !defined(CYASSL_MDK_SHELL) #if defined(DEBUG_CYASSL) && !defined(CYASSL_MDK_SHELL)
CyaSSL_Debugging_ON(); CyaSSL_Debugging_ON();
#endif #endif
#ifndef TIRTOS #ifndef CYASSL_TIRTOS
if (CurrentDir("echoclient")) if (CurrentDir("echoclient"))
ChangeDirBack(2); ChangeDirBack(2);
else if (CurrentDir("Debug") || CurrentDir("Release")) else if (CurrentDir("Debug") || CurrentDir("Release"))

12
examples/echoserver/echoserver.c
View File

@ -116,15 +116,15 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
#if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \ #if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \
!defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \ !defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \
!defined(TIRTOS) !defined(CYASSL_TIRTOS)
port = 0; port = 0;
#endif #endif
#if defined(USE_ANY_ADDR) #if defined(USE_ANY_ADDR)
useAnyAddr = 1; useAnyAddr = 1;
#endif #endif
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
tcp_listen(&sockfd, &port, useAnyAddr, doDTLS); tcp_listen(&sockfd, &port, useAnyAddr, doDTLS);
@ -328,11 +328,11 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
((func_args*)args)->return_code = 0; ((func_args*)args)->return_code = 0;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
#ifndef TIRTOS #ifndef CYASSL_TIRTOS
return 0; return 0;
#endif #endif
} }

12
examples/server/server.c
View File

@ -189,8 +189,8 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
(void)trackMemory; (void)trackMemory;
(void)pkCallbacks; (void)pkCallbacks;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
while ((ch = mygetopt(argc, argv, "?dbstnNufPp:v:l:A:c:k:S:oO:")) != -1) { while ((ch = mygetopt(argc, argv, "?dbstnNufPp:v:l:A:c:k:S:oO:")) != -1) {
@ -525,7 +525,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
#if defined(CYASSL_MDK_SHELL) && defined(HAVE_MDK_RTX) #if defined(CYASSL_MDK_SHELL) && defined(HAVE_MDK_RTX)
os_dly_wait(500) ; os_dly_wait(500) ;
#elif defined (TIRTOS) #elif defined (CYASSL_TIRTOS)
Task_yield(); Task_yield();
#endif #endif
@ -541,11 +541,11 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
ShowMemoryTracker(); ShowMemoryTracker();
#endif /* USE_CYASSL_MEMORY */ #endif /* USE_CYASSL_MEMORY */
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
#ifndef TIRTOS #ifndef CYASSL_TIRTOS
return 0; return 0;
#endif #endif
} }

2
src/internal.c
View File

@ -2500,7 +2500,7 @@ ProtocolVersion MakeDTLSv1_2(void)
return (word32) mqxTime.SECONDS; return (word32) mqxTime.SECONDS;
} }
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
word32 LowResTimer(void) word32 LowResTimer(void)
{ {

2
src/io.c
View File

@ -69,7 +69,7 @@
#define RNG CyaSSL_RNG #define RNG CyaSSL_RNG
/* for avoiding name conflict in "stm32f2xx.h" */ /* for avoiding name conflict in "stm32f2xx.h" */
static int errno; static int errno;
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
#include <sys/socket.h> #include <sys/socket.h>
#elif defined(CYASSL_IAR_ARM) #elif defined(CYASSL_IAR_ARM)
/* nothing */ /* nothing */

64
tests/api.c
View File

@ -210,7 +210,7 @@ static void test_CyaSSL_CTX_load_verify_locations(void)
AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, NULL, 0)); AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, NULL, 0));
AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, bogusFile, 0)); AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, bogusFile, 0));
#ifndef TIRTOS #ifndef CYASSL_TIRTOS
/* invalid path */ /* invalid path */
/* not working... investigate! */ /* not working... investigate! */
/* AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, caCert, bogusFile)); */ /* AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, caCert, bogusFile)); */
@ -306,8 +306,8 @@ static THREAD_RETURN CYASSL_THREAD test_server_nofail(void* args)
char input[1024]; char input[1024];
int idx; int idx;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
((func_args*)args)->return_code = TEST_FAIL; ((func_args*)args)->return_code = TEST_FAIL;
@ -316,7 +316,7 @@ static THREAD_RETURN CYASSL_THREAD test_server_nofail(void* args)
#if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \ #if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \
!defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \ !defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \
!defined(TIRTOS) !defined(CYASSL_TIRTOS)
port = 0; port = 0;
#endif #endif
@ -379,14 +379,14 @@ static THREAD_RETURN CYASSL_THREAD test_server_nofail(void* args)
if (CyaSSL_write(ssl, msg, sizeof(msg)) != sizeof(msg)) if (CyaSSL_write(ssl, msg, sizeof(msg)) != sizeof(msg))
{ {
/*err_sys("SSL_write failed");*/ /*err_sys("SSL_write failed");*/
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
return; return;
#else #else
return 0; return 0;
#endif #endif
} }
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
Task_yield(); Task_yield();
#endif #endif
@ -398,11 +398,11 @@ done:
CloseSocket(clientfd); CloseSocket(clientfd);
((func_args*)args)->return_code = TEST_SUCCESS; ((func_args*)args)->return_code = TEST_SUCCESS;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
#ifndef TIRTOS #ifndef CYASSL_TIRTOS
return 0; return 0;
#endif #endif
} }
@ -421,8 +421,8 @@ static void test_client_nofail(void* args)
int input; int input;
int msgSz = (int)strlen(msg); int msgSz = (int)strlen(msg);
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
((func_args*)args)->return_code = TEST_FAIL; ((func_args*)args)->return_code = TEST_FAIL;
@ -486,8 +486,8 @@ done2:
CloseSocket(sockfd); CloseSocket(sockfd);
((func_args*)args)->return_code = TEST_SUCCESS; ((func_args*)args)->return_code = TEST_SUCCESS;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
return; return;
@ -511,14 +511,14 @@ static THREAD_RETURN CYASSL_THREAD run_cyassl_server(void* args)
char input[1024]; char input[1024];
int idx; int idx;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
((func_args*)args)->return_code = TEST_FAIL; ((func_args*)args)->return_code = TEST_FAIL;
#if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \ #if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \
!defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \ !defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \
!defined(TIRTOS) !defined(CYASSL_TIRTOS)
port = 0; port = 0;
#endif #endif
@ -572,7 +572,7 @@ static THREAD_RETURN CYASSL_THREAD run_cyassl_server(void* args)
} }
AssertIntEQ(len, CyaSSL_write(ssl, msg, len)); AssertIntEQ(len, CyaSSL_write(ssl, msg, len));
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
Task_yield(); Task_yield();
#endif #endif
CyaSSL_shutdown(ssl); CyaSSL_shutdown(ssl);
@ -587,10 +587,10 @@ static THREAD_RETURN CYASSL_THREAD run_cyassl_server(void* args)
((func_args*)args)->return_code = TEST_SUCCESS; ((func_args*)args)->return_code = TEST_SUCCESS;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
#ifndef TIRTOS #ifndef CYASSL_TIRTOS
return 0; return 0;
#endif #endif
} }
@ -609,8 +609,8 @@ static void run_cyassl_client(void* args)
char input[1024]; char input[1024];
int idx; int idx;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
((func_args*)args)->return_code = TEST_FAIL; ((func_args*)args)->return_code = TEST_FAIL;
@ -660,8 +660,8 @@ static void run_cyassl_client(void* args)
CloseSocket(sfd); CloseSocket(sfd);
((func_args*)args)->return_code = TEST_SUCCESS; ((func_args*)args)->return_code = TEST_SUCCESS;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
} }
@ -696,8 +696,8 @@ static void test_CyaSSL_read_write(void)
func_args server_args; func_args server_args;
THREAD_TYPE serverThread; THREAD_TYPE serverThread;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
StartTCP(); StartTCP();
@ -716,8 +716,8 @@ static void test_CyaSSL_read_write(void)
FreeTcpReady(&ready); FreeTcpReady(&ready);
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
#endif #endif
@ -942,8 +942,8 @@ static void test_CyaSSL_client_server(callback_functions* client_callbacks,
client_args.callbacks = client_callbacks; client_args.callbacks = client_callbacks;
server_args.callbacks = server_callbacks; server_args.callbacks = server_callbacks;
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
/* RUN Server side */ /* RUN Server side */
@ -958,8 +958,8 @@ static void test_CyaSSL_client_server(callback_functions* client_callbacks,
join_thread(serverThread); join_thread(serverThread);
FreeTcpReady(&ready); FreeTcpReady(&ready);
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
#else #else

14
tests/suites.c
View File

@ -121,7 +121,7 @@ static int execute_test_case(int svr_argc, char** svr_argv,
int cli_argc, char** cli_argv, int cli_argc, char** cli_argv,
int addNoVerify, int addNonBlocking) int addNoVerify, int addNonBlocking)
{ {
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
func_args cliArgs = {0}; func_args cliArgs = {0};
func_args svrArgs = {0}; func_args svrArgs = {0};
cliArgs.argc = cli_argc; cliArgs.argc = cli_argc;
@ -192,7 +192,7 @@ static int execute_test_case(int svr_argc, char** svr_argv,
strcat(commandLine, flagSep); strcat(commandLine, flagSep);
} }
} }
#if !defined(USE_WINDOWS_API) && !defined(TIRTOS) #if !defined(USE_WINDOWS_API) && !defined(CYASSL_TIRTOS)
/* add port 0 */ /* add port 0 */
if (svr_argc + 2 > MAX_ARGS) if (svr_argc + 2 > MAX_ARGS)
printf("cannot add the magic port number flag to server\n"); printf("cannot add the magic port number flag to server\n");
@ -231,15 +231,15 @@ static int execute_test_case(int svr_argc, char** svr_argv,
InitTcpReady(&ready); InitTcpReady(&ready);
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
/* start server */ /* start server */
svrArgs.signal = &ready; svrArgs.signal = &ready;
start_thread(server_test, &svrArgs, &serverThread); start_thread(server_test, &svrArgs, &serverThread);
wait_tcp_ready(&svrArgs); wait_tcp_ready(&svrArgs);
#if !defined(USE_WINDOWS_API) && !defined(TIRTOS) #if !defined(USE_WINDOWS_API) && !defined(CYASSL_TIRTOS)
if (ready.port != 0) if (ready.port != 0)
{ {
if (cli_argc + 2 > MAX_ARGS) if (cli_argc + 2 > MAX_ARGS)
@ -268,8 +268,8 @@ static int execute_test_case(int svr_argc, char** svr_argv,
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
FreeTcpReady(&ready); FreeTcpReady(&ready);

6
tests/unit.c
View File

@ -34,7 +34,7 @@ int unit_test(int argc, char** argv)
err_sys("Cavium OpenNitroxDevice failed"); err_sys("Cavium OpenNitroxDevice failed");
#endif /* HAVE_CAVIUM */ #endif /* HAVE_CAVIUM */
#ifndef TIRTOS #ifndef CYASSL_TIRTOS
if (CurrentDir("tests") || CurrentDir("_build")) if (CurrentDir("tests") || CurrentDir("_build"))
ChangeDirBack(1); ChangeDirBack(1);
else if (CurrentDir("Debug") || CurrentDir("Release")) else if (CurrentDir("Debug") || CurrentDir("Release"))
@ -91,7 +91,7 @@ void start_thread(THREAD_FUNC fun, func_args* args, THREAD_TYPE* thread)
#elif defined(_POSIX_THREADS) && !defined(__MINGW32__) #elif defined(_POSIX_THREADS) && !defined(__MINGW32__)
pthread_create(thread, 0, fun, args); pthread_create(thread, 0, fun, args);
return; return;
#elif defined (TIRTOS) #elif defined (CYASSL_TIRTOS)
/* Initialize the defaults and set the parameters. */ /* Initialize the defaults and set the parameters. */
Task_Params taskParams; Task_Params taskParams;
Task_Params_init(&taskParams); Task_Params_init(&taskParams);
@ -114,7 +114,7 @@ void join_thread(THREAD_TYPE thread)
(void)thread; (void)thread;
#elif defined(_POSIX_THREADS) && !defined(__MINGW32__) #elif defined(_POSIX_THREADS) && !defined(__MINGW32__)
pthread_join(thread, 0); pthread_join(thread, 0);
#elif defined (TIRTOS) #elif defined (CYASSL_TIRTOS)
while(1) { while(1) {
if (Task_getMode(thread) == Task_Mode_TERMINATED) { if (Task_getMode(thread) == Task_Mode_TERMINATED) {
Task_sleep(5); Task_sleep(5);

16
testsuite/testsuite.c
View File

@ -93,7 +93,7 @@ int testsuite_test(int argc, char** argv)
CyaSSL_Debugging_ON(); CyaSSL_Debugging_ON();
#endif #endif
#if !defined(TIRTOS) #if !defined(CYASSL_TIRTOS)
if (CurrentDir("testsuite") || CurrentDir("_build")) if (CurrentDir("testsuite") || CurrentDir("_build"))
ChangeDirBack(1); ChangeDirBack(1);
else if (CurrentDir("Debug") || CurrentDir("Release")) else if (CurrentDir("Debug") || CurrentDir("Release"))
@ -103,8 +103,8 @@ int testsuite_test(int argc, char** argv)
/* Debug or Release */ /* Debug or Release */
#endif #endif
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdOpenSession(TaskSelf()); fdOpenSession(Task_self());
#endif #endif
server_args.signal = &ready; server_args.signal = &ready;
@ -183,8 +183,8 @@ int testsuite_test(int argc, char** argv)
CyaSSL_Cleanup(); CyaSSL_Cleanup();
FreeTcpReady(&ready); FreeTcpReady(&ready);
#ifdef TIRTOS #ifdef CYASSL_TIRTOS
fdCloseSession(TaskSelf()); fdCloseSession(Task_self());
#endif #endif
#ifdef HAVE_CAVIUM #ifdef HAVE_CAVIUM
@ -238,7 +238,7 @@ void simple_test(func_args* args)
strcpy(svrArgs.argv[0], "SimpleServer"); strcpy(svrArgs.argv[0], "SimpleServer");
#if !defined(USE_WINDOWS_API) && !defined(CYASSL_SNIFFER) && \ #if !defined(USE_WINDOWS_API) && !defined(CYASSL_SNIFFER) && \
!defined(TIRTOS) !defined(CYASSL_TIRTOS)
strcpy(svrArgs.argv[svrArgs.argc++], "-p"); strcpy(svrArgs.argv[svrArgs.argc++], "-p");
strcpy(svrArgs.argv[svrArgs.argc++], "0"); strcpy(svrArgs.argv[svrArgs.argc++], "0");
#endif #endif
@ -296,7 +296,7 @@ void start_thread(THREAD_FUNC fun, func_args* args, THREAD_TYPE* thread)
#if defined(_POSIX_THREADS) && !defined(__MINGW32__) #if defined(_POSIX_THREADS) && !defined(__MINGW32__)
pthread_create(thread, 0, fun, args); pthread_create(thread, 0, fun, args);
return; return;
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
/* Initialize the defaults and set the parameters. */ /* Initialize the defaults and set the parameters. */
Task_Params taskParams; Task_Params taskParams;
Task_Params_init(&taskParams); Task_Params_init(&taskParams);
@ -317,7 +317,7 @@ void join_thread(THREAD_TYPE thread)
{ {
#if defined(_POSIX_THREADS) && !defined(__MINGW32__) #if defined(_POSIX_THREADS) && !defined(__MINGW32__)
pthread_join(thread, 0); pthread_join(thread, 0);
#elif defined(TIRTOS) #elif defined(CYASSL_TIRTOS)
while(1) { while(1) {
if (Task_getMode(thread) == Task_Mode_TERMINATED) { if (Task_getMode(thread) == Task_Mode_TERMINATED) {
Task_sleep(5); Task_sleep(5);

3
tirtos/cyassl.bld
View File

@ -78,8 +78,7 @@ for (arg = 0; arg < arguments.length; arg++) {
/* Include Path (needed to find NDK headers) */ /* Include Path (needed to find NDK headers) */
var ndkPath = "$(NDK_INSTALL_DIR)/packages/ti/ndk/"; var ndkPath = "$(NDK_INSTALL_DIR)/packages/ti/ndk/";
var cyasslPathInclude = " -I" + ndkPath + "/inc" + " -I" + ndkPath var cyasslPathInclude = " -I" + ndkPath + "/inc/bsd -DCYASSL_TIRTOS ";
+ "/inc/bsd -DTIRTOS ";
/* lib/ is a generated directory that 'xdc clean' should remove */ /* lib/ is a generated directory that 'xdc clean' should remove */
var Pkg = xdc.useModule('xdc.bld.PackageContents'); var Pkg = xdc.useModule('xdc.bld.PackageContents');

9
tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld
View File

@ -21,13 +21,14 @@ var srcs = [
for each (var targ in Build.targets) { for each (var targ in Build.targets) {
var lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib"; var lnkOpts = "";
var platform = "ti.platforms.tiva:TM4C1294NCPDT:1"; var platform = "ti.platforms.tiva:TM4C1294NCPDT:1";
if (targ.$name.match(/^ti/)) { if (targ.$name.match(/^ti/)) {
lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib";
lnkOpts += " -x "; lnkOpts += " -x ";
} }
else if (targ.$name.match(/^iar/)) { else if (targ.$name.match(/^iar/)) {
lnkOpts = TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib" lnkOpts = TivaWareDir + "/driverlib/ewarm/Exe/driverlib.a"
+ " --config TM4C1294NC.icf"; + " --config TM4C1294NC.icf";
platform = "ti.platforms.tiva:TM4C1294NCPDT"; platform = "ti.platforms.tiva:TM4C1294NCPDT";
@ -35,6 +36,10 @@ for each (var targ in Build.targets) {
var suffix = targ.$orig.lnkOpts.suffix; var suffix = targ.$orig.lnkOpts.suffix;
targ.$orig.lnkOpts.suffix = suffix.replace(/PrintfSmall/, "PrintfFull"); targ.$orig.lnkOpts.suffix = suffix.replace(/PrintfSmall/, "PrintfFull");
} }
else if (targ.$name.match(/^gnu/)) {
targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " + " -Wl,--start-group -ldriver -Wl,--end-group ";
targ.$orig.bspLib = "rdimon";
}
var exeOptions = {incs: cyasslPathInclude var exeOptions = {incs: cyasslPathInclude
+ " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED " + " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "

10
tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld
View File

@ -20,16 +20,22 @@ var srcs = [
]; ];
for each (var targ in Build.targets) { for each (var targ in Build.targets) {
var lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib"
var lnkOpts = "";
var platform = "ti.platforms.tiva:TM4C1294NCPDT:1"; var platform = "ti.platforms.tiva:TM4C1294NCPDT:1";
if (targ.$name.match(/^ti/)) { if (targ.$name.match(/^ti/)) {
lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib";
lnkOpts += " -x "; lnkOpts += " -x ";
} }
else if (targ.$name.match(/^iar/)) { else if (targ.$name.match(/^iar/)) {
lnkOpts = TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib" lnkOpts = TivaWareDir + "/driverlib/ewarm/Exe/driverlib.a"
+ " --config TM4C1294NC.icf"; + " --config TM4C1294NC.icf";
platform = "ti.platforms.tiva:TM4C1294NCPDT"; platform = "ti.platforms.tiva:TM4C1294NCPDT";
} }
else if (targ.$name.match(/^gnu/)) {
targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " + " -Wl,--start-group -ldriver -Wl,--end-group ";
targ.$orig.bspLib = "rdimon";
}
var exeOptions = {incs: cyasslPathInclude var exeOptions = {incs: cyasslPathInclude
+ " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED " + " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "