pic32mx/mz

.gitignore

@@ -119,20 +119,20 @@ IDE\MDK-ARM\LPC43xx\LPC43xx/
 *.gcov
 
 # MPLAB Generated Files (OS X)
-mcapi/ctaocrypt_mcapi.X/nbproject/Makefile-*
-mcapi/ctaocrypt_mcapi.X/nbproject/Package-default.bash
-mcapi/ctaocrypt_test.X/nbproject/Makefile-*
-mcapi/ctaocrypt_test.X/nbproject/Package-default.bash
-mcapi/cyassl.X/nbproject/Makefile-*
-mcapi/cyassl.X/nbproject/Package-default.bash
+mcapi/wolfcrypt_mcapi.X/nbproject/Makefile-*
+mcapi/wolfcrypt_mcapi.X/nbproject/Package-default.bash
+mcapi/wolfcrypt_test.X/nbproject/Makefile-*
+mcapi/wolfcrypt_test.X/nbproject/Package-default.bash
+mcapi/wolfssl.X/nbproject/Makefile-*
+mcapi/wolfssl.X/nbproject/Package-default.bash
 mcapi/zlib.X/nbproject/Makefile-*
 mcapi/zlib.X/nbproject/Package-default.bash
-mplabx/ctaocrypt_benchmark.X/nbproject/Makefile-*
-mplabx/ctaocrypt_benchmark.X/nbproject/Package-default.bash
-mplabx/ctaocrypt_test.X/nbproject/Makefile-*
-mplabx/ctaocrypt_test.X/nbproject/Package-default.bash
-mplabx/cyassl.X/nbproject/Makefile-*
-mplabx/cyassl.X/nbproject/Package-default.bash
+mplabx/wolfcrypt_benchmark.X/nbproject/Makefile-*
+mplabx/wolfcrypt_benchmark.X/nbproject/Package-default.bash
+mplabx/wolfcrypt_test.X/nbproject/Makefile-*
+mplabx/wolfcrypt_test.X/nbproject/Package-default.bash
+mplabx/wolfssl.X/nbproject/Makefile-*
+mplabx/wolfssl.X/nbproject/Package-default.bash
 
 # Vagrant folder
 .vagrant/

Makefile.am

@@ -86,13 +86,13 @@ include mqx/cyassl/include.am
 #include mqx/cyassl_client/Sources/include.am
 include mqx/util_lib/Sources/include.am
 include mplabx/include.am
-include mplabx/ctaocrypt_benchmark.X/nbproject/include.am
-include mplabx/ctaocrypt_test.X/nbproject/include.am
-include mplabx/cyassl.X/nbproject/include.am
+include mplabx/wolfcrypt_benchmark.X/nbproject/include.am
+include mplabx/wolfcrypt_test.X/nbproject/include.am
+include mplabx/wolfssl.X/nbproject/include.am
 include mcapi/include.am
-include mcapi/ctaocrypt_mcapi.X/nbproject/include.am
-include mcapi/ctaocrypt_test.X/nbproject/include.am
-include mcapi/cyassl.X/nbproject/include.am
+include mcapi/wolfcrypt_mcapi.X/nbproject/include.am
+include mcapi/wolfcrypt_test.X/nbproject/include.am
+include mcapi/wolfssl.X/nbproject/include.am
 include mcapi/zlib.X/nbproject/include.am
 include tirtos/include.am
 

examples/client/client.c

@@ -208,7 +208,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     int    doPeerCheck = 1;
     int    nonBlocking = 0;
     int    resumeSession = 0;
-    int    shutdown      = 0;
+    int    wc_shutdown      = 0;
     int    ret;
     int    scr           = 0;    /* allow secure renegotiation */
     int    forceScr      = 0;    /* force client initiaed scr */
@@ -371,7 +371,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
                 break;
 
             case 'w' :
-                shutdown = 1;
+                wc_shutdown = 1;
                 break;
 
             case 'R' :
@@ -811,7 +811,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
 
     if (doDTLS == 0) {           /* don't send alert after "break" command */
         ret = wolfSSL_shutdown(ssl);
-        if (shutdown && ret == SSL_SHUTDOWN_NOT_DONE)
+        if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE)
             wolfSSL_shutdown(ssl);    /* bidirectional shutdown */
     }
 #ifdef ATOMIC_USER
@@ -890,7 +890,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
         wolfSSL_write(sslResume, msg, msgSz); 
 
         ret = wolfSSL_shutdown(sslResume);
-        if (shutdown && ret == SSL_SHUTDOWN_NOT_DONE)
+        if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE)
             wolfSSL_shutdown(sslResume);    /* bidirectional shutdown */
 
         wolfSSL_free(sslResume);

examples/server/server.c

@@ -174,7 +174,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
     int    fewerPackets = 0;
     int    pkCallbacks  = 0;
     int    serverReadyFile = 0;
-    int    shutdown        = 0;
+    int    wc_shutdown        = 0;
     int    ret;
     char*  cipherList = NULL;
     const char* verifyCert = cliCert;
@@ -261,7 +261,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
                 break;
 
             case 'w' :
-                shutdown = 1;
+                wc_shutdown = 1;
                 break;
 
             case 'v' :
@@ -568,7 +568,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
     #endif
 
     ret = SSL_shutdown(ssl);
-    if (shutdown && ret == SSL_SHUTDOWN_NOT_DONE)
+    if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE)
         SSL_shutdown(ssl);    /* bidirectional shutdown */
     SSL_free(ssl);
     SSL_CTX_free(ctx);

mcapi/README

@@ -1,69 +1,69 @@
-CyaSSL MPLAB X Project Files
+WolfSSL MPLAB X Project Files
 
 This directory contains project files for the Microchip MPLAB X IDE. These
 projects have been set up to use the Microchip PIC32 Ethernet Starter Kit
 and the Microchip XC32 compiler, and have been created specifically to test
-the Microchip-specific CTaoCrypt API with compression support. For MPLAB X 
-projects that don't use compression and are generic to the CTaoCrypt API, 
-please see the <cyassl_root>/mplabx directory.
+the Microchip-specific WolfCrypt API with compression support. For MPLAB X 
+projects that don't use compression and are generic to the WolfCrypt API, 
+please see the <wolfssl_root>/mplabx directory.
 
 In order to generate the necessary auto-generated MPLAB X files, make sure
 to import the cyassl.X and zlib.X projects into your MPLAB X workspace before 
-trying to build either the CTaoCrypt test or benchmark applications. This will
+trying to build either the WolfCrypt test or benchmark applications. This will
 correctly set up the respective project's Makefiles.
 
 Included Project Files
 -----------------------
 
-1. CyaSSL library (cyassl.X)
+1. wolfSSL library (wolfssl.X)
 
-    This project builds a static CyaSSL library. Prior to building this
+    This project builds a static wolfSSL library. Prior to building this
     project, uncomment the MICROCHIP_PIC32 define located in:
 
-    <cyassl_root>/cyassl/ctaocrypt/settings.h
+    <wolfssl_root>/wolfssl/wolfcrypt/settings.h
 
     After this project has been built, the compiled library will be located
     at:
 
-    <cyassl_root>/mplabx/cyassl.X/dist/default/production/cyassl.X.a
+    <wolfssl_root>/mplabx/wolfssl.X/dist/default/production/wolfssl.X.a
 
     Note that this project includes the zlib header location in the project's
     include paths. This is because this project has been set up to be compiled
     with zlib support to enable compression and decompression features.
 
-2. CTaoCrypt Test App (ctaocrypt_test.X)
+2. wolfCrypt Test App (wolfcrypt_test.X)
 
-    This project tests the CTaoCrypt cryptography modules. It is generally
+    This project tests the wolfCrypt cryptography modules. It is generally
     a good idea to run this first on an embedded system after compiling
-    CyaSSL in order to verify all underlying crypto is working correctly.
+    wolfSSL in order to verify all underlying crypto is working correctly.
 
-3. CTaoCrypt Benchmark App (ctaocrypt_benchmark.X)
+3. wolfCrypt Benchmark App (wolfcrypt_benchmark.X)
 
-    This project builds the CTaoCrypt benchmark application. If the CyaSSL
-    project (cyassl.X) has been compiled with libz support and is being
+    This project builds the wolfCrypt benchmark application. If the wolfSSL
+    project (wolfssl.X) has been compiled with libz support and is being
     used to build this project, the zlib.X project will need to added to
-    the "Libraries" folder under the ctaocrypt_benchmark.X project before
+    the "Libraries" folder under the wolfcrypt_benchmark.X project before
     it will compile successfully.
 
-4. CTaoCrypt MCAPI Test App (ctaocrypt_mcapi.X)
+4. wolfCrypt MCAPI Test App (wolfcrypt_mcapi.X)
 
     This project tests the Microchip crytpo API layer. The Microchip crypto
-    layer is located under the <cyassl_root>/mcapi directory.
+    layer is located under the <wolfssl_root>/mcapi directory.
 
 5. zlib library (zlib.X)
 
-    This project builds the zlib library for use in the ctaocrypt_test.X
-    and ctaocrypt_mcapi.X projects. This project expects the zlib sources
-    to be located under the CyaSSL root directory. Currently it is set up
+    This project builds the zlib library for use in the wolfcrypt_test.X
+    and wolfcrypt_mcapi.X projects. This project expects the zlib sources
+    to be located under the wolfSSL root directory. Currently it is set up
     to work with zlib 1.2.8, and looks for sources under:
 
-    <cyassl_root>/zlib-1.2.8
+    <wolfssl_root>/zlib-1.2.8
 
 PIC32MX/PIC32MZ
 ---------------
 
 The projects are set for PIC32MX by default. For PIC32MZ, change project
-properties->Devices and add "CYASSL_MICROCHIP_PIC32M" to 
+properties->Devices and add "WOLFSSL_MICROCHIP_PIC32M" to 
 XC32-gcc->Preprocessing and messages-> Preprocessor macros.
 
 MIPS16 and MIPS32 Support