Browse Source

update Freescale CodeWarrior project files to wolfSSL

Chris Conlon 9 years ago
parent
commit
605ca8eaf6
40 changed files with 215 additions and 213 deletions
  1. 4 4
      Makefile.am
  2. 11 9
      mqx/README
  3. 0 22
      mqx/cyassl_client/Sources/include.am
  4. 9 9
      mqx/wolfcrypt_benchmark/.cproject
  5. 3 3
      mqx/wolfcrypt_benchmark/.project
  6. 13 13
      mqx/wolfcrypt_benchmark/ReferencedRSESystems.xml
  7. 14 14
      mqx/wolfcrypt_benchmark/Sources/include.am
  8. 1 1
      mqx/wolfcrypt_benchmark/Sources/main.c
  9. 0 0
      mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch
  10. 0 0
      mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch
  11. 0 0
      mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch
  12. 0 0
      mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch
  13. 9 9
      mqx/wolfcrypt_test/.cproject
  14. 3 3
      mqx/wolfcrypt_test/.project
  15. 13 13
      mqx/wolfcrypt_test/ReferencedRSESystems.xml
  16. 4 4
      mqx/wolfcrypt_test/Sources/include.am
  17. 2 2
      mqx/wolfcrypt_test/Sources/main.c
  18. 1 1
      mqx/wolfcrypt_test/Sources/main.h
  19. 0 0
      mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch
  20. 0 0
      mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch
  21. 0 0
      mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch
  22. 0 0
      mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch
  23. 10 10
      mqx/wolfssl/.cproject
  24. 5 5
      mqx/wolfssl/.project
  25. 2 2
      mqx/wolfssl/include.am
  26. 21 21
      mqx/wolfssl_client/.cproject
  27. 3 3
      mqx/wolfssl_client/.project
  28. 0 0
      mqx/wolfssl_client/Debugger/K70FN1M0.mem
  29. 0 0
      mqx/wolfssl_client/Debugger/init_kinetis.tcl
  30. 0 0
      mqx/wolfssl_client/Debugger/mass_erase_kinetis.tcl
  31. 14 14
      mqx/wolfssl_client/ReferencedRSESystems.xml
  32. 22 0
      mqx/wolfssl_client/Sources/include.am
  33. 34 34
      mqx/wolfssl_client/Sources/main.c
  34. 2 2
      mqx/wolfssl_client/Sources/main.h
  35. 3 3
      mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch
  36. 3 3
      mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch
  37. 0 0
      mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink
  38. 3 3
      mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch
  39. 3 3
      mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch
  40. 3 3
      mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch

+ 4 - 4
Makefile.am

@@ -79,11 +79,11 @@ include testsuite/include.am
 include tests/include.am
 include sslSniffer/sslSnifferTest/include.am
 include rpm/include.am
-# TODO: fix, this commented out mqx ones have spaces in file names
-#include mqx/wolfcrypt_test/Sources/include.am
-include mqx/cyassl/include.am
-#include mqx/cyassl_client/Sources/include.am
 include mqx/util_lib/Sources/include.am
+include mqx/wolfcrypt_benchmark/Sources/include.am
+include mqx/wolfcrypt_test/Sources/include.am
+include mqx/wolfssl/include.am
+include mqx/wolfssl_client/Sources/include.am
 include mplabx/include.am
 include mplabx/wolfcrypt_benchmark.X/nbproject/include.am
 include mplabx/wolfcrypt_test.X/nbproject/include.am

+ 11 - 9
mqx/README

@@ -1,4 +1,4 @@
-CyaSSL Freescale CodeWarrior Project Files
+wolfSSL Freescale CodeWarrior Project Files
 
 This directory contains project files for Freescale CodeWarrior 10.6 with
 the Freescale GCC compiler. These project have been created to use MQX, RTCS,
@@ -7,20 +7,22 @@ and MFS on the Freescale Kinetis K70 Tower System (TWRK70F120M).
 Included Project Files
 -----------------------
 
-1. CyaSSL library (/cyassl)
+1. wolfSSL library (/wolfssl)
 
-    Prior to building this project, uncomment the FREESCALE_MQX define 
+    Prior to building this project, uncomment the FREESCALE_MQX define
     located in:
 
-    <cyassl_root>/cyassl/ctaocrypt/settings.h
+    <wolfssl_root>/wolfssl/wolfcrypt/settings.h
 
 2. wolfCrypt Test App (/wolfcrypt_test)
 
-3. Example CyaSSL Client (/cyassl_client)
+3. wolfCrypt Benchmark App (/wolfcrypt_benchmark)
+
+3. Example wolfSSL Client (/wolfssl_client)
 
 4. Utility library (/util_lib)
 
-    This library is used by the CyaSSL example client project and wolfCrypt
+    This library is used by the wolfSSL example client project and wolfCrypt
     test app project for opening/closing the SD card, etc.
 
 Importing into CodeWarrior Workspace
@@ -32,10 +34,10 @@ these steps:
 
 1. File -> Import
 2. General -> Existing Projects into Workspace
-3. Select Root Directory (browse to this "<cyassl_root>/mqx" directory)
+3. Select Root Directory (browse to this "<wolfssl_root>/mqx" directory)
 4. Select desired projects -> Finish
 
-Keep in mind that the projects above reference CyaSSL source files and header
+Keep in mind that the projects above reference wolfSSL source files and header
 files with relative paths to the projects' current location in the
-<cyassl_root>/mqx directory.
+<wolfssl_root>/mqx directory.
 

+ 0 - 22
mqx/cyassl_client/Sources/include.am

@@ -1,22 +0,0 @@
-# vim:ft=automake
-# All paths should be given relative to the root
-#
-
-EXTRA_DIST += \
-         mqx/cyassl_client/.cproject \
-         mqx/cyassl_client/.project \
-         mqx/cyassl_client/K70FN1M0.mem \
-         mqx/cyassl_client/init_kinetis.tcl \
-         mqx/cyassl_client/mass_erase_kinetis.tcl \
-         mqx/cyassl_client/ReferencedRSESystems.xml \
-         mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.launch \
-         mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.launch \
-         mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink \
-         mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch \
-         mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.launch \
-         mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.launch
-
-EXTRA_DIST += \
-         mqx/cyassl_client/Sources/main.c \
-         mqx/cyassl_client/Sources/main.h
-

+ 9 - 9
mqx/wolfcrypt_benchmark/.cproject

@@ -90,7 +90,7 @@
 									<listOptionValue builtIn="false" value="&quot;c++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;supc++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;c&quot;"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.1799569542" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -99,7 +99,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1678404828" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MQX_ROOT_DIR}/lib/twrk70f120m.cw10gcc/debug/psp/psp.a&quot;"/>
@@ -250,7 +250,7 @@
 									<listOptionValue builtIn="false" value="&quot;c++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;supc++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;c&quot;"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.940903300" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -259,7 +259,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1389344626" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MQX_ROOT_DIR}/lib/twrk70f120m.cw10gcc/debug/psp/psp.a&quot;"/>
@@ -411,14 +411,14 @@
 									<listOptionValue builtIn="false" value="stdc++"/>
 									<listOptionValue builtIn="false" value="gcc"/>
 									<listOptionValue builtIn="false" value="supc++"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.330763302" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../MCU/ARM_GCC_Support/ewl/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/lib/gcc/arm-none-eabi/4.7.3/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1069836785" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
@@ -483,7 +483,7 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="cyassl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+				<externalSettings containerId="wolfssl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="util_lib" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
@@ -574,7 +574,7 @@
 									<listOptionValue builtIn="false" value="&quot;c++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;supc++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;c&quot;"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.2028362740" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -583,7 +583,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.253845966" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MQX_ROOT_DIR}/lib/twrk70f120m.cw10gcc/debug/psp/psp.a&quot;"/>

+ 3 - 3
mqx/wolfcrypt_benchmark/.project

@@ -3,8 +3,8 @@
 	<name>wolfcrypt_benchmark</name>
 	<comment></comment>
 	<projects>
-		<project location="PARENT-1-PROJECT_LOC/cyassl">
-cyassl		</project>
+		<project location="PARENT-1-PROJECT_LOC/wolfssl">
+wolfssl		</project>
 		<project location="PARENT-1-PROJECT_LOC/util_lib">
 util_lib		</project>
 	</projects>
@@ -30,7 +30,7 @@ util_lib		</project>
 		<link>
 			<name>Sources/wolfcrypt_benchmark</name>
 			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC/ctaocrypt/benchmark</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/wolfcrypt/benchmark</locationURI>
 		</link>
 	</linkedResources>
 	<variableList>

+ 13 - 13
mqx/wolfcrypt_benchmark/ReferencedRSESystems.xml

@@ -5,12 +5,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <APSC_Memento>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.proj.wolfcrypt_benchmark"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.proj.wolfcrypt_benchmark"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -40,7 +40,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -74,12 +74,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 </host>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.proj.wolfcrypt_benchmark"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.proj.wolfcrypt_benchmark"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -109,7 +109,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -144,12 +144,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <host>
 <properties>
 <property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_JTrace.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_JTrace.proj.wolfcrypt_benchmark"/>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.proj.wolfcrypt_benchmark"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.proj.wolfcrypt_benchmark"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -192,7 +192,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -226,12 +226,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 </host>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.proj.wolfcrypt_benchmark"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.proj.wolfcrypt_benchmark" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.proj.wolfcrypt_benchmark"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -261,7 +261,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -293,4 +293,4 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="propertySet.[cw.ide.settingscache].hidden.TimeStamp" value="1409954755358"/>
 </properties>
 </host>
-</APSC_Memento>
+</APSC_Memento>

+ 14 - 14
mqx/wolfcrypt_benchmark/Sources/include.am

@@ -3,20 +3,20 @@
 #
 
 EXTRA_DIST += \
-         mqx/wolfcrypt_test/.cproject \
-         mqx/wolfcrypt_test/.project \
-         mqx/wolfcrypt_test/Debugger/K70FN1M0.mem \
-         mqx/wolfcrypt_test/Debugger/init_kinetis.tcl \
-         mqx/wolfcrypt_test/Debugger/mass_erase_kinetis.tcl \
-         mqx/wolfcrypt_test/ReferencedRSESystems.xml \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.launch \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.launch \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.launch \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.launch
+         mqx/wolfcrypt_benchmark/.cproject \
+         mqx/wolfcrypt_benchmark/.project \
+         mqx/wolfcrypt_benchmark/Debugger/K70FN1M0.mem \
+         mqx/wolfcrypt_benchmark/Debugger/init_kinetis.tcl \
+         mqx/wolfcrypt_benchmark/Debugger/mass_erase_kinetis.tcl \
+         mqx/wolfcrypt_benchmark/ReferencedRSESystems.xml \
+         mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch \
+         mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch \
+         mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink \
+         mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch \
+         mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch \
+         mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch
 
 EXTRA_DIST += \
-         mqx/wolfcrypt_test/Sources/main.c \
-         mqx/wolfcrypt_test/Sources/main.h
+         mqx/wolfcrypt_benchmark/Sources/main.c \
+         mqx/wolfcrypt_benchmark/Sources/main.h
 

+ 1 - 1
mqx/wolfcrypt_benchmark/Sources/main.c

@@ -59,7 +59,7 @@ typedef struct func_args {
  * Function Name  : Main_task
  * Comments       :
  *    This task opens the SD card device and runs the
- *    CTaoCrypt test functions located in test.c.
+ *    wolfCrypt benchmark functions located in benchmark.c.
  *END------------------------------------------------------------------*/
 
 void Main_task(uint32_t initial_data)

+ 0 - 0
mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.launch → mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch


+ 0 - 0
mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.launch → mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch


+ 0 - 0
mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.launch → mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch


+ 0 - 0
mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.launch → mqx/wolfcrypt_benchmark/wolfcrypt_benchmark_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch


+ 9 - 9
mqx/wolfcrypt_test/.cproject

@@ -86,7 +86,7 @@
 									<listOptionValue builtIn="false" value="&quot;c++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;supc++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;c&quot;"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.1799569542" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -95,7 +95,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1678404828" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MQX_ROOT_DIR}/lib/twrk70f120m.cw10gcc/debug/psp/psp.a&quot;"/>
@@ -242,7 +242,7 @@
 									<listOptionValue builtIn="false" value="&quot;c++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;supc++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;c&quot;"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.940903300" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -251,7 +251,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1389344626" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MQX_ROOT_DIR}/lib/twrk70f120m.cw10gcc/debug/psp/psp.a&quot;"/>
@@ -399,14 +399,14 @@
 									<listOptionValue builtIn="false" value="stdc++"/>
 									<listOptionValue builtIn="false" value="gcc"/>
 									<listOptionValue builtIn="false" value="supc++"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.330763302" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../MCU/ARM_GCC_Support/ewl/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/lib/gcc/arm-none-eabi/4.7.3/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1069836785" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
@@ -470,7 +470,7 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="cyassl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+				<externalSettings containerId="wolfssl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="util_lib" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
@@ -557,7 +557,7 @@
 									<listOptionValue builtIn="false" value="&quot;c++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;supc++&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;c&quot;"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.2028362740" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -566,7 +566,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.253845966" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MQX_ROOT_DIR}/lib/twrk70f120m.cw10gcc/debug/psp/psp.a&quot;"/>

+ 3 - 3
mqx/wolfcrypt_test/.project

@@ -3,8 +3,8 @@
 	<name>wolfcrypt_test</name>
 	<comment></comment>
 	<projects>
-		<project location="PARENT-1-PROJECT_LOC/cyassl">
-cyassl		</project>
+		<project location="PARENT-1-PROJECT_LOC/wolfssl">
+wolfssl		</project>
 		<project location="PARENT-1-PROJECT_LOC/util_lib">
 util_lib		</project>
 	</projects>
@@ -30,7 +30,7 @@ util_lib		</project>
 		<link>
 			<name>Sources/test</name>
 			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC/ctaocrypt/test</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/wolfcrypt/test</locationURI>
 		</link>
 	</linkedResources>
 	<variableList>

+ 13 - 13
mqx/wolfcrypt_test/ReferencedRSESystems.xml

@@ -5,12 +5,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <APSC_Memento>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.proj.wolfcrypt_test"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.proj.wolfcrypt_test"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -40,7 +40,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -74,12 +74,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 </host>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.proj.wolfcrypt_test"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.proj.wolfcrypt_test"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -109,7 +109,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -144,12 +144,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <host>
 <properties>
 <property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_JTrace.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_JTrace.proj.wolfcrypt_test"/>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.proj.wolfcrypt_test"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.proj.wolfcrypt_test"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -192,7 +192,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -226,12 +226,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 </host>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.proj.wolfcrypt_test"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.proj.wolfcrypt_test" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.proj.wolfcrypt_test"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -261,7 +261,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -293,4 +293,4 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="propertySet.[cw.ide.settingscache].hidden.TimeStamp" value="1409954755358"/>
 </properties>
 </host>
-</APSC_Memento>
+</APSC_Memento>

+ 4 - 4
mqx/wolfcrypt_test/Sources/include.am

@@ -9,12 +9,12 @@ EXTRA_DIST += \
          mqx/wolfcrypt_test/Debugger/init_kinetis.tcl \
          mqx/wolfcrypt_test/Debugger/mass_erase_kinetis.tcl \
          mqx/wolfcrypt_test/ReferencedRSESystems.xml \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.launch \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.launch \
+         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch \
+         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch \
          mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink \
          mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.launch \
-         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.launch
+         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch \
+         mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch
 
 EXTRA_DIST += \
          mqx/wolfcrypt_test/Sources/main.c \

+ 2 - 2
mqx/wolfcrypt_test/Sources/main.c

@@ -59,7 +59,7 @@ typedef struct func_args {
  * Function Name  : Main_task
  * Comments       :
  *    This task opens the SD card device and runs the 
- *    CTaoCrypt test functions located in test.c.
+ *    wolfCrypt test functions located in test.c.
  *END------------------------------------------------------------------*/
 
 void Main_task(uint32_t initial_data)
@@ -78,7 +78,7 @@ void Main_task(uint32_t initial_data)
     }
     printf("SD card installed to %s\n", filesystem_name);
     
-    ctaocrypt_test(&args);
+    wolfcrypt_test(&args);
     
     ret = sdcard_close(&sdcard_handle, &partman_handle,
                        &filesystem_handle, partman_name, filesystem_name);

+ 1 - 1
mqx/wolfcrypt_test/Sources/main.h

@@ -14,7 +14,7 @@
 #define MAIN_TASK   1
 
 extern void Main_task (uint32_t);
-void ctaocrypt_test(void* args);
+void wolfcrypt_test(void* args);
 
 #endif /* __main_h_ */
 

+ 0 - 0
mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.launch → mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch


+ 0 - 0
mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.launch → mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch


+ 0 - 0
mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.launch → mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch


+ 0 - 0
mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.launch → mqx/wolfcrypt_test/wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch


+ 10 - 10
mqx/cyassl/.cproject → mqx/wolfssl/.cproject

@@ -17,7 +17,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="cyassl" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator;" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1986912024" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_DDRData_Debug" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" produceBuildErrorsWithMissingReferences="true">
+				<configuration artifactExtension="a" artifactName="wolfssl" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator;" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1986912024" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_DDRData_Debug" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" produceBuildErrorsWithMissingReferences="true">
 					<folderInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1986912024." name="/" resourcePath="">
 						<toolChain errorParsers="" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug.974506159" name="ARM Ltd Windows GCC (G++ Lite)" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug">
 							<option id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level.1064224380" name="Debug level" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level" value="org.eclipse.cdt.cross.arm.gnu.base.option.debugging.level.none" valueType="enumerated"/>
@@ -124,7 +124,7 @@
 					<fileInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1986912024.Debugger/mass_erase_kinetis.tcl" name="mass_erase_kinetis.tcl" rcbsApplicability="disable" resourcePath="Debugger/mass_erase_kinetis.tcl" toolsToInvoke=""/>
 					<fileInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1986912024.Debugger/init_kinetis.tcl" name="init_kinetis.tcl" rcbsApplicability="disable" resourcePath="Debugger/init_kinetis.tcl" toolsToInvoke=""/>
 					<sourceEntries>
-						<entry excluding="Sources/ctaocrypt_src/port/pic32/pic32mz-hash.c|Sources/ctaocrypt_src/misc.c|Sources/ctaocrypt_src/aes_asm.asm|Sources/ctaocrypt_src/aes_asm.s|Debugger/init_kinetis.tcl|Debugger/mass_erase_kinetis.tcl|Debugger/K70FN1M0.mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="Sources/wolfcrypt_src/port/pic32/pic32mz-hash.c|Sources/wolfcrypt_src/misc.c|Sources/wolfcrypt_src/aes_asm.asm|Sources/wolfcrypt_src/aes_asm.s|Debugger/init_kinetis.tcl|Debugger/mass_erase_kinetis.tcl|Debugger/K70FN1M0.mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -144,7 +144,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="cyassl" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator;" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1348786405" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_DDRData_Release" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug">
+				<configuration artifactExtension="a" artifactName="wolfssl" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator;" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1348786405" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_DDRData_Release" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug">
 					<folderInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1348786405." name="/" resourcePath="">
 						<toolChain errorParsers="" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug.192713895" name="ARM Ltd Windows GCC (G++ Lite)" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug">
 							<option id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level.1790844662" name="Debug level" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level" value="org.eclipse.cdt.cross.arm.gnu.base.option.debugging.level.none" valueType="enumerated"/>
@@ -270,7 +270,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="cyassl" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator;" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.689549762" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_SramData_Debug" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" produceBuildErrorsWithMissingReferences="true">
+				<configuration artifactExtension="a" artifactName="wolfssl" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator;" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.689549762" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_SramData_Debug" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" produceBuildErrorsWithMissingReferences="true">
 					<folderInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.689549762." name="/" resourcePath="">
 						<toolChain errorParsers="" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug.225492832" name="ARM Ltd Windows GCC (G++ Lite)" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug">
 							<option id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level.1716699711" name="Debug level" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level" value="org.eclipse.cdt.cross.arm.gnu.base.option.debugging.level.none" valueType="enumerated"/>
@@ -379,7 +379,7 @@
 					<fileInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.689549762.Debugger/mass_erase_kinetis.tcl" name="mass_erase_kinetis.tcl" rcbsApplicability="disable" resourcePath="Debugger/mass_erase_kinetis.tcl" toolsToInvoke=""/>
 					<fileInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.689549762.Debugger/init_kinetis.tcl" name="init_kinetis.tcl" rcbsApplicability="disable" resourcePath="Debugger/init_kinetis.tcl" toolsToInvoke=""/>
 					<sourceEntries>
-						<entry excluding="Sources/ctaocrypt_src/port/pic32/pic32mz-hash.c|Sources/ctaocrypt_src/misc.c|Sources/ctaocrypt_src/aes_asm.asm|Sources/ctaocrypt_src/aes_asm.s|Debugger/init_kinetis.tcl|Debugger/mass_erase_kinetis.tcl|Debugger/K70FN1M0.mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="Sources/wolfcrypt_src/port/pic32/pic32mz-hash.c|Sources/wolfcrypt_src/misc.c|Sources/wolfcrypt_src/aes_asm.asm|Sources/wolfcrypt_src/aes_asm.s|Debugger/init_kinetis.tcl|Debugger/mass_erase_kinetis.tcl|Debugger/K70FN1M0.mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -399,7 +399,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="cyassl" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator;" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.104157976" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_SramData_Release" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" produceBuildErrorsWithMissingReferences="true">
+				<configuration artifactExtension="a" artifactName="wolfssl" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.staticLib" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator;" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.104157976" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_SramData_Release" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" produceBuildErrorsWithMissingReferences="true">
 					<folderInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.104157976." name="/" resourcePath="">
 						<toolChain errorParsers="" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug.489100301" name="ARM Ltd Windows GCC (G++ Lite)" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug">
 							<option id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level.1790779036" name="Debug level" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level" value="org.eclipse.cdt.cross.arm.gnu.base.option.debugging.level.none" valueType="enumerated"/>
@@ -514,19 +514,19 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="CyaSSL_K70F120M_MQX.com.freescale.arm.cdt.toolchain.project.arm.1479856437" name="ARM Project" projectType="com.freescale.arm.cdt.toolchain.project.arm"/>
+		<project id="wolfSSL_K70F120M_MQX.com.freescale.arm.cdt.toolchain.project.arm.1479856437" name="ARM Project" projectType="com.freescale.arm.cdt.toolchain.project.arm"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
 		<configuration configurationName="twrk70f120m_Int_Flash_SramData_Debug">
-			<resource resourceType="PROJECT" workspacePath="/cyassl"/>
+			<resource resourceType="PROJECT" workspacePath="/wolfssl"/>
 		</configuration>
 		<configuration configurationName="twrk70f120m_Int_Flash_DDRData_Debug">
-			<resource resourceType="PROJECT" workspacePath="/cyassl"/>
+			<resource resourceType="PROJECT" workspacePath="/wolfssl"/>
 		</configuration>
 		<configuration configurationName="twrk70f120m_Int_Flash_DDRData_Release"/>
 		<configuration configurationName="twrk70f120m_Int_Flash_SramData_Release">
-			<resource resourceType="PROJECT" workspacePath="/cyassl"/>
+			<resource resourceType="PROJECT" workspacePath="/wolfssl"/>
 		</configuration>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>

+ 5 - 5
mqx/cyassl/.project → mqx/wolfssl/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>cyassl</name>
+	<name>wolfssl</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -26,15 +26,15 @@
 		<link>
 			<name>twrk70f120m_Int_Flash_DDRData_Debug</name>
 			<type>2</type>
-			<locationURI>PARENT-5-PROJECT_LOC/Documents/GitHub/cyassl/mqx/cyassl/twrk70f120m_Int_Flash_DDRData_Debug/build-cyassl-twrk70f120m_Int_Flash_DDRData_Debug</locationURI>
+			<locationURI>PARENT-5-PROJECT_LOC/Documents/GitHub/wolfssl/mqx/wolfssl/twrk70f120m_Int_Flash_DDRData_Debug/build-wolfssl-twrk70f120m_Int_Flash_DDRData_Debug</locationURI>
 		</link>
 		<link>
-			<name>Sources/ctaocrypt_src</name>
+			<name>Sources/wolfcrypt_src</name>
 			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC/ctaocrypt/src</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/wolfcrypt/src</locationURI>
 		</link>
 		<link>
-			<name>Sources/cyassl_src</name>
+			<name>Sources/wolfssl_src</name>
 			<type>2</type>
 			<locationURI>PARENT-2-PROJECT_LOC/src</locationURI>
 		</link>

+ 2 - 2
mqx/cyassl/include.am → mqx/wolfssl/include.am

@@ -6,6 +6,6 @@ EXTRA_DIST += \
          mqx/README
 
 EXTRA_DIST += \
-         mqx/cyassl/.cproject \
-         mqx/cyassl/.project
+         mqx/wolfssl/.cproject \
+         mqx/wolfssl/.project
 

+ 21 - 21
mqx/cyassl_client/.cproject → mqx/wolfssl_client/.cproject

@@ -17,7 +17,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="cyassl_client" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.685476017" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_DDRData_Debug" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="" produceBuildErrorsWithMissingReferences="true">
+				<configuration artifactName="wolfssl_client" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.685476017" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_DDRData_Debug" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="" produceBuildErrorsWithMissingReferences="true">
 					<folderInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.685476017." name="/" resourcePath="">
 						<toolChain errorParsers="" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug.2073798950" name="ARM Ltd Windows GCC (G++ Lite)" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug">
 							<option id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level.944664726" name="Debug level" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level" value="org.eclipse.cdt.cross.arm.gnu.base.option.debugging.level.max" valueType="enumerated"/>
@@ -87,7 +87,7 @@
 									<listOptionValue builtIn="false" value="stdc++"/>
 									<listOptionValue builtIn="false" value="gcc"/>
 									<listOptionValue builtIn="false" value="supc++"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.1799569542" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -96,7 +96,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1678404828" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../MCU/ARM_GCC_Support/ewl/lib/armv7e-m/__arm_start.o&quot;"/>
@@ -156,7 +156,7 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="cyassl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+				<externalSettings containerId="wolfssl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="util_lib" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
@@ -174,7 +174,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="cyassl_client" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.14851640" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_DDRData_Release" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
+				<configuration artifactName="wolfssl_client" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.14851640" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_DDRData_Release" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
 					<folderInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.14851640." name="/" resourcePath="">
 						<toolChain errorParsers="" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug.992920808" name="ARM Ltd Windows GCC (G++ Lite)" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug">
 							<option id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level.183408450" name="Debug level" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level" value="org.eclipse.cdt.cross.arm.gnu.base.option.debugging.level.max" valueType="enumerated"/>
@@ -244,7 +244,7 @@
 									<listOptionValue builtIn="false" value="stdc++"/>
 									<listOptionValue builtIn="false" value="gcc"/>
 									<listOptionValue builtIn="false" value="supc++"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.940903300" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -253,7 +253,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1389344626" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../MCU/ARM_GCC_Support/ewl/lib/armv7e-m/__arm_start.o&quot;"/>
@@ -312,7 +312,7 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="cyassl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+				<externalSettings containerId="wolfssl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="util_lib" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
@@ -330,7 +330,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="cyassl_client" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1358518006" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_SramData_Debug" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="" produceBuildErrorsWithMissingReferences="true">
+				<configuration artifactName="wolfssl_client" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildReferences="true" buildReferencingConfigurations="false" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1358518006" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_SramData_Debug" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="" produceBuildErrorsWithMissingReferences="true">
 					<folderInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1358518006." name="/" resourcePath="">
 						<toolChain errorParsers="" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug.976343888" name="ARM Ltd Windows GCC (G++ Lite)" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug">
 							<option id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level.1791314680" name="Debug level" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level" value="org.eclipse.cdt.cross.arm.gnu.base.option.debugging.level.max" valueType="enumerated"/>
@@ -402,14 +402,14 @@
 									<listOptionValue builtIn="false" value="stdc++"/>
 									<listOptionValue builtIn="false" value="gcc"/>
 									<listOptionValue builtIn="false" value="supc++"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.330763302" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../MCU/ARM_GCC_Support/ewl/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/lib/gcc/arm-none-eabi/4.7.3/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.1069836785" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
@@ -470,7 +470,7 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="cyassl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+				<externalSettings containerId="wolfssl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="util_lib" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
@@ -488,7 +488,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="cyassl_client" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.99688619" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_SramData_Release" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
+				<configuration artifactName="wolfssl_client" buildArtefactType="org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.cross.arm.gnu.buildArtefactType.application" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;com.freescale.core.ide.cdt.errorParsers.GCCErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.99688619" isPrebuildInvalidatingBuild="false" isVersionInfoProjSpecific="false" name="twrk70f120m_Int_Flash_SramData_Release" parent="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
 					<folderInfo id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.99688619." name="/" resourcePath="">
 						<toolChain errorParsers="" id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug.766408415" name="ARM Ltd Windows GCC (G++ Lite)" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.toolchain.debug">
 							<option id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level.2049560136" name="Debug level" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.option.debugging.level" value="org.eclipse.cdt.cross.arm.gnu.base.option.debugging.level.max" valueType="enumerated"/>
@@ -558,7 +558,7 @@
 									<listOptionValue builtIn="false" value="stdc++"/>
 									<listOptionValue builtIn="false" value="gcc"/>
 									<listOptionValue builtIn="false" value="supc++"/>
-									<listOptionValue builtIn="false" value="cyassl"/>
+									<listOptionValue builtIn="false" value="wolfssl"/>
 									<listOptionValue builtIn="false" value="util_lib"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths.2028362740" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.paths" valueType="libPaths">
@@ -567,7 +567,7 @@
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../Cross_Tools/arm-none-eabi-gcc-4_7_3/arm-none-eabi/lib/armv7e-m/softfp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${MCUToolsBaseDir}/ARM_GCC_Support/ewl/lib/armv7e-m&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\util_lib\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\cyassl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}\..\wolfssl\twrk70f120m_Int_Flash_SramData_Debug&quot;"/>
 								</option>
 								<option id="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs.253845966" name="Other objects" superClass="org.eclipse.cdt.cross.arm.gnu.c.link.option.otherobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${MCU_TOOLS_HOME}/../MCU/ARM_GCC_Support/ewl/lib/armv7e-m/__arm_start.o&quot;"/>
@@ -626,28 +626,28 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="cyassl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+				<externalSettings containerId="wolfssl" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="util_lib" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="cyassl_client.com.freescale.arm.cdt.toolchain.project.arm.1318543548" name="ARM Project" projectType="com.freescale.arm.cdt.toolchain.project.arm"/>
+		<project id="wolfssl_client.com.freescale.arm.cdt.toolchain.project.arm.1318543548" name="ARM Project" projectType="com.freescale.arm.cdt.toolchain.project.arm"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
 		<configuration configurationName="twrk70f120m_Int_Flash_SramData_Debug">
-			<resource resourceType="PROJECT" workspacePath="/cyassl_client"/>
+			<resource resourceType="PROJECT" workspacePath="/wolfssl_client"/>
 		</configuration>
 		<configuration configurationName="twrk70f120m_Int_Flash_DDRData_Debug">
-			<resource resourceType="PROJECT" workspacePath="/cyassl_client"/>
+			<resource resourceType="PROJECT" workspacePath="/wolfssl_client"/>
 		</configuration>
 		<configuration configurationName="twrk70f120m_Int_Flash_DDRData_Release">
-			<resource resourceType="PROJECT" workspacePath="/cyassl_client"/>
+			<resource resourceType="PROJECT" workspacePath="/wolfssl_client"/>
 		</configuration>
 		<configuration configurationName="twrk70f120m_Int_Flash_SramData_Release">
-			<resource resourceType="PROJECT" workspacePath="/cyassl_client"/>
+			<resource resourceType="PROJECT" workspacePath="/wolfssl_client"/>
 		</configuration>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>

+ 3 - 3
mqx/cyassl_client/.project → mqx/wolfssl_client/.project

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>cyassl_client</name>
+	<name>wolfssl_client</name>
 	<comment></comment>
 	<projects>
-		<project location="PARENT-1-PROJECT_LOC/cyassl">
-cyassl		</project>
+		<project location="PARENT-1-PROJECT_LOC/wolfssl">
+wolfssl		</project>
 		<project location="PARENT-1-PROJECT_LOC/util_lib">
 util_lib		</project>
 	</projects>

+ 0 - 0
mqx/cyassl_client/Debugger/K70FN1M0.mem → mqx/wolfssl_client/Debugger/K70FN1M0.mem


+ 0 - 0
mqx/cyassl_client/Debugger/init_kinetis.tcl → mqx/wolfssl_client/Debugger/init_kinetis.tcl


+ 0 - 0
mqx/cyassl_client/Debugger/mass_erase_kinetis.tcl → mqx/wolfssl_client/Debugger/mass_erase_kinetis.tcl


+ 14 - 14
mqx/cyassl_client/ReferencedRSESystems.xml → mqx/wolfssl_client/ReferencedRSESystems.xml

@@ -5,12 +5,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <APSC_Memento>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.proj.cyassl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.proj.cyassl_client"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.proj.wolfssl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.proj.wolfssl_client"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -40,7 +40,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -74,12 +74,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 </host>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.proj.cyassl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.proj.cyassl_client"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.proj.wolfssl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.proj.wolfssl_client"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -109,7 +109,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -143,13 +143,13 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 </host>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.proj.cyassl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.proj.cyassl_client"/>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.proj.cyassl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.proj.cyassl_client"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.proj.wolfssl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.proj.wolfssl_client"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.proj.wolfssl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.proj.wolfssl_client"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -192,7 +192,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -226,12 +226,12 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 </host>
 <host>
 <properties>
-<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.proj.cyassl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.cyassl_client_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.proj.cyassl_client"/>
+<property key="hidden.applicator.com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.proj.wolfssl_client" value="com.freescale.debugger.applicator.launchconfiguration.lc.wolfssl_client_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.proj.wolfssl_client"/>
 <property key="host.address" value=""/>
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -261,7 +261,7 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="host.defaultEncoding" value=""/>
 <property key="host.defaultUser" value="Christopher Conlon"/>
 <property key="host.description" value=""/>
-<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink Target"/>
+<property key="host.name" value="wolfcrypt_test_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink Target"/>
 <property key="host.promptable" value="false"/>
 <property key="host.type" value="com.freescale.cdt.debug.cw.core.ui.rse.systemtype.bareboard.hardware.system"/>
 <property key="propertySet.[OptionalPropertySet].enableConnectorServicesPropertyPage" value="false"/>
@@ -293,4 +293,4 @@ This file is automatically generated and updated by the Eclipse IDE.-->
 <property key="propertySet.[cw.ide.settingscache].hidden.TimeStamp" value="1409954755358"/>
 </properties>
 </host>
-</APSC_Memento>
+</APSC_Memento>

+ 22 - 0
mqx/wolfssl_client/Sources/include.am

@@ -0,0 +1,22 @@
+# vim:ft=automake
+# All paths should be given relative to the root
+#
+
+EXTRA_DIST += \
+         mqx/wolfssl_client/.cproject \
+         mqx/wolfssl_client/.project \
+         mqx/wolfssl_client/Debugger/K70FN1M0.mem \
+         mqx/wolfssl_client/Debugger/init_kinetis.tcl \
+         mqx/wolfssl_client/Debugger/mass_erase_kinetis.tcl \
+         mqx/wolfssl_client/ReferencedRSESystems.xml \
+         mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch \
+         mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch \
+         mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink \
+         mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch \
+         mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch \
+         mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch
+
+EXTRA_DIST += \
+         mqx/wolfssl_client/Sources/main.c \
+         mqx/wolfssl_client/Sources/main.h
+

+ 34 - 34
mqx/cyassl_client/Sources/main.c → mqx/wolfssl_client/Sources/main.c

@@ -53,14 +53,14 @@ TASK_TEMPLATE_STRUCT MQX_template_list[] =
  * Task Name    : Main_task
  * Comments     :
  *    This task sets up the SD card and Ethernet devices,
- *    then starts the example CyaSSL client.  The example
- *    CyaSSL client connects to a server over SSL and sends
+ *    then starts the example wolfSSL client.  The example
+ *    wolfSSL client connects to a server over TLS and sends
  *    a simple HTTP GET message, then prints out the reply
  *    from the server.
  *
  *    To change the IP address and port of the server,
- *    change the yasslIP and yasslPort variables in
- *    client_test(). Note that yasslIP needs to be given
+ *    change the wolfsslIP and wolfsslPort variables in
+ *    client_test(). Note that wolfsslIP needs to be given
  *    in hexadecimal.
  *
  *END*-----------------------------------------------------*/
@@ -178,13 +178,13 @@ void setup_clock(void)
     return;
 }
 
-int myVerify(int preverify, CYASSL_X509_STORE_CTX* store)
+int myVerify(int preverify, WOLFSSL_X509_STORE_CTX* store)
 {
     (void)preverify;
     char buffer[80];
 
     printf("In verification callback, error = %d, %s\n",
-            store->error, CyaSSL_ERR_error_string(store->error, buffer));
+            store->error, wolfSSL_ERR_error_string(store->error, buffer));
 
     return 0;
 }
@@ -196,32 +196,32 @@ void client_test(void)
     int sockfd, input;
     int ret = 0, msgSz = 0;
     struct sockaddr_in	servaddr;
-    CYASSL_CTX*			ctx;
-    CYASSL*				ssl;
+    WOLFSSL_CTX*		ctx;
+    WOLFSSL*			ssl;
 
-    long yasslIP = IPADDR(192,168,1,125);
-    long yasslPort = 11111;
+    long wolfsslIP = IPADDR(192,168,1,125);
+    long wolfsslPort = 11111;
 
-    /* for debug, compile CyaSSL with DEBUG_CYASSL defined */
-    CyaSSL_Debugging_ON();
+    /* for debug, compile wolfSSL with DEBUG_WOLFSSL defined */
+    wolfSSL_Debugging_ON();
 
-    CyaSSL_Init();
+    wolfSSL_Init();
 
-    ctx = CyaSSL_CTX_new(CyaTLSv1_2_client_method());
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
     if (ctx == 0)
         err_sys("setting up ctx");
 
-    CyaSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, myVerify);
+    wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, myVerify);
 
-    ret = CyaSSL_CTX_use_certificate_file(ctx, clientCert, SSL_FILETYPE_PEM);
+    ret = wolfSSL_CTX_use_certificate_file(ctx, clientCert, SSL_FILETYPE_PEM);
     if (ret != SSL_SUCCESS)
         err_sys("can't load client cert file, check file");
 
-    ret = CyaSSL_CTX_use_PrivateKey_file(ctx, clientKey, SSL_FILETYPE_PEM);
+    ret = wolfSSL_CTX_use_PrivateKey_file(ctx, clientKey, SSL_FILETYPE_PEM);
     if (ret != SSL_SUCCESS)
         err_sys("can't load client key file, check file");
 
-    ret = CyaSSL_CTX_load_verify_locations(ctx, caCert, 0);
+    ret = wolfSSL_CTX_load_verify_locations(ctx, caCert, 0);
     if (ret != SSL_SUCCESS)
         err_sys("can't load CA cert file, check file");
 
@@ -240,8 +240,8 @@ void client_test(void)
      */
     memset((char*)&servaddr, 0, sizeof(servaddr));
     servaddr.sin_family = AF_INET;
-    servaddr.sin_port = yasslPort;
-    servaddr.sin_addr.s_addr = yasslIP;
+    servaddr.sin_port = wolfsslPort;
+    servaddr.sin_addr.s_addr = wolfsslIP;
 
     ret = connect(sockfd, &servaddr, sizeof(servaddr));
     if (ret != RTCS_OK) {
@@ -251,28 +251,28 @@ void client_test(void)
                 servaddr.sin_port);
     }
 
-    if ( (ssl = CyaSSL_new(ctx)) == NULL)
-        err_sys("CyaSSL_new failed");
+    if ( (ssl = wolfSSL_new(ctx)) == NULL)
+        err_sys("wolfSSL_new failed");
 
-    CyaSSL_set_fd(ssl, sockfd);
+    wolfSSL_set_fd(ssl, sockfd);
 
-    ret = CyaSSL_connect(ssl);
+    ret = wolfSSL_connect(ssl);
     if (ret != SSL_SUCCESS)
-        err_sys("CyaSSL_connect failed");
+        err_sys("wolfSSL_connect failed");
 
-    printf("CyaSSL_connect() ok, sending GET...\n");
+    printf("wolfSSL_connect() ok, sending GET...\n");
     msgSz = 28;
     strncpy(msg, "GET /index.html HTTP/1.0\r\n\r\n", msgSz);
-    if (CyaSSL_write(ssl, msg, msgSz) != msgSz)
-        err_sys("CyaSSL_write() failed");
+    if (wolfSSL_write(ssl, msg, msgSz) != msgSz)
+        err_sys("wolfSSL_write() failed");
 
-    input = CyaSSL_read(ssl, reply, sizeof(reply)-1);
+    input = wolfSSL_read(ssl, reply, sizeof(reply)-1);
     if (input > 0) {
         reply[input] = 0;
         printf("Server response: %s\n", reply);
 
         while (1) {
-            input = CyaSSL_read(ssl, reply, sizeof(reply)-1);
+            input = wolfSSL_read(ssl, reply, sizeof(reply)-1);
             if (input > 0) {
                 reply[input] = 0;
                 printf("%s\n", reply);
@@ -282,10 +282,10 @@ void client_test(void)
         }
     }
 
-    CyaSSL_shutdown(ssl);
-    CyaSSL_free(ssl);
-    CyaSSL_CTX_free(ctx);
-    CyaSSL_Cleanup();
+    wolfSSL_shutdown(ssl);
+    wolfSSL_free(ssl);
+    wolfSSL_CTX_free(ctx);
+    wolfSSL_Cleanup();
 }
 
 /* EOF */

+ 2 - 2
mqx/cyassl_client/Sources/main.h → mqx/wolfssl_client/Sources/main.h

@@ -13,7 +13,7 @@
 #include <spi.h>
 #include <part_mgr.h>
 
-#include <cyassl/ssl.h>
+#include <wolfssl/ssl.h>
 
 #define MAIN_TASK 	1
 
@@ -29,7 +29,7 @@ static const char* clientKey = "a:\\certs\\client-key.pem";
 
 static inline void err_sys(const char* msg)
 {
-    printf("yassl error: %s\n", msg);
+    printf("wolfssl error: %s\n", msg);
     if (msg)
         _mqx_exit(1);
 }

+ 3 - 3
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch

@@ -121,11 +121,11 @@
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_REGISTER_BOOKKEEPING" value="false"/>
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_RESTORE_WATCHPOINTS" value="true"/>
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_VARIABLE_BOOKKEEPING" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_DDRData_Debug/cyassl_client.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="cyassl_client"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_DDRData_Debug/wolfssl_client.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="wolfssl_client"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.685476017"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cyassl_client"/>
+<listEntry value="/wolfssl_client"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>

+ 3 - 3
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch

@@ -121,11 +121,11 @@
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_REGISTER_BOOKKEEPING" value="false"/>
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_RESTORE_WATCHPOINTS" value="true"/>
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_VARIABLE_BOOKKEEPING" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_DDRData_Release/cyassl_client.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="cyassl_client"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_DDRData_Release/wolfssl_client.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="wolfssl_client"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.14851640"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cyassl_client"/>
+<listEntry value="/wolfssl_client"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>

+ 0 - 0
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink


+ 3 - 3
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch

@@ -163,13 +163,13 @@
 <stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList/&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList/&gt;&#13;&#10;"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_SramData_Debug/cyassl_client.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="cyassl_client"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_SramData_Debug/wolfssl_client.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="wolfssl_client"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1358518006"/>
 <intAttribute key="org.eclipse.cdt.launch.SET_REGULAR_BREAKPOINT_TYPE_AS" value="0"/>
 <booleanAttribute key="org.eclipse.cdt.launch.USE_SET_REGULAR_BREAKPOINT_TYPE_AS" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cyassl_client"/>
+<listEntry value="/wolfssl_client"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>

+ 3 - 3
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch

@@ -163,13 +163,13 @@
 <stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList/&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList/&gt;&#13;&#10;"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_SramData_Debug/cyassl_client.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="cyassl_client"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_SramData_Debug/wolfssl_client.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="wolfssl_client"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.1358518006"/>
 <intAttribute key="org.eclipse.cdt.launch.SET_REGULAR_BREAKPOINT_TYPE_AS" value="0"/>
 <booleanAttribute key="org.eclipse.cdt.launch.USE_SET_REGULAR_BREAKPOINT_TYPE_AS" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cyassl_client"/>
+<listEntry value="/wolfssl_client"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>

+ 3 - 3
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch

@@ -150,13 +150,13 @@
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_REGISTER_BOOKKEEPING" value="false"/>
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_RESTORE_WATCHPOINTS" value="true"/>
 <booleanAttribute key="org.eclipse.cdt.launch.ENABLE_VARIABLE_BOOKKEEPING" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_SramData_Release/cyassl_client.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="cyassl_client"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="twrk70f120m_Int_Flash_SramData_Release/wolfssl_client.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="wolfssl_client"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.debug.99688619"/>
 <intAttribute key="org.eclipse.cdt.launch.SET_REGULAR_BREAKPOINT_TYPE_AS" value="0"/>
 <booleanAttribute key="org.eclipse.cdt.launch.USE_SET_REGULAR_BREAKPOINT_TYPE_AS" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cyassl_client"/>
+<listEntry value="/wolfssl_client"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>