From 7e9c8028b227a83bee5f1498ad5e9a23ec5e0d3e Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb.himes@gmail.com>
Date: Wed, 7 Jan 2015 13:33:10 -0700
Subject: [PATCH] more macros, fips test passes

---
 tests/unit.c                                 | 6 +++---
 wolfssl/callbacks.h                          | 2 +-
 wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/unit.c b/tests/unit.c
index 933a356b9..7f472fd47 100644
--- a/tests/unit.c
+++ b/tests/unit.c
@@ -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);
diff --git a/wolfssl/callbacks.h b/wolfssl/callbacks.h
index 9af9a596d..b3376117b 100644
--- a/wolfssl/callbacks.h
+++ b/wolfssl/callbacks.h
@@ -76,5 +76,5 @@ typedef struct timeoutInfo_st {
 #endif
 
 
-#endif /* CYASSL_CALLBACKS_H */
+#endif /* WOLFSSL_CALLBACKS_H */
 
diff --git a/wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h b/wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h
index e6541eda7..6022b51bb 100644
--- a/wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h
+++ b/wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h
@@ -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(" ") ;