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

more macros, fips test passes

Browse Source
This commit is contained in:
kaleb-himes 2015-01-07 13:33:10 -07:00
parent 639637278d
commit 7e9c8028b2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit.c
View File

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

2
wolfssl/callbacks.h
View File

@ -76,5 +76,5 @@ typedef struct timeoutInfo_st {
#endif
#endif /* CYASSL_CALLBACKS_H */
#endif /* WOLFSSL_CALLBACKS_H */

4
wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h
View File

@ -22,7 +22,7 @@
#ifndef PIC32MZ_CRYPT_H
#define PIC32MZ_CRYPT_H
#ifdef CYASSL_PIC32MZ_CRYPT
#if defined(CYASSL_PIC32MZ_CRYPT) || defined(WOLFSSL_PIC32MZ_CRYPT)
#define MICROCHIP_PIC32
#include <xc.h>
@ -74,7 +74,7 @@ typedef struct { /* Crypt Engine descripter */
#define WAIT_ENGINE \
{ volatile int v ; while (CESTATbits.ACTIVE) ; for(v=0; v<100; v++) ; }
#ifdef DEBUG_CYASSL
#if defined(DEBUG_CYASSL) || defined(DEBUG_WOLFSSL)
static void print_mem(const unsigned char *p, int size) {
for(; size>0; size--, p++) {
if(size%4 == 0)printf(" ") ;