Merge branch 'master' of github.com:cyassl/cyassl

In sniffer changed a memcpy to memmove; update for v3.3.2
fix NO_INLINE word error in misc.h, change to cyassl_word
2015-01-08 15:27:23 -08:00 · 2015-01-08 15:25:14 -08:00 · 2015-01-08 10:31:26 -07:00 · 2015-01-06 14:25:57 -08:00 · 2015-01-06 11:08:37 -08:00 · 2015-01-06 09:27:40 -08:00
1559 changed files with 124593 additions and 663054 deletions
--- a/.cproject
+++ b/.cproject
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.crt.advproject.config.lib.debug.1488646311">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.lib.debug.1488646311" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings>
-					<externalSetting>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/lib_wolfssl"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/wolfssl"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/lib_wolfssl/Debug"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/wolfssl/Debug"/>
-						<entry flags="RESOLVED" kind="libraryFile" name="lib_wolfssl" srcPrefixMapping="" srcRootPath=""/>
-						<entry flags="RESOLVED" kind="libraryFile" name="wolfssl" srcPrefixMapping="" srcRootPath=""/>
-					</externalSetting>
-				</externalSettings>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="Debug build" errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="com.crt.advproject.config.lib.debug.1488646311" name="Debug" parent="com.crt.advproject.config.lib.debug" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size &quot;lib${BuildArtifactFileName}&quot; ; # arm-none-eabi-objdump -h -S &quot;lib${BuildArtifactFileName}&quot; &gt;&quot;${BuildArtifactFileBaseName}.lss&quot;">
-					<folderInfo id="com.crt.advproject.config.lib.debug.1488646311." name="/" resourcePath="">
-						<toolChain id="com.crt.advproject.toolchain.lib.debug.1447659825" name="NXP MCU Tools" superClass="com.crt.advproject.toolchain.lib.debug">
-							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.lib.debug.1439843825" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.lib.debug"/>
-							<builder buildPath="${workspace_loc:/lib_wolfssl}/Debug" id="com.crt.advproject.builder.lib.debug.2117662219" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="com.crt.advproject.builder.lib.debug"/>
-							<tool id="com.crt.advproject.cpp.lib.debug.915465581" name="MCU C++ Compiler" superClass="com.crt.advproject.cpp.lib.debug"/>
-							<tool id="com.crt.advproject.gcc.lib.debug.1124293510" name="MCU C Compiler" superClass="com.crt.advproject.gcc.lib.debug">
-								<option id="com.crt.advproject.gcc.arch.1619558061" name="Architecture" superClass="com.crt.advproject.gcc.arch" value="com.crt.advproject.gcc.target.cm3" valueType="enumerated"/>
-								<option id="com.crt.advproject.gcc.thumb.1295094535" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/>
-								<option id="gnu.c.compiler.option.preprocessor.def.symbols.1815262015" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="__REDLIB__"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-									<listOptionValue builtIn="false" value="__CODE_RED"/>
-									<listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
-									<listOptionValue builtIn="false" value="CORE_M3"/>
-								</option>
-								<option id="gnu.c.compiler.option.misc.other.879694681" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
-								<option id="gnu.c.compiler.option.include.paths.830741839" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfssl}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfssl/IDE/LPCXPRESSO/lib_wolfssl}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_18xx/inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_board_nxp_lpcxpresso_1837/inc}&quot;"/>
-								</option>
-								<inputType id="com.crt.advproject.compiler.input.8186130" superClass="com.crt.advproject.compiler.input"/>
-							</tool>
-							<tool id="com.crt.advproject.gas.lib.debug.1058960898" name="MCU Assembler" superClass="com.crt.advproject.gas.lib.debug">
-								<option id="com.crt.advproject.gas.arch.1605272069" name="Architecture" superClass="com.crt.advproject.gas.arch" value="com.crt.advproject.gas.target.cm3" valueType="enumerated"/>
-								<option id="com.crt.advproject.gas.thumb.451376463" name="Thumb mode" superClass="com.crt.advproject.gas.thumb" value="true" valueType="boolean"/>
-								<option id="gnu.both.asm.option.flags.crt.1769879802" name="Assembler flags" superClass="gnu.both.asm.option.flags.crt" value="-c -x assembler-with-cpp -D__REDLIB__ -DDEBUG -D__CODE_RED" valueType="string"/>
-								<option id="gnu.both.asm.option.include.paths.852974162" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfssl}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfssl/IDE/LPCXPRESSO/lib_wolfssl}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_18xx/inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_board_nxp_lpcxpresso_1837/inc}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.899299031" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-								<inputType id="com.crt.advproject.assembler.input.93840004" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>
-							</tool>
-							<tool id="com.crt.advproject.ar.lib.debug.1978241722" name="MCU Archiver" superClass="com.crt.advproject.ar.lib.debug"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="src/bio.c|wolfcrypt/src/evp.c|wolfcrypt/src/misc.c|IDE/LPCXPRESSO/wolf_example|tirtos|testsuite|tests|swig|support|sslSniffer|scripts|rpm|mqx|mplabx|mcapi|m4|IDE/WORKBENCH|IDE/WIN|IDE/ROWLEY-CROSSWORKS-ARM|IDE/MYSQL|IDE/MDK-ARM|IDE/MDK5-ARM|IDE/LPCXPRESSO/wolf_demo|IDE/LPCXPRESSO/lpc_chip_18xx|IDE/LPCXPRESSO/lpc_board_nxp_lpcxpresso_1837|IDE/iOS|IDE/IAR-EWARM|examples|Debug|certs|build-aux|Backup|autom4te.cache|wolfcrypt/src/aes_asm.s|wolfcrypt/src/aes_asm.asm|wolfcrypt/user-crypto" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="lpc_board_nxp_lpcxpresso_1837;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
-					<externalSetting>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/lpc_board_nxp_lpcxpresso_1837"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/lpc_board_nxp_lpcxpresso_1837/Debug"/>
-						<entry flags="RESOLVED" kind="libraryFile" name="lpc_board_nxp_lpcxpresso_1837" srcPrefixMapping="" srcRootPath=""/>
-					</externalSetting>
-				</externalSettings>
-				<externalSettings containerId="lpc_chip_18xx;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
-					<externalSetting>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/lpc_chip_18xx"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/lpc_chip_18xx/Debug"/>
-						<entry flags="RESOLVED" kind="libraryFile" name="lpc_chip_18xx" srcPrefixMapping="" srcRootPath=""/>
-					</externalSetting>
-				</externalSettings>
-			</storageModule>
-		</cconfiguration>
-		<cconfiguration id="com.crt.advproject.config.lib.release.1867429683">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.lib.release.1867429683" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<externalSettings>
-					<externalSetting>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/lib_wolfssl"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/wolfssl"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/lib_wolfssl/Release"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/wolfssl/Release"/>
-						<entry flags="RESOLVED" kind="libraryFile" name="lib_wolfssl" srcPrefixMapping="" srcRootPath=""/>
-						<entry flags="RESOLVED" kind="libraryFile" name="wolfssl" srcPrefixMapping="" srcRootPath=""/>
-					</externalSetting>
-				</externalSettings>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="Release build" errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="com.crt.advproject.config.lib.release.1867429683" name="Release" parent="com.crt.advproject.config.lib.release" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size &quot;lib${BuildArtifactFileName}&quot; ; # arm-none-eabi-objdump -h -S &quot;lib${BuildArtifactFileName}&quot; &gt;&quot;${BuildArtifactFileBaseName}.lss&quot;">
-					<folderInfo id="com.crt.advproject.config.lib.release.1867429683." name="/" resourcePath="">
-						<toolChain id="com.crt.advproject.toolchain.lib.release.380660388" name="NXP MCU Tools" superClass="com.crt.advproject.toolchain.lib.release">
-							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.lib.release.1920417960" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.lib.release"/>
-							<builder buildPath="${workspace_loc:/lib_wolfssl}/Release" id="com.crt.advproject.builder.lib.release.1957065966" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="com.crt.advproject.builder.lib.release"/>
-							<tool id="com.crt.advproject.cpp.lib.release.991239198" name="MCU C++ Compiler" superClass="com.crt.advproject.cpp.lib.release"/>
-							<tool id="com.crt.advproject.gcc.lib.release.1950313830" name="MCU C Compiler" superClass="com.crt.advproject.gcc.lib.release">
-								<option id="com.crt.advproject.gcc.arch.971195452" name="Architecture" superClass="com.crt.advproject.gcc.arch" value="com.crt.advproject.gcc.target.cm3" valueType="enumerated"/>
-								<option id="com.crt.advproject.gcc.thumb.167176352" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/>
-								<option id="gnu.c.compiler.option.preprocessor.def.symbols.223126135" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="__REDLIB__"/>
-									<listOptionValue builtIn="false" value="NDEBUG"/>
-									<listOptionValue builtIn="false" value="__CODE_RED"/>
-									<listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
-									<listOptionValue builtIn="false" value="CORE_M3"/>
-								</option>
-								<option id="gnu.c.compiler.option.misc.other.637535653" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
-								<option id="gnu.c.compiler.option.include.paths.74265565" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/wolfssl}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/freertos}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib_wolfssl}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfssl}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/IDE/LPCXPRESSO/lib_wolfssl}&quot;"/>
-								</option>
-								<inputType id="com.crt.advproject.compiler.input.1144243950" superClass="com.crt.advproject.compiler.input"/>
-							</tool>
-							<tool id="com.crt.advproject.gas.lib.release.364778201" name="MCU Assembler" superClass="com.crt.advproject.gas.lib.release">
-								<option id="com.crt.advproject.gas.arch.95085806" name="Architecture" superClass="com.crt.advproject.gas.arch" value="com.crt.advproject.gas.target.cm3" valueType="enumerated"/>
-								<option id="com.crt.advproject.gas.thumb.220186241" name="Thumb mode" superClass="com.crt.advproject.gas.thumb" value="true" valueType="boolean"/>
-								<option id="gnu.both.asm.option.flags.crt.2139190035" name="Assembler flags" superClass="gnu.both.asm.option.flags.crt" value="-c -x assembler-with-cpp -D__REDLIB__ -DNDEBUG -D__CODE_RED" valueType="string"/>
-								<option id="gnu.both.asm.option.include.paths.1581663756" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfssl}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/IDE/LPCXPRESSO/lib_wolfssl/}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfssl}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1598169582" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-								<inputType id="com.crt.advproject.assembler.input.842191937" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>
-							</tool>
-							<tool id="com.crt.advproject.ar.lib.release.962348675" name="MCU Archiver" superClass="com.crt.advproject.ar.lib.release"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="IDE/LPCXPRESSO/wolf_example|tirtos|testsuite|tests|swig|support|sslSniffer|scripts|rpm|mqx|mplabx|mcapi|m4|IDE/WORKBENCH|IDE/WIN|IDE/ROWLEY-CROSSWORKS-ARM|IDE/MYSQL|IDE/MDK-ARM|IDE/MDK5-ARM|IDE/LPCXPRESSO/wolf_demo|IDE/LPCXPRESSO/lpc_board_nxp_lpcxpresso_1837|IDE/iOS|IDE/IAR-EWARM|examples|Debug|certs|build-aux|Backup|autom4te.cache|wolfcrypt/src/aes_asm.s|wolfcrypt/src/aes_asm.asm|wolfcrypt/user-crypto" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="lib_wolfssl.com.crt.advproject.projecttype.lib.158532356" name="Static Library" projectType="com.crt.advproject.projecttype.lib"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="com.crt.config">
-		<projectStorage>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;TargetConfig&gt;
-&lt;Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC18S37" property_count="5" version="70200"/&gt;
-&lt;infoList vendor="NXP"&gt;&lt;info chip="LPC18S37" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC18S37" resetscript="LPC18LPC43InternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"&gt;&lt;chip&gt;&lt;name&gt;LPC18S37&lt;/name&gt;
-&lt;family&gt;LPC18xx&lt;/family&gt;
-&lt;vendor&gt;NXP (formerly Philips)&lt;/vendor&gt;
-&lt;reset board="None" core="Real" sys="Real"/&gt;
-&lt;clock changeable="TRUE" freq="20MHz" is_accurate="TRUE"/&gt;
-&lt;memory can_program="true" id="Flash" is_ro="true" type="Flash"/&gt;
-&lt;memory id="RAM" type="RAM"/&gt;
-&lt;memory id="Periph" is_volatile="true" type="Peripheral"/&gt;
-&lt;memoryInstance derived_from="Flash" id="MFlashA512" location="0x1a000000" size="0x80000"/&gt;
-&lt;memoryInstance derived_from="Flash" id="MFlashB512" location="0x1b000000" size="0x80000"/&gt;
-&lt;memoryInstance derived_from="RAM" id="RamLoc32" location="0x10000000" size="0x8000"/&gt;
-&lt;memoryInstance derived_from="RAM" id="RamLoc40" location="0x10080000" size="0xa000"/&gt;
-&lt;memoryInstance derived_from="RAM" id="RamAHB32" location="0x20000000" size="0x8000"/&gt;
-&lt;memoryInstance derived_from="RAM" id="RamAHB16" location="0x20008000" size="0x4000"/&gt;
-&lt;memoryInstance derived_from="RAM" id="RamAHB_ETB16" location="0x2000c000" size="0x4000"/&gt;
-&lt;prog_flash blocksz="0x2000" location="0x1a000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/&gt;
-&lt;prog_flash blocksz="0x10000" location="0x1a010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/&gt;
-&lt;prog_flash blocksz="0x2000" location="0x1b000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/&gt;
-&lt;prog_flash blocksz="0x10000" location="0x1b010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/&gt;
-&lt;peripheralInstance derived_from="V7M_MPU" id="MPU" location="0xe000ed90"/&gt;
-&lt;peripheralInstance derived_from="V7M_NVIC" id="NVIC" location="0xe000e000"/&gt;
-&lt;peripheralInstance derived_from="V7M_DCR" id="DCR" location="0xe000edf0"/&gt;
-&lt;peripheralInstance derived_from="V7M_ITM" id="ITM" location="0xe0000000"/&gt;
-&lt;peripheralInstance derived_from="SCT" id="SCT" location="0x40000000"/&gt;
-&lt;peripheralInstance derived_from="GPDMA" id="GPDMA" location="0x40002000"/&gt;
-&lt;peripheralInstance derived_from="SPIFI" id="SPIFI" location="0x40003000"/&gt;
-&lt;peripheralInstance derived_from="SDMMC" id="SDMMC" location="0x40004000"/&gt;
-&lt;peripheralInstance derived_from="EMC" id="EMC" location="0x40005000"/&gt;
-&lt;peripheralInstance derived_from="USB0" id="USB0" location="0x40006000"/&gt;
-&lt;peripheralInstance derived_from="USB1" id="USB1" location="0x40007000"/&gt;
-&lt;peripheralInstance derived_from="EEPROM" id="EEPROM" location="0x4000e000"/&gt;
-&lt;peripheralInstance derived_from="ETHERNET" id="ETHERNET" location="0x40010000"/&gt;
-&lt;peripheralInstance derived_from="ATIMER" id="ATIMER" location="0x40040000"/&gt;
-&lt;peripheralInstance derived_from="REGFILE" id="REGFILE" location="0x40041000"/&gt;
-&lt;peripheralInstance derived_from="PMC" id="PMC" location="0x40042000"/&gt;
-&lt;peripheralInstance derived_from="CREG" id="CREG" location="0x40043000"/&gt;
-&lt;peripheralInstance derived_from="EVENTROUTER" id="EVENTROUTER" location="0x40044000"/&gt;
-&lt;peripheralInstance derived_from="RTC" id="RTC" location="0x40046000"/&gt;
-&lt;peripheralInstance derived_from="CGU" id="CGU" location="0x40050000"/&gt;
-&lt;peripheralInstance derived_from="CCU1" id="CCU1" location="0x40051000"/&gt;
-&lt;peripheralInstance derived_from="CCU2" id="CCU2" location="0x40052000"/&gt;
-&lt;peripheralInstance derived_from="RGU" id="RGU" location="0x40053000"/&gt;
-&lt;peripheralInstance derived_from="WWDT" id="WWDT" location="0x40080000"/&gt;
-&lt;peripheralInstance derived_from="USART0" id="USART0" location="0x40081000"/&gt;
-&lt;peripheralInstance derived_from="USART2" id="USART2" location="0x400c1000"/&gt;
-&lt;peripheralInstance derived_from="USART3" id="USART3" location="0x400c2000"/&gt;
-&lt;peripheralInstance derived_from="UART1" id="UART1" location="0x40082000"/&gt;
-&lt;peripheralInstance derived_from="SSP0" id="SSP0" location="0x40083000"/&gt;
-&lt;peripheralInstance derived_from="SSP1" id="SSP1" location="0x400c5000"/&gt;
-&lt;peripheralInstance derived_from="TIMER0" id="TIMER0" location="0x40084000"/&gt;
-&lt;peripheralInstance derived_from="TIMER1" id="TIMER1" location="0x40085000"/&gt;
-&lt;peripheralInstance derived_from="TIMER2" id="TIMER2" location="0x400c3000"/&gt;
-&lt;peripheralInstance derived_from="TIMER3" id="TIMER3" location="0x400c4000"/&gt;
-&lt;peripheralInstance derived_from="SCU" id="SCU" location="0x40086000"/&gt;
-&lt;peripheralInstance derived_from="GPIO-PIN-INT" id="GPIO-PIN-INT" location="0x40087000"/&gt;
-&lt;peripheralInstance derived_from="GPIO-GROUP-INT0" id="GPIO-GROUP-INT0" location="0x40088000"/&gt;
-&lt;peripheralInstance derived_from="GPIO-GROUP-INT1" id="GPIO-GROUP-INT1" location="0x40089000"/&gt;
-&lt;peripheralInstance derived_from="MCPWM" id="MCPWM" location="0x400a0000"/&gt;
-&lt;peripheralInstance derived_from="I2C0" id="I2C0" location="0x400a1000"/&gt;
-&lt;peripheralInstance derived_from="I2C1" id="I2C1" location="0x400e0000"/&gt;
-&lt;peripheralInstance derived_from="I2S0" id="I2S0" location="0x400a2000"/&gt;
-&lt;peripheralInstance derived_from="I2S1" id="I2S1" location="0x400a3000"/&gt;
-&lt;peripheralInstance derived_from="C-CAN1" id="C-CAN1" location="0x400a4000"/&gt;
-&lt;peripheralInstance derived_from="RITIMER" id="RITIMER" location="0x400c0000"/&gt;
-&lt;peripheralInstance derived_from="QEI" id="QEI" location="0x400c6000"/&gt;
-&lt;peripheralInstance derived_from="GIMA" id="GIMA" location="0x400c7000"/&gt;
-&lt;peripheralInstance derived_from="DAC" id="DAC" location="0x400e1000"/&gt;
-&lt;peripheralInstance derived_from="C-CAN0" id="C-CAN0" location="0x400e2000"/&gt;
-&lt;peripheralInstance derived_from="ADC0" id="ADC0" location="0x400e3000"/&gt;
-&lt;peripheralInstance derived_from="ADC1" id="ADC1" location="0x400e4000"/&gt;
-&lt;peripheralInstance derived_from="GPIO-PORT" id="GPIO-PORT" location="0x400f4000"/&gt;
-&lt;/chip&gt;
-&lt;processor&gt;&lt;name gcc_name="cortex-m3"&gt;Cortex-M3&lt;/name&gt;
-&lt;family&gt;Cortex-M&lt;/family&gt;
-&lt;/processor&gt;
-&lt;link href="nxp_lpc18xx_peripheral.xme" show="embed" type="simple"/&gt;
-&lt;/info&gt;
-&lt;/infoList&gt;
-&lt;/TargetConfig&gt;</projectStorage>
-	</storageModule>
-	<storageModule moduleId="refreshScope"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.crt.advproject.config.lib.release.1867429683;com.crt.advproject.config.lib.release.1867429683.;com.crt.advproject.gcc.lib.release.1950313830;com.crt.advproject.compiler.input.1144243950">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.crt.advproject.config.lib.release.1867429683;com.crt.advproject.config.lib.release.1867429683.;com.crt.advproject.gas.lib.release.364778201;com.crt.advproject.assembler.input.842191937">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.crt.advproject.config.lib.debug.1488646311;com.crt.advproject.config.lib.debug.1488646311.;com.crt.advproject.gas.lib.debug.1058960898;com.crt.advproject.assembler.input.93840004">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.crt.advproject.config.lib.debug.1488646311;com.crt.advproject.config.lib.debug.1488646311.;com.crt.advproject.gcc.lib.debug.1124293510;com.crt.advproject.compiler.input.8186130">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.crt.advproject.GCCManagedMakePerProjectProfile"/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-</cproject>
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-ctaocrypt/src/src/
 *.swp
 *.lo
 *.la
@@ -9,25 +8,20 @@ ctaocrypt/src/src/
 *.cache
 .dirstamp
 *.user
-configure
-config.*
+config*
 *Debug/
 *Release/
 *.ncb
 *.suo
-*.sdf
-*.opensdf
-ipch/
 build-aux/
 rpm/spec
-*.rpm
 stamp-h
 cyassl/options.h
-wolfssl/options.h
 libtool.m4
 aclocal.m4
 aminclude.am
 lt*.m4
+INSTALL
 Makefile.in
 Makefile
 depcomp
@@ -36,39 +30,16 @@ libtool
 tags
 .tags*
 cyassl-config
-wolfssl-config
 cyassl.sublime*
-fips.h
 fips.c
 fips_test.c
 fips
-wolfcrypt_first.c
-wolfcrypt_last.c
-selftest.c
-fipsv2.c
-src/async.c
-wolfssl/async.h
-wolfcrypt/src/async.c
-wolfssl/wolfcrypt/async.h
-wolfcrypt/src/port/intel/quickassist.c
-wolfcrypt/src/port/intel/quickassist_mem.c
-wolfcrypt/src/port/cavium/cavium_nitrox.c
-wolfssl/wolfcrypt/port/intel/quickassist.h
-wolfssl/wolfcrypt/port/intel/quickassist_mem.h
-wolfssl/wolfcrypt/port/cavium/cavium_nitrox.h
 ctaocrypt/benchmark/benchmark
 ctaocrypt/test/testctaocrypt
-wolfcrypt/benchmark/benchmark
-wolfcrypt/test/testwolfcrypt
-examples/benchmark/tls_bench
 examples/client/client
 examples/echoclient/echoclient
 examples/echoserver/echoserver
 examples/server/server
-examples/sctp/sctp-server
-examples/sctp/sctp-server-dtls
-examples/sctp/sctp-client
-examples/sctp/sctp-client-dtls
 server_ready
 snifftest
 output
@@ -77,7 +48,6 @@ testsuite/testsuite
 tests/unit
 testsuite/testsuite.test
 tests/unit.test
-tests/bio_write_test.txt
 testsuite/*.der
 testsuite/*.pem
 testsuite/*.raw
@@ -87,102 +57,20 @@ certecc.der
 certecc.pem
 othercert.der
 othercert.pem
-certeccrsa.der
-certeccrsa.pem
 ntru-cert.der
 ntru-cert.pem
 ntru-key.raw
 key.der
 key.pem
-ecc-public-key.der
-ecc-key-pkcs8.der
 ecc-key.der
 ecc-key.pem
 certreq.der
 certreq.pem
 pkcs7cert.der
-pkcs7authEnvelopedDataAES128GCM.der
-pkcs7authEnvelopedDataAES128GCM_ECDH_SHA1KDF.der
-pkcs7authEnvelopedDataAES128GCM_KEKRI.der
-pkcs7authEnvelopedDataAES128GCM_ORI.der
-pkcs7authEnvelopedDataAES128GCM_PWRI.der
-pkcs7authEnvelopedDataAES192GCM.der
-pkcs7authEnvelopedDataAES256GCM.der
-pkcs7authEnvelopedDataAES256GCM_ECDH_SHA256KDF.der
-pkcs7authEnvelopedDataAES256GCM_ECDH_SHA256KDF_authAttribs.der
-pkcs7authEnvelopedDataAES256GCM_ECDH_SHA256KDF_bothAttribs.der
-pkcs7authEnvelopedDataAES256GCM_ECDH_SHA256KDF_fw_bothAttribs.der
-pkcs7authEnvelopedDataAES256GCM_ECDH_SHA256KDF_unauthAttribs.der
-pkcs7authEnvelopedDataAES256GCM_ECDH_SHA512KDF.der
-pkcs7authEnvelopedDataAES256GCM_ECDH_SHA512KDF_ukm.der
-pkcs7authEnvelopedDataAES256GCM_firmwarePkgData.der
-pkcs7authEnvelopedDataAES256GCM_IANDS.der
-pkcs7authEnvelopedDataAES256GCM_SKID.der
-pkcs7compressedData_data_zlib.der
-pkcs7compressedData_firmwarePkgData_zlib.der
-pkcs7encryptedDataAES128CBC.der
-pkcs7encryptedDataAES192CBC.der
-pkcs7encryptedDataAES256CBC.der
-pkcs7encryptedDataAES256CBC_attribs.der
-pkcs7encryptedDataAES256CBC_firmwarePkgData.der
-pkcs7encryptedDataAES256CBC_multi_attribs.der
-pkcs7encryptedDataDES.der
-pkcs7encryptedDataDES3.der
-pkcs7envelopedDataAES128CBC.der
-pkcs7envelopedDataAES128CBC_ECDH_SHA1KDF.der
-pkcs7envelopedDataAES128CBC_KEKRI.der
-pkcs7envelopedDataAES128CBC_PWRI.der
-pkcs7envelopedDataAES128CBC_ORI.der
-pkcs7envelopedDataAES192CBC.der
-pkcs7envelopedDataAES256CBC.der
-pkcs7envelopedDataAES256CBC_IANDS.der
-pkcs7envelopedDataAES256CBC_SKID.der
-pkcs7envelopedDataAES256CBC_ECDH_SHA256KDF.der
-pkcs7envelopedDataAES256CBC_ECDH_SHA512KDF.der
-pkcs7envelopedDataAES256CBC_ECDH_SHA512KDF_ukm.der
-pkcs7envelopedDataDES3.der
-pkcs7signedData_ECDSA_SHA224.der
-pkcs7signedData_ECDSA_SHA256_custom_contentType.der
-pkcs7signedData_ECDSA_SHA256.der
-pkcs7signedData_ECDSA_SHA256_firmwarePkgData.der
-pkcs7signedData_ECDSA_SHA256_SKID.der
-pkcs7signedData_ECDSA_SHA384.der
-pkcs7signedData_ECDSA_SHA512.der
-pkcs7signedData_ECDSA_SHA.der
-pkcs7signedData_ECDSA_SHA_noattr.der
-pkcs7signedData_RSA_SHA224.der
-pkcs7signedData_RSA_SHA256_custom_contentType.der
-pkcs7signedData_RSA_SHA256.der
-pkcs7signedData_RSA_SHA256_firmwarePkgData.der
-pkcs7signedData_RSA_SHA256_SKID.der
-pkcs7signedData_RSA_SHA256_with_ca_cert.der
-pkcs7signedData_RSA_SHA256_detachedSig.der
-pkcs7signedData_RSA_SHA384.der
-pkcs7signedData_RSA_SHA512.der
-pkcs7signedData_RSA_SHA.der
-pkcs7signedData_RSA_SHA_noattr.der
-pkcs7signedCompressedFirmwarePkgData_ECDSA_SHA256.der
-pkcs7signedCompressedFirmwarePkgData_ECDSA_SHA256_noattr.der
-pkcs7signedCompressedFirmwarePkgData_RSA_SHA256.der
-pkcs7signedCompressedFirmwarePkgData_RSA_SHA256_noattr.der
-pkcs7signedEncryptedFirmwarePkgData_ECDSA_SHA256.der
-pkcs7signedEncryptedFirmwarePkgData_ECDSA_SHA256_noattr.der
-pkcs7signedEncryptedFirmwarePkgData_RSA_SHA256.der
-pkcs7signedEncryptedFirmwarePkgData_RSA_SHA256_noattr.der
-pkcs7signedFirmwarePkgData_ECDSA_SHA256.der
-pkcs7signedFirmwarePkgData_ECDSA_SHA256_SKID.der
-pkcs7signedFirmwarePkgData_ECDSA_SHA256_noattr.der
-pkcs7signedFirmwarePkgData_RSA_SHA256.der
-pkcs7signedFirmwarePkgData_RSA_SHA256_SKID.der
-pkcs7signedFirmwarePkgData_RSA_SHA256_noattr.der
-pkcs7signedFirmwarePkgData_RSA_SHA256_with_ca_cert.der
-pkcs7signedEncryptedCompressedFirmwarePkgData_ECDSA_SHA256.der
-pkcs7signedEncryptedCompressedFirmwarePkgData_ECDSA_SHA256_noattr.der
-pkcs7signedEncryptedCompressedFirmwarePkgData_RSA_SHA256.der
-pkcs7signedEncryptedCompressedFirmwarePkgData_RSA_SHA256_noattr.der
+pkcs7signedData.der
+pkcs7envelopedData.der
 diff
 sslSniffer/sslSnifferTest/tracefile.txt
-tracefile.txt
 *.gz
 *.zip
 *.bak
@@ -200,16 +88,11 @@ autoscan.log
 TAGS
 .DS_Store
 support/cyassl.pc
-support/wolfssl.pc
 cyassl/ctaocrypt/stamp-h1
 swig/_cyassl.so
-swig/_wolfssl.so
 swig/cyassl.py
-swig/wolfssl.py
 swig/cyassl.pyc
-swig/wolfssl.pyc
 swig/cyassl_wrap.c
-swig/wolfssl_wrap.c
 stamp-h1
 clang_output_*
 internal.plist
@@ -217,37 +100,30 @@ cov-int
 cyassl.tgz
 *.log
 *.trs
-IDE/MDK-ARM/Projects/
-IDE/MDK-ARM/STM32F2xx_StdPeriph_Lib/inc
-IDE/MDK-ARM/STM32F2xx_StdPeriph_Lib/src
-IDE/MDK-ARM/LPC43xx/Drivers/
-IDE/MDK-ARM/LPC43xx/LPC43xx/
+IDE\MDK-ARM\Projects/
+IDE\MDK-ARM\STM32F2xx_StdPeriph_Lib/inc
+IDE\MDK-ARM\STM32F2xx_StdPeriph_Lib/src
+IDE\MDK-ARM\LPC43xx\Drivers/
+IDE\MDK-ARM\LPC43xx\LPC43xx/
 *.gcno
 *.gcda
 *.gcov

 # MPLAB Generated Files (OS X)
-mcapi/wolfcrypt_mcapi.X/nbproject/Makefile-*
-mcapi/wolfcrypt_mcapi.X/nbproject/Package-default.bash
-mcapi/wolfcrypt_test.X/nbproject/Makefile-*
-mcapi/wolfcrypt_test.X/nbproject/Package-default.bash
-mcapi/wolfssl.X/nbproject/Makefile-*
-mcapi/wolfssl.X/nbproject/Package-default.bash
+mcapi/ctaocrypt_mcapi.X/nbproject/Makefile-*
+mcapi/ctaocrypt_mcapi.X/nbproject/Package-default.bash
+mcapi/ctaocrypt_test.X/nbproject/Makefile-*
+mcapi/ctaocrypt_test.X/nbproject/Package-default.bash
+mcapi/cyassl.X/nbproject/Makefile-*
+mcapi/cyassl.X/nbproject/Package-default.bash
 mcapi/zlib.X/nbproject/Makefile-*
 mcapi/zlib.X/nbproject/Package-default.bash
-mplabx/wolfcrypt_benchmark.X/nbproject/Makefile-*
-mplabx/wolfcrypt_benchmark.X/nbproject/Package-default.bash
-mplabx/wolfcrypt_test.X/nbproject/Makefile-*
-mplabx/wolfcrypt_test.X/nbproject/Package-default.bash
-mplabx/wolfssl.X/nbproject/Makefile-*
-mplabx/wolfssl.X/nbproject/Package-default.bash
-mplabx/wolfssl.X/nbproject/private
-mplabx/wolfcrypt_test.X/nbproject/private
-mplabx/wolfcrypt_benchmark.X/nbproject/private
-mplabx/wolfssl.X/dist/default/
-mplabx/wolfcrypt_test.X/dist/default/
-mplabx/wolfcrypt_benchmark.X/dist/default/
-*.dSYM
+mplabx/ctaocrypt_benchmark.X/nbproject/Makefile-*
+mplabx/ctaocrypt_benchmark.X/nbproject/Package-default.bash
+mplabx/ctaocrypt_test.X/nbproject/Makefile-*
+mplabx/ctaocrypt_test.X/nbproject/Package-default.bash
+mplabx/cyassl.X/nbproject/Makefile-*
+mplabx/cyassl.X/nbproject/Package-default.bash

 # Vagrant folder
 .vagrant/
@@ -264,60 +140,3 @@ mqx/wolfcrypt_test/SaAnalysispointsManager.apconfig
 mqx/wolfcrypt_benchmark/.settings
 mqx/wolfcrypt_benchmark/.cwGeneratedFileSetLog
 mqx/wolfcrypt_benchmark/SaAnalysispointsManager.apconfig
-
-# User Crypto example build
-wolfcrypt/user-crypto/aclocal.m4
-wolfcrypt/user-crypto/config.guess
-wolfcrypt/user-crypto/autom4te.cache
-wolfcrypt/user-crypto/config.log
-wolfcrypt/user-crypto/config.status
-wolfcrypt/user-crypto/config.sub
-wolfcrypt/user-crypto/depcomp
-wolfcrypt/user-crypto/install-sh
-wolfcrypt/user-crypto/libtool
-wolfcrypt/user-crypto/ltmain.sh
-wolfcrypt/user-crypto/m4
-wolfcrypt/user-crypto/missing
-wolfcrypt/user-crypto/Makefile.in
-wolfcrypt/user-crypto/lib/libusercrypto.*
-*.hzs
-
-# wolfSSL CSharp wrapper
-wrapper/CSharp/x64/
-
-# Visual Studio Code Workspace Files
-*.vscode
-*.userprefs
-*.exe
-*.dll
-.vs
-Backup
-UpgradeLog.htm
-*.aps
-*.VC.db
-
-IDE/INTIME-RTOS/Debug_*
-IDE/VS-ARM/.vs
-
-# Hexiwear
-IDE/HEXIWEAR/wolfSSL_HW/Debug
-
-# Linux-SGX
-IDE/LINUX-SGX/*.a
-
-# Binaries
-wolfcrypt/src/port/intel/qat_test
-/mplabx/wolfssl.X/dist/default/
-/mplabx/wolfcrypt_test.X/dist/default/
-
-# Arduino Generated Files
-/IDE/ARDUINO/wolfSSL
-scripts/memtest.txt
-
-# Doxygen generated files
-doc/doxygen_warnings
-doc/html
-doc/pdf
-
-# XCODE Index
-IDE/XCODE/Index
--- a/.project
+++ b/.project
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>wolfssl</name>
-	<comment></comment>
-	<projects>
-		<project>lpc_board_nxp_lpcxpresso_1837</project>
-		<project>lpc_chip_18xx</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
--- a/IDE/Renesas/e2studio/Projects/wolfssl/src/.gitkeep
+++ b/IDE/Renesas/e2studio/Projects/wolfssl/src/.gitkeep
--- a/ChangeLog.md
+++ b/ChangeLog.md
--- a/IDE/ARDUINO/README.md
+++ b/IDE/ARDUINO/README.md
@@ -1,28 +0,0 @@
-### wolfSSL with Arduino
-
-##### Reformatting wolfSSL as a compatible Arduino Library
-This is a shell script that will re-organize the wolfSSL library to be 
-compatible with Arduino projects. The Arduino IDE requires a library's source
-files to be in the library's root directory with a header file in the name of 
-the library. This script moves all src/ files to the `IDE/ARDUINO/wolfSSL`
-directory and creates a stub header file called `wolfssl.h`.
-
-Step 1: To configure wolfSSL with Arduino, enter the following from within the
-wolfssl/IDE/ARDUINO directory:
-
-        `./wolfssl-arduino.sh`
-
-
-Step 2: Edit `<wolfssl-root>/IDE/ARDUINO/wolfSSL/wolfssl/wolfcrypt/settings.h` uncomment the define for `WOLFSSL_ARDUINO`
-If building for Intel Galileo platform also uncomment the define for `INTEL_GALILEO`.
-
-##### Including wolfSSL in Arduino Libraries (for Arduino version 1.6.6)
-
-1. In the Arduino IDE:
-    - In `Sketch -> Include Library -> Add .ZIP Library...` and choose the
-        `IDE/ARDUNIO/wolfSSL` folder.
-    - In `Sketch -> Include Library` choose wolfSSL.
-
-2. Open an example Arduino sketch for wolfSSL:
-	- wolfSSL Client INO sketch: `sketches/wolfssl_client/wolfssl_client.ino`
-	- wolfSSL Server INO sketch: `sketches/wolfssl_server/wolfssl_server.ino`
--- a/IDE/ARDUINO/include.am
+++ b/IDE/ARDUINO/include.am
@@ -1,8 +0,0 @@
-# vim:ft=automake
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-EXTRA_DIST+= IDE/ARDUINO/README.md
-EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino
-EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino
-EXTRA_DIST+= IDE/ARDUINO/wolfssl-arduino.sh
--- a/IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino
+++ b/IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino
@@ -1,156 +0,0 @@
-/* wolfssl_client.ino
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#include <wolfssl.h>
-#include <wolfssl/ssl.h>
-#include <Ethernet.h>
-
-const char host[] = "192.168.1.148"; // server to connect to
-const int port = 11111; // port on server to connect to
-
-int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx);
-int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx);
-int reconnect = 10;
-
-EthernetClient client;
-
-WOLFSSL_CTX* ctx = NULL;
-WOLFSSL* ssl = NULL;
-
-void setup() {
-  WOLFSSL_METHOD* method;
-
-  Serial.begin(9600);
-
-  method = wolfTLSv1_2_client_method();
-  if (method == NULL) {
-    Serial.println("unable to get method");
-    return;
-  }
-  ctx = wolfSSL_CTX_new(method);
-  if (ctx == NULL) {
-    Serial.println("unable to get ctx");
-    return;
-  }
-  // initialize wolfSSL using callback functions
-  wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
-  wolfSSL_SetIOSend(ctx, EthernetSend);
-  wolfSSL_SetIORecv(ctx, EthernetReceive);
-  
-  return;
-}
-
-int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx) {
-  int sent = 0;
-
-  sent = client.write((byte*)msg, sz);
-
-  return sent;
-}
-
-int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx) {
-  int ret = 0;
-
-  while (client.available() > 0 && ret < sz) {
-    reply[ret++] = client.read();
-  }
-
-  return ret;
-}
-
-void loop() {
-  int err            = 0;
-  int input          = 0;
-  int total_input    = 0;
-  char msg[32]       = "hello wolfssl!";
-  int msgSz          = (int)strlen(msg);
-  char errBuf[80];
-  char reply[80];
-  const char* cipherName;
-    
-  if (reconnect) {
-    reconnect--;
-    
-    if (client.connect(host, port)) {
-
-      Serial.print("Connected to ");
-      Serial.println(host);
-
-      ssl = wolfSSL_new(ctx);
-      if (ssl == NULL) {
-        Serial.println("Unable to allocate SSL object");
-        return;
-      }
-
-      err = wolfSSL_connect(ssl);
-      if (err != WOLFSSL_SUCCESS) {
-        err = wolfSSL_get_error(ssl, 0);
-        wolfSSL_ERR_error_string(err, errBuf);
-        Serial.print("TLS Connect Error: ");
-        Serial.println(errBuf);
-      }
-
-      Serial.print("SSL version is ");
-      Serial.println(wolfSSL_get_version(ssl));
-      
-      cipherName = wolfSSL_get_cipher(ssl);
-      Serial.print("SSL cipher suite is ");
-      Serial.println(cipherName);
-
-      if ((wolfSSL_write(ssl, msg, msgSz)) == msgSz) {
-        
-        Serial.print("Server response: ");
-        while (client.available() || wolfSSL_pending(ssl)) {
-          input = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
-          total_input += input;
-          if (input < 0) {
-            err = wolfSSL_get_error(ssl, 0);
-            wolfSSL_ERR_error_string(err, errBuf);
-            Serial.print("TLS Read Error: ");
-            Serial.println(errBuf);
-            break;
-          } else if (input > 0) {
-            reply[input] = '\0';
-            Serial.print(reply);
-          } else {
-            Serial.println();
-          }
-        } 
-      } else {
-        err = wolfSSL_get_error(ssl, 0);
-        wolfSSL_ERR_error_string(err, errBuf);
-        Serial.print("TLS Write Error: ");
-        Serial.println(errBuf);
-      }
-      
-      wolfSSL_shutdown(ssl);
-      wolfSSL_free(ssl);
-
-      client.stop();
-      Serial.println("Connection complete.");
-      reconnect = 0;
-    } else {
-      Serial.println("Trying to reconnect...");
-    }
-  }
-  delay(1000);
-}
--- a/IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino
+++ b/IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino
@@ -1,176 +0,0 @@
-/* wolfssl_server.ino
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#include <wolfssl.h>
-#include <wolfssl/ssl.h>
-#include <Ethernet.h>
-
-#define USE_CERT_BUFFERS_256
-#include <wolfssl/certs_test.h>
-
-#ifdef NO_WOLFSSL_SERVER
-  #error Please undefine NO_WOLFSSL_SERVER for this example
-#endif
-
-const int port = 11111; // port to listen on
-
-int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx);
-int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx);
-
-EthernetServer server(port);
-EthernetClient client;
-
-WOLFSSL_CTX* ctx = NULL;
-WOLFSSL* ssl = NULL;
-
-void setup() {
-  int err;
-  WOLFSSL_METHOD* method;
-
-  Serial.begin(9600);
-
-  method = wolfTLSv1_2_server_method();
-  if (method == NULL) {
-    Serial.println("unable to get method");
-    return;
-  }
-  ctx = wolfSSL_CTX_new(method);
-  if (ctx == NULL) {
-    Serial.println("unable to get ctx");
-    return;
-  }
-
-  // initialize wolfSSL using callback functions
-  wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
-  wolfSSL_SetIOSend(ctx, EthernetSend);
-  wolfSSL_SetIORecv(ctx, EthernetReceive);
-
-  // setup the private key and certificate
-  err = wolfSSL_CTX_use_PrivateKey_buffer(ctx, ecc_key_der_256, 
-    sizeof_ecc_key_der_256, WOLFSSL_FILETYPE_ASN1);
-  if (err != WOLFSSL_SUCCESS) {
-    Serial.println("error setting key");
-    return;
-  }
-  err = wolfSSL_CTX_use_certificate_buffer(ctx, serv_ecc_der_256, 
-    sizeof_serv_ecc_der_256, WOLFSSL_FILETYPE_ASN1);
-  if (err != WOLFSSL_SUCCESS) {
-    Serial.println("error setting certificate");
-    return;
-  }
-
-  // Start the server
-  server.begin();
-  
-  return;
-}
-
-int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx) {
-  int sent = 0;
-
-  sent = client.write((byte*)msg, sz);
-
-  return sent;
-}
-
-int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx) {
-  int ret = 0;
-
-  while (client.available() > 0 && ret < sz) {
-    reply[ret++] = client.read();
-  }
-
-  return ret;
-}
-
-void loop() {
-  int err = 0;
-  int input = 0;
-  char errBuf[80];
-  char reply[80];
-  int replySz = 0;
-  const char* cipherName;
-
-  // Listen for incoming client requests.
-  client = server.available();
-  if (!client) {
-    return;
-  }
-
-  if (client.connected()) {
-
-    Serial.println("Client connected");
-
-    ssl = wolfSSL_new(ctx);
-    if (ssl == NULL) {
-      Serial.println("Unable to allocate SSL object");
-      return;
-    }
-
-    err = wolfSSL_accept(ssl);
-    if (err != WOLFSSL_SUCCESS) {
-      err = wolfSSL_get_error(ssl, 0);
-      wolfSSL_ERR_error_string(err, errBuf);
-      Serial.print("TLS Accept Error: ");
-      Serial.println(errBuf);
-    }
-
-    Serial.print("SSL version is ");
-    Serial.println(wolfSSL_get_version(ssl));
-    
-    cipherName = wolfSSL_get_cipher(ssl);
-    Serial.print("SSL cipher suite is ");
-    Serial.println(cipherName);
-
-    Serial.print("Server Read: ");
-    while (client.available() || wolfSSL_pending(ssl)) {
-      input = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
-      if (input < 0) {
-        err = wolfSSL_get_error(ssl, 0);
-        wolfSSL_ERR_error_string(err, errBuf);
-        Serial.print("TLS Read Error: ");
-        Serial.println(errBuf);
-        break;
-      } else if (input > 0) {
-        replySz = input;
-        reply[input] = '\0';
-        Serial.print(reply);
-      } else {
-        Serial.println();
-      }
-    }
-
-    // echo data
-    if ((wolfSSL_write(ssl, reply, replySz)) != replySz) {
-      err = wolfSSL_get_error(ssl, 0);
-      wolfSSL_ERR_error_string(err, errBuf);
-      Serial.print("TLS Write Error: ");
-      Serial.println(errBuf);
-    }
-    
-    wolfSSL_shutdown(ssl);
-    wolfSSL_free(ssl);
-  }
-
-  client.stop();
-  Serial.println("Connection complete");
-}
--- a/IDE/ARDUINO/wolfssl-arduino.sh
+++ b/IDE/ARDUINO/wolfssl-arduino.sh
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# this script will reformat the wolfSSL source code to be compatible with
-# an Arduino project
-# run as bash ./wolfssl-arduino.sh
-
-DIR=${PWD##*/}
-
-if [ "$DIR" = "ARDUINO" ]; then
-	rm -rf wolfSSL
-	mkdir wolfSSL
-
-    cp ../../src/*.c ./wolfSSL
-    cp ../../wolfcrypt/src/*.c ./wolfSSL
-
-    mkdir wolfSSL/wolfssl
-    cp ../../wolfssl/*.h ./wolfSSL/wolfssl
-    mkdir wolfSSL/wolfssl/wolfcrypt
-    cp ../../wolfssl/wolfcrypt/*.h ./wolfSSL/wolfssl/wolfcrypt
-
-    # support misc.c as include in wolfcrypt/src
-    mkdir ./wolfSSL/wolfcrypt
-    mkdir ./wolfSSL/wolfcrypt/src
-    cp ../../wolfcrypt/src/misc.c ./wolfSSL/wolfcrypt/src
-
-    # put bio and evp as includes
-    mv ./wolfSSL/bio.c ./wolfSSL/wolfssl
-	mv ./wolfSSL/evp.c ./wolfSSL/wolfssl
-
-    echo "/* Generated wolfSSL header file for Arduino */" >> ./wolfSSL/wolfssl.h
-    echo "#include <wolfssl/wolfcrypt/settings.h>" >> ./wolfSSL/wolfssl.h
-    echo "#include <wolfssl/ssl.h>" >> ./wolfSSL/wolfssl.h
-else
-    echo "ERROR: You must be in the IDE/ARDUINO directory to run this script"
-fi
--- a/IDE/CSBENCH/.cproject
+++ b/IDE/CSBENCH/.cproject
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.config.gnu.mentor.nucleus.lib.debug.16169494">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mentor.nucleus.lib.debug.16169494" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings>
-					<externalSetting>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/wolfcrypt"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/wolfcrypt/Debug"/>
-						<entry flags="RESOLVED" kind="libraryFile" name="wolfssl" srcPrefixMapping="" srcRootPath=""/>
-					</externalSetting>
-				</externalSettings>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="com.mentor.embedded.toolchains.core.nucleus.FuseErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="wolfssl" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="cs-rm -rf" description="" id="cdt.managedbuild.config.gnu.mentor.nucleus.lib.debug.16169494" name="Debug" parent="cdt.managedbuild.config.gnu.mentor.nucleus.lib.debug">
-					<folderInfo id="cdt.managedbuild.config.gnu.mentor.nucleus.lib.debug.16169494." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.mentor.nucleus.lib.debug.223487397" name="Sourcery CodeBench for Nucleus" superClass="cdt.managedbuild.toolchain.gnu.mentor.nucleus.lib.debug">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.mentor.nucleus.1602489785" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.mentor.nucleus"/>
-							<builder buildPath="${workspace_loc:/wolfcrypt}/Debug" id="cdt.managedbuild.builder.gnu.mentor.nucleus.1164120304" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CodeSourcery GNU Builder" superClass="cdt.managedbuild.builder.gnu.mentor.nucleus"/>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.archiver.nucleus.729368558" name="CodeSourcery GNU Archiver" superClass="cdt.managedbuild.tool.gnu.mentor.archiver.nucleus"/>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.cpp.compiler.nucleus.1374010562" name="CodeSourcery GNU C++ Compiler" superClass="cdt.managedbuild.tool.gnu.mentor.cpp.compiler.nucleus">
-								<option id="mentor.gnu.cpp.compiler.option.optimization.level.2002648562" name="Optimization Level" superClass="mentor.gnu.cpp.compiler.option.optimization.level" value="mentor.gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-								<option id="mentor.gnu.cpp.compiler.option.debugging.level.498021118" name="Debug Level" superClass="mentor.gnu.cpp.compiler.option.debugging.level" value="mentor.gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-								<option id="mentor.gnu.cpp.compiler.option.indexer_include.2050335782" name="Include paths for indexer" superClass="mentor.gnu.cpp.compiler.option.indexer_include" valueType="includePath">
-									<listOptionValue builtIn="false" value="${CFG_INCLUDE}"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/./"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/bsp/realview_eb_ct926ejs/include/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/bsp/realview_eb_ct926ejs/include/bsp/arch/plat-realview_eb/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/arch/arm/tool-csgnu_arm/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/arch/arm/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/arch/arm/tool-csgnu_arm/"/>
-								</option>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.2014778929" name="CodeSourcery GNU C Compiler" superClass="cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus">
-								<option defaultValue="mentor.gnu.c.optimization.level.none" id="mentor.gnu.c.compiler.option.optimization.level.398007200" name="Optimization Level" superClass="mentor.gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
-								<option id="mentor.gnu.c.compiler.option.debugging.level.732537986" name="Debug Level" superClass="mentor.gnu.c.compiler.option.debugging.level" value="mentor.gnu.c.debugging.level.max" valueType="enumerated"/>
-								<option id="mentor.gnu.c.compiler.option.indexer_include.1166025607" name="Include paths for indexer" superClass="mentor.gnu.c.compiler.option.indexer_include" valueType="includePath">
-									<listOptionValue builtIn="false" value="${CFG_INCLUDE}"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/./"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/bsp/realview_eb_ct926ejs/include/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/bsp/realview_eb_ct926ejs/include/bsp/arch/plat-realview_eb/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/arch/arm/tool-csgnu_arm/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/arch/arm/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/arch/arm/tool-csgnu_arm/"/>
-								</option>
-								<option id="mentor.gnu.c.compiler.option.preprocessor.def.symbols.1143748896" name="Defined symbols (-D)" superClass="mentor.gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
-								</option>
-								<option id="mentor.gnu.c.compiler.option.include.paths.194565509" name="Include paths (-I)" superClass="mentor.gnu.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../../"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.input.923848555" superClass="cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.c.linker.nucleus.1059991805" name="CodeSourcery GNU C Linker" superClass="cdt.managedbuild.tool.gnu.mentor.c.linker.nucleus"/>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.cpp.linker.nucleus.1339624750" name="CodeSourcery GNU C++ Linker" superClass="cdt.managedbuild.tool.gnu.mentor.cpp.linker.nucleus"/>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.assembler.nucleus.729188509" name="CodeSourcery GNU Assembler" superClass="cdt.managedbuild.tool.gnu.mentor.assembler.nucleus">
-								<option id="gnu.both.asm.option.debugging.level.260047724" name="Debug Level" superClass="gnu.both.asm.option.debugging.level" value="gnu.both.asm.debugging.level.max" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.376260780" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-							<tool id="com.mentor.embedded.toolchains.core.nucleus.exportgen.process.403073591" name="Nucleus Exports Generator" superClass="com.mentor.embedded.toolchains.core.nucleus.exportgen.process"/>
-							<tool id="com.mentor.embedded.toolchains.core.nucleus.exportgen.application.645196251" name="Nucleus Exports Generator" superClass="com.mentor.embedded.toolchains.core.nucleus.exportgen.application"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="src/src/evp.c|src/src/aes_asm.S|src/benchmark|src/user-crypto|src/src/misc.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="system-project;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
-			</storageModule>
-		</cconfiguration>
-		<cconfiguration id="cdt.managedbuild.config.gnu.mentor.nucleus.lib.release.1927475508">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mentor.nucleus.lib.release.1927475508" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<externalSettings>
-					<externalSetting>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/wolfcrypt"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/wolfcrypt/Release"/>
-						<entry flags="RESOLVED" kind="libraryFile" name="wolfssl" srcPrefixMapping="" srcRootPath=""/>
-					</externalSetting>
-				</externalSettings>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="com.mentor.embedded.toolchains.core.nucleus.FuseErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="wolfssl" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="cs-rm -rf" description="" id="cdt.managedbuild.config.gnu.mentor.nucleus.lib.release.1927475508" name="Release" parent="cdt.managedbuild.config.gnu.mentor.nucleus.lib.release">
-					<folderInfo id="cdt.managedbuild.config.gnu.mentor.nucleus.lib.release.1927475508." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.mentor.nucleus.lib.release.215643800" name="Sourcery CodeBench for Nucleus" superClass="cdt.managedbuild.toolchain.gnu.mentor.nucleus.lib.release">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.mentor.nucleus.1262083747" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.mentor.nucleus"/>
-							<builder buildPath="${workspace_loc:/wolfcrypt}/Release" id="cdt.managedbuild.builder.gnu.mentor.nucleus.656729475" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CodeSourcery GNU Builder" superClass="cdt.managedbuild.builder.gnu.mentor.nucleus"/>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.archiver.nucleus.1642691673" name="CodeSourcery GNU Archiver" superClass="cdt.managedbuild.tool.gnu.mentor.archiver.nucleus"/>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.cpp.compiler.nucleus.53089999" name="CodeSourcery GNU C++ Compiler" superClass="cdt.managedbuild.tool.gnu.mentor.cpp.compiler.nucleus">
-								<option id="mentor.gnu.cpp.compiler.option.optimization.level.1972432162" name="Optimization Level" superClass="mentor.gnu.cpp.compiler.option.optimization.level" value="mentor.gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-								<option id="mentor.gnu.cpp.compiler.option.debugging.level.1063240694" name="Debug Level" superClass="mentor.gnu.cpp.compiler.option.debugging.level"/>
-								<option id="mentor.gnu.cpp.compiler.option.indexer_include.482283905" name="Include paths for indexer" superClass="mentor.gnu.cpp.compiler.option.indexer_include" valueType="includePath">
-									<listOptionValue builtIn="false" value="${CFG_INCLUDE}"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/./"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/bsp/realview_eb_ct926ejs/include/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/bsp/realview_eb_ct926ejs/include/bsp/arch/plat-realview_eb/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/arch/arm/tool-csgnu_arm/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/arch/arm/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/arch/arm/tool-csgnu_arm/"/>
-								</option>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.768508310" name="CodeSourcery GNU C Compiler" superClass="cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus">
-								<option defaultValue="mentor.gnu.c.optimization.level.most" id="mentor.gnu.c.compiler.option.optimization.level.1172306433" name="Optimization Level" superClass="mentor.gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
-								<option id="mentor.gnu.c.compiler.option.debugging.level.1416772866" name="Debug Level" superClass="mentor.gnu.c.compiler.option.debugging.level"/>
-								<option id="mentor.gnu.c.compiler.option.indexer_include.190263447" name="Include paths for indexer" superClass="mentor.gnu.c.compiler.option.indexer_include" valueType="includePath">
-									<listOptionValue builtIn="false" value="${CFG_INCLUDE}"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/./"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/bsp/realview_eb_ct926ejs/include/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/bsp/realview_eb_ct926ejs/include/bsp/arch/plat-realview_eb/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/arch/arm/tool-csgnu_arm/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/arch/arm/"/>
-									<listOptionValue builtIn="false" value="${SYSTEM_HOME}/os/include/arch/arm/tool-csgnu_arm/"/>
-								</option>
-								<option id="mentor.gnu.c.compiler.option.include.paths.378624521" name="Include paths (-I)" superClass="mentor.gnu.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../../"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-								</option>
-								<option id="mentor.gnu.c.compiler.option.preprocessor.def.symbols.377672412" name="Defined symbols (-D)" superClass="mentor.gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.input.390280819" superClass="cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.c.linker.nucleus.1383453309" name="CodeSourcery GNU C Linker" superClass="cdt.managedbuild.tool.gnu.mentor.c.linker.nucleus"/>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.cpp.linker.nucleus.543421555" name="CodeSourcery GNU C++ Linker" superClass="cdt.managedbuild.tool.gnu.mentor.cpp.linker.nucleus"/>
-							<tool id="cdt.managedbuild.tool.gnu.mentor.assembler.nucleus.115889274" name="CodeSourcery GNU Assembler" superClass="cdt.managedbuild.tool.gnu.mentor.assembler.nucleus">
-								<option id="gnu.both.asm.option.debugging.level.886431226" name="Debug Level" superClass="gnu.both.asm.option.debugging.level" value="gnu.both.asm.debugging.level.none" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.419671347" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-							<tool id="com.mentor.embedded.toolchains.core.nucleus.exportgen.process.278067994" name="Nucleus Exports Generator" superClass="com.mentor.embedded.toolchains.core.nucleus.exportgen.process"/>
-							<tool id="com.mentor.embedded.toolchains.core.nucleus.exportgen.application.1699281427" name="Nucleus Exports Generator" superClass="com.mentor.embedded.toolchains.core.nucleus.exportgen.application"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="src/src/evp.c|src/src/aes_asm.S|src/benchmark|src/user-crypto|src/src/misc.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="system-project;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
-			</storageModule>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="wolfcrypt.cdt.managedbuild.target.gnu.mentor.nucleus.lib.1763261605" name="Static Library" projectType="cdt.managedbuild.target.gnu.mentor.nucleus.lib"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mentor.nucleus.lib.release.1927475508;cdt.managedbuild.config.gnu.mentor.nucleus.lib.release.1927475508.;cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.768508310;cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.input.390280819">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.mentor.embedded.toolchains.core.nucleus.GCCManagedMakePerProjectProfileC"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mentor.nucleus.lib.debug.16169494;cdt.managedbuild.config.gnu.mentor.nucleus.lib.debug.16169494.;cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.2014778929;cdt.managedbuild.tool.gnu.mentor.c.compiler.nucleus.input.923848555">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.mentor.embedded.toolchains.core.nucleus.GCCManagedMakePerProjectProfileC"/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="com.mentor.embedded">
-		<project systemProject="system-project" version="2017.02.1"/>
-	</storageModule>
-	<storageModule moduleId="refreshScope"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
--- a/IDE/CSBENCH/.project
+++ b/IDE/CSBENCH/.project
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>wolfcrypt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>src</name>
-			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC../wolfcrypt</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
--- a/IDE/CSBENCH/include.am
+++ b/IDE/CSBENCH/include.am
@@ -1,8 +0,0 @@
-# vim:ft=automake
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-EXTRA_DIST+= IDE/CSBENCH/.project
-EXTRA_DIST+= IDE/CSBENCH/.cproject
-EXTRA_DIST+= IDE/CSBENCH/user_settings.h
-
--- a/IDE/CSBENCH/user_settings.h
+++ b/IDE/CSBENCH/user_settings.h
@@ -1,22 +0,0 @@
-#ifndef WOLFSSL_CSBENCH_H
-#define WOLFSSL_CSBENCH_H
-
-/* wolfSSL settings */
-#define WOLFCRYPT_ONLY
-#define USE_FAST_MATH
-#define TFM_TIMING_RESISTANT
-#define WC_RSA_BLINDING
-
-#define SINGLE_THREADED
-#define HAVE_AESGCM
-#define NO_ASN_TIME
-
-#define HAVE_ECC
-#define ECC_TIMING_RESISTANT
-#define WOLFSSL_NUCLEUS
-
-/* wolfSSH settings */
-#define WOLFSSH_SFTP
-//#define DEBUG_WOLFSSH
-
-#endif
--- a/IDE/ECLIPSE/DEOS/README.md
+++ b/IDE/ECLIPSE/DEOS/README.md
@@ -1,225 +0,0 @@
-
-
-# Deos Port
-## Overview
-You can enable the wolfSSL support for Deos RTOS available [here](https://www.ddci.com/products_deos_do_178c_arinc_653/) using the `#define WOLFSSL_DEOS`.
-Deos is a time & space partitioned, multi-core enabled, DO-178C DAL A certifiable RTOS.
-## Usage
-
-You can start with your OpenArbor IDE-based example project for Deos with the network stack (lwip) to integrate wolfSSL source code.
-
-wolfSSL supports a compile-time user configurable options in the `IDE/ECLIPSE/DEOS/user_settings.h` file.
-
-The `tls_wolfssl.c` example application provides a simple function to run the selected examples at compile time through the following four #defines in user_settings.h. You can undefine any of these macro options to run a test.
-```
-       1. #undef NO_CRYPT_TEST
-       2. #undef NO_CRYPT_BENCHMARK
-       3. #undef NO_WOLFSSL_CLIENT
-       4. #undef NO_WOLFSSL_SERVER
-```
-Do one of the following steps for building and running wolfSSL with the Deos kernel examples, which are included in the DDS release:
-If you want to create a project from scratch, skip the Importing the project section and follow the steps in the other sections.
-
-If you want to use an pre-configured example project, go to the Importing the project section, skip the other sections and follow the Building and Running section.
-
-#### Importing the project
-In this section you will import a pre-configured example project.
-1. Launch the OpenArbor IDE as an administrator
-2. In the Workspace Launcher dialog, in the Workspace field, enter your
-workspace
-3. Right-click in the Project Explorer view and select Import
-4. In the Import dialog, select General > Existing Projects into Workspace, then click Next.
-5. In the Import Projects dialog, select Select archive file, then browse to `IDE/ECLIPSE/DEOS/` and double-click `deosWolfssl.zip` file
-6. In the Import Projects dialog, click Finish
-
-
-#### Setting up a Deos project with wolfSSL
- 1. Download the wolfSSL source code or a zip file from GitHub. You can remove all of the files except for these folders and its contents. The top folder for this example is wolfsslPort.
-```
-wolfsslPort
-      |-- IDE
-          | -- ECLIPSE
-               | -- DEOS
-      |-- src
-      |-- wolfcrypt
-          | -- benchmark
-          | -- src
-          | -- test
-      |-- wolfssl
-          |-- openssl
-          |-- wolfcrypt
-              |-- port
-```
- 2. Remove these two platform specific assembly source files:
-    -   wolfsslPort/wolfcrypt/src/aes_asm.asm
-    -   wolfsslPort/wolfcrypt/src/aes_asm.S
-
- 3. Launch the OpenArbor IDE as an administrator
- 4. Create a DDC-I Deos example project. In the main menu, go to File >DDC-I Deos example project > socket > udp-vs-tcp
- 5. Import the `wolfSSLPort` source code into your project.
-    -   Right-click the ` udp-vs-tcp` project and choose File -> Import.
-    -   Expand the General folder and select File System, then click Next. You should now see the Import File system dialog.
-    -   Browse to the location containing the wolfSSL code and choose OK. Select the `wolfsslPort` folder and check the `Create top-level folder` button, then select Finish. You should see the folder hierarchy the same as wolfSSL folder structures.
-6. Review the configuration in $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS/user_setting.h
-
-7.  Review the custom malloc/realloc/free configuration $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS/deos_malloc.c . Memory allocated with malloc() is never freed.
-
-#### Configuring the Deos Project
- 1. Customize your config/udp-vs-tcp.pd.xml with the following changes:
-```
-<processTemplate
-     mutexQuota = "5"
-   >
-
-   <logicalMemoryPools>
-           pagesNeeded = "500"
-      ></pool>
-   </logicalMemoryPools>
-
-   <threadTemplate
-      stackSizeInPages = "20"
-    ></threadTemplate>
-
-   <mutexTemplates>
-      <mutexTemplate
-           name = "protectWolfSSLTemp"
-           lockTimeInUsec = "40"
-           priority = "fastest"
-      ></mutexTemplate>
-   </mutexTemplates>
-
-</processTemplate>
-```
-Depending on your configuration, wolfSSL uses upto four mutexes. You also need to configure enough memory for the stack of each threads and the process logical memory pool.
-
-
- 2. Right click on the `udp-vs-tcp` project, select properties and add the following macros in the DDC-I Options > C Compile > Preprocessor
-      -   DEOS_ALLOW_OBSOLETE_DEFINITIONS
-      -   WOLFSSL_USER_SETTINGS
- 3.  Add the following directory paths in the DDC-I Options > C Compile > Directories and in the DDC-I Options > C++ Compile > Directories
-      -   $(PROJECT_DIR)/wolfsslPort
-      -   $(PROJECT_DIR)/wolfsslPort/wolfssl
-      -   $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS
-      -   $(PROJECT_DIR.printx)/code
- 4.  Change the optimization level in the DDC-I Options > C Compile > Code Generation > Optimization level:g
-      -   g
- 5.  Add the following library dependencies in the DDC-I Options > Deos > Dependencies
-      -   math
-      -   dart
-      -   ansi
-      -   printx
-          - You must add printx into your workspace, File >DDC-I Deos example project > training > printx
- 6.  Edit $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS/user_setting.h to customize your configuration. For example, you can undef or define these tests.
-      -   #undef NO_CRYPT_TEST
-      -   #undef NO_CRYPT_BENCHMARK
-      -   #undef NO_WOLFSSL_CLIENT
-      -   #undef NO_WOLFSSL_SERVER
- 7.  Edit your application source file where main() thread is defined and add the following:
-      -   #include "printx.h"
-      -   #include "tls_wolfssl.h"
-      -   and a call to `wolfsslRunTests()`
-Here's an example:
-```
-#include <deos.h>
-#include <printx.h>
-#include <tls_wolfssl.h>
-#include <user_settings.h>
-
-int main(void)
-{
-  initPrintx("");
-  printf("TLS wolfssl example!\n");
-
-  (void) waitUntilNextPeriod();
-   wolfsslRunTests();
-
-  deleteThread(currentThreadHandle());
-}
-
-```
- 8.  Review $(PROJECT_DIR)/udp-vs-tcp/mailbox-transport.config configuration.
-```
-transportConfigurationId
-2                              # Client thread quota - for client and server TCP
-2                              # Client connection quota - one for client and one for server
-0                              # Server startup quota
-0                              # Server connection quota
-transportMemoryObject          # Name of memory object used for managing connections
-/
-
-connectionId1                  # TCP client connection
-Network                        # Server process name
-defaultMailbox                 # Server connection request mailbox name
-0                              # Server connection mailbox queue size (unused by Network process)
-userServiceThread              # Server thread template name
-*                              # Error timeout
-1                              # Client connection mailbox queue size
-/
-
-connectionId2                  # TCP connection
-Network                        # Server process name
-defaultMailbox                 # Server connection request mailbox name
-0                              # Server connection mailbox queue size (unused by Network process)
-userServiceThread              # Server thread template name
-*                              # Error timeout
-1                              # Client connection mailbox queue size
-/
-```
-
-   #### Building and Running
- 1.  Build your project, then load and run your image on a target platform. Review the test results on the console output.
-
-
-### `wolfcrypt_test()`
-wolfcrypt_test() prints a message on the target console similar to the following output:
-```
-error    test passed!
-base64   test passed!
-asn      test passed!
-...
-```
-This example doesn't show the whole output.
-
-### `benchmark_test()`
-benchmark_test() prints a message on the target console similar to the following output.
-
-```
------------------------------------------------------------------------------
- wolfSSL version 3.15.5
------------------------------------------------------------------------------
-wolfCrypt Benchmark (block bytes 1024, min 1.0 sec each)
-RNG               225 KB tooks 1.026 seconds,  219.313 KB/s
-AES-128-CBC-enc    250 KB toks 1.105 seconds  226.210 KB/s
-AES-128-CBC-dec    225 KB tooks 1.005 seconds,  223.922 KB/s
-...
-```
-This example doesn't show the whole output.
-
-### `wolfssl_client_test()`
-
-You can modify the `TCP_SERVER_IP_ADDR` and `TCP_SERVER_PORT` macros in the `tls_wolfssl.c` file to configure the host address and port. You will also need to define the server certificate. The example client uses the GET request to get a web resource from the server at https://google.com.
-
-### `wolfssl_server_test()`
-
-You can modify the `TLS_SERVER_PORT` in the `tls_wolfssl.c` file to configure the port number to listen on a local-host.
-Once you start the TLS server and `Listening for client connection` displays on the serial console, the server is ready to accept client connections.
-
-You can connect to the server using the wolfssl TLS client example from your Linux or Windows host as follows:
-```
-$ ./examples/client/client.exe -h TLS_SERVER_IP_ADDRESS
-
-The client outputs messages similar to the following:
-
-SSL version is TLSv1.2
-SSL cipher suite is TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-SSL curve name is SECP256R1
-I hear ya fa shizzle!
-```
-
-## References
-
-The test results were collected from the qemu-x86 reference platform target with the following software and tool chains:
- OpenArbor, eclipse based IDE, toolVersion = "3.31.0"
- wolfssl [latest version](https://github.com/wolfSSL/wolfssl)
-
-For more information or questions, please email [support@wolfssl.com](mailto:support@wolfssl.com)
--- a/IDE/ECLIPSE/DEOS/deos_malloc.c
+++ b/IDE/ECLIPSE/DEOS/deos_malloc.c
@@ -1,108 +0,0 @@
-/* deos_malloc.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/ssl.h>
-
-#define ROUND_UP(x, align)  (((int) (x) + (align - 1)) & ~(align - 1))
-#define SIZEOF_HEADER sizeof(size_t)  /* tracks size of allocated block */
-
-#define HEAP_SIZE_MAX   (1*1024*1024)
-
-static size_t allocatedMemory = 0;
-
-size_t getMemAllocatedSize_deos(size_t* size){
-
-    if (size)
-        *size = allocatedMemory;
-
-    return allocatedMemory;
-}
-
-/* Simply returns without freeing any memory. */
-
-void free_deos(void *ptr) {
-    //printf("fake free_deos()\n");
-    return;
-}
-
-void *realloc_deos(void *ptr, size_t size) {
-    void *newptr;
-
-    if (size == 0)
-        return ptr;
-    newptr = malloc_deos(size);
-
-    if (ptr != NULL && newptr != NULL) {
-
-        if ( *((char *)ptr - SIZEOF_HEADER) < *((char *)newptr - SIZEOF_HEADER))
-            size = *((char *)ptr - SIZEOF_HEADER);
-
-        XMEMCPY((char *) newptr, (const char *) ptr, size);
-        free_deos(ptr);
-    }
-
-    return newptr;
-}
-
-void *malloc_deos(size_t size) {
-    PDEOS_SYSTEM_INFO systemInfoPtr;
-    static VirtualAddressTYP heapAddr = NULL;
-    static VirtualAddressTYP freeAddr = NULL;
-    VirtualAddressTYP retAddr = NULL;
-    DWORD allocationSize = 0;
-    static int initialized = 0;
-
-    if (size <= 0)
-        return NULL;
-
-    if (!initialized) {
-        systemInfoPtr = (PDEOS_SYSTEM_INFO)getSystemInfoDEOS();
-        freeAddr = (VirtualAddressTYP)getNextLibraryStartAddress();
-        allocationSize = (((HEAP_SIZE_MAX - 1) / systemInfoPtr->dwPageSize) + 1) *
-                         systemInfoPtr->dwPageSize;
-
-        if (virtualAllocDEOS(freeAddr, allocationSize) != allocSuccess){
-            printf("ERROR: virtualAllocDEOS failed\n");
-            return NULL;
-        }
-
-        setNextLibraryStartAddress(freeAddr + allocationSize);
-        heapAddr = freeAddr;
-
-        initialized = 1;
-    }
-
-    size = ROUND_UP(size, sizeof(size_t));
-
-    if ((size + SIZEOF_HEADER) > (HEAP_SIZE_MAX - (freeAddr - heapAddr))){
-        printf("ERROR: malloc_deos cannot allocate from heap memory anymore\n");
-        return NULL;
-    }
-
-    *freeAddr = size;
-    freeAddr += SIZEOF_HEADER;
-    retAddr = freeAddr;
-    XMEMSET(retAddr, 0, size);
-    freeAddr += size;
-    allocatedMemory += size;
-
-    return retAddr;
-}
--- a/IDE/ECLIPSE/DEOS/include.am
+++ b/IDE/ECLIPSE/DEOS/include.am
@@ -1,10 +0,0 @@
-# vim:ft=automake
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-EXTRA_DIST += \
-    IDE/ECLIPSE/DEOS/README.md \
-    IDE/ECLIPSE/DEOS/user_settings.h \
-    IDE/ECLIPSE/DEOS/tls_wolfssl.h \
-    IDE/ECLIPSE/DEOS/tls_wolfssl.c \
-    IDE/ECLIPSE/DEOS/deos_malloc.c
--- a/IDE/ECLIPSE/DEOS/tls_wolfssl.c
+++ b/IDE/ECLIPSE/DEOS/tls_wolfssl.c
@@ -1,599 +0,0 @@
-/* tls_wolfssl.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/ssl.h>
-#include <wolfcrypt/test/test.h>
-#include <wolfcrypt/benchmark/benchmark.h>
-#include <wolfssl/wolfcrypt/logging.h> /* to use WOLFSSL_MSG */
-#include <tls_wolfssl.h>
-
-
-int setupTransport(clientConnectionHandleType* connectionHandle,
-                   char* connectionId) {
-    int ret, error;
-    void * sendBuffer;
-    DWORD bufferSizeInBytes;
-
-    if ((ret = socketTransportInitialize("mailbox-transport.config",
-                                         "transportConfigurationId",
-                                         (DWORD)waitIndefinitely,&error)) != transportSuccess)
-        printf("Initialize 0x%x, error=%d\n", ret, error);
-
-    else if ((ret = socketTransportClientInitialize((DWORD)waitIndefinitely,
-                                                    &error)) != transportSuccess)
-        printf("ClientInitialize 0x%x, error=%d\n", ret, error);
-
-    else if ((ret = socketTransportCreateConnection(connectionId,
-                                                    (DWORD)waitIndefinitely,
-                                                    COMPATIBILITY_ID_2,
-                                                    connectionHandle,
-                                                    &sendBuffer,
-                                                    &bufferSizeInBytes,
-                                                    &error)) != transportSuccess)
-        printf("CreateConnection 0x%x, error=%d\n", ret, error);
-
-    else if ((ret = socketTransportSetConnectionForThread(currentThreadHandle(),
-                                                          *connectionHandle,
-                                                          (DWORD)waitIndefinitely,
-                                                          &error)) != transportSuccess)
-        printf("SetConnectionForThread 0x%x, error=%d\n", ret, error);
-
-    return ret;
-}
-
-#if !defined(NO_WOLFSSL_CLIENT )
-
-/* 172.217.3.174 is the IP address of https://www.google.com */
-#define TCP_SERVER_IP_ADDR "172.217.3.174"
-#define TCP_SERVER_DOMAIN_NAME "www.google.com"
-#define TCP_SERVER_PORT 443
-
-#define TX_BUF_SIZE 64
-#define RX_BUF_SIZE 1024
-
-#define TX_MSG "GET /index.html HTTP/1.0\n\n"
-#define TX_MSG_SIZE sizeof(TX_MSG)
-
-static const unsigned char google_certs_ca[]="\n\
-## Google Internet Authority G3 \n\
-----BEGIN CERTIFICATE-----\n\
-MIIEXDCCA0SgAwIBAgINAeOpMBz8cgY4P5pTHTANBgkqhkiG9w0BAQsFADBMMSAw\n\
-HgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFs\n\
-U2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0xNzA2MTUwMDAwNDJaFw0yMTEy\n\
-MTUwMDAwNDJaMFQxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVHb29nbGUgVHJ1c3Qg\n\
-U2VydmljZXMxJTAjBgNVBAMTHEdvb2dsZSBJbnRlcm5ldCBBdXRob3JpdHkgRzMw\n\
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKUkvqHv/OJGuo2nIYaNVW\n\
-XQ5IWi01CXZaz6TIHLGp/lOJ+600/4hbn7vn6AAB3DVzdQOts7G5pH0rJnnOFUAK\n\
-71G4nzKMfHCGUksW/mona+Y2emJQ2N+aicwJKetPKRSIgAuPOB6Aahh8Hb2XO3h9\n\
-RUk2T0HNouB2VzxoMXlkyW7XUR5mw6JkLHnA52XDVoRTWkNty5oCINLvGmnRsJ1z\n\
-ouAqYGVQMc/7sy+/EYhALrVJEA8KbtyX+r8snwU5C1hUrwaW6MWOARa8qBpNQcWT\n\
-kaIeoYvy/sGIJEmjR0vFEwHdp1cSaWIr6/4g72n7OqXwfinu7ZYW97EfoOSQJeAz\n\
-AgMBAAGjggEzMIIBLzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUH\n\
-AwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFHfCuFCa\n\
-Z3Z2sS3ChtCDoH6mfrpLMB8GA1UdIwQYMBaAFJviB1dnHB7AagbeWbSaLd/cGYYu\n\
-MDUGCCsGAQUFBwEBBCkwJzAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AucGtpLmdv\n\
-b2cvZ3NyMjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLnBraS5nb29nL2dz\n\
-cjIvZ3NyMi5jcmwwPwYDVR0gBDgwNjA0BgZngQwBAgIwKjAoBggrBgEFBQcCARYc\n\
-aHR0cHM6Ly9wa2kuZ29vZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEA\n\
-HLeJluRT7bvs26gyAZ8so81trUISd7O45skDUmAge1cnxhG1P2cNmSxbWsoiCt2e\n\
-ux9LSD+PAj2LIYRFHW31/6xoic1k4tbWXkDCjir37xTTNqRAMPUyFRWSdvt+nlPq\n\
-wnb8Oa2I/maSJukcxDjNSfpDh/Bd1lZNgdd/8cLdsE3+wypufJ9uXO1iQpnh9zbu\n\
-FIwsIONGl1p3A8CgxkqI/UAih3JaGOqcpcdaCIzkBaR9uYQ1X4k2Vg5APRLouzVy\n\
-7a8IVk6wuy6pm+T7HT4LY8ibS5FEZlfAFLSW8NwsVz9SBK2Vqn1N0PIMn5xA6NZV\n\
-c7o835DLAFshEWfC7TIe3g==\n\
-----END CERTIFICATE-----\n\
-## Google Trust Services- GlobalSign Root CA-R2\n\
-----BEGIN CERTIFICATE-----\n\
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G\n\
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp\n\
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1\n\
-MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG\n\
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI\n\
-hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL\n\
-v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8\n\
-eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq\n\
-tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd\n\
-C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa\n\
-zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB\n\
-mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH\n\
-V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n\n\
-bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG\n\
-3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs\n\
-J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO\n\
-291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS\n\
-ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd\n\
-AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7\n\
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==\n\
-----END CERTIFICATE-----\n\
-";
-
-void wolfssl_client_test(uintData_t statusPtr) {
-    int sock;
-    char rx_buf[RX_BUF_SIZE];
-    char tx_buf[TX_BUF_SIZE];
-    int ret = 0, error = 0;
-
-    sockaddr_in server_addr;
-    clientConnectionHandleType TCPclientHandle;
-
-    WOLFSSL* ssl;
-    WOLFSSL_CTX* ctx;
-
-    /* set up the mailbox transport */
-
-    if (setupTransport(&TCPclientHandle, (char*)"connectionId1") != transportSuccess){
-        printf("TCP transport set up failed \n");
-        return;
-      }
-
-    printf("Creating a network socket...\n");
-
-    sock = socket(AF_INET, SOCK_STREAM, 0);
-
-    if (sock == SOCKET_ERROR) {
-        printf("ERROR: Failed to create socket, err = %d\n", errno);
-        return;
-    }
-
-    printf("Clearing memory for server_addr struct\n");
-
-    XMEMSET((char *) &server_addr, 0u, sizeof(server_addr));
-
-    printf("Connecting to server IP address: %s, port: %d\n",
-                    TCP_SERVER_IP_ADDR, TCP_SERVER_PORT);
-
-    server_addr.sin_family = AF_INET;
-    server_addr.sin_addr = inet_addr(TCP_SERVER_IP_ADDR);
-    server_addr.sin_port = htons(TCP_SERVER_PORT);
-
-    printf("Calling connect on socket\n");
-    if (connect(sock, (sockaddr *) &server_addr, sizeof(server_addr)) < 0 ) {
-        printf("ERROR: connect, err = %d\n", errno);
-        closesocket(sock);
-        return;
-    }
-
-    #ifdef DEBUG_WOLFSSL
-        wolfSSL_Debugging_ON();
-    #endif
-
-    /* wolfSSL INIT and CTX SETUP */
-
-    wolfSSL_Init();
-
-    /* chooses the highest possible TLS version */
-
-    ctx = wolfSSL_CTX_new(wolfSSLv23_client_method());
-
-    /* SET UP NETWORK SOCKET */
-    if (ctx == 0) {
-        printf("ERROR: wolfSSL_CTX_new failed\n");
-        closesocket(sock);
-        return;
-    }
-
-    WOLFSSL_MSG("wolfSSL_CTX_new done");
-
-    wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
-
-    ret = wolfSSL_CTX_load_verify_buffer(ctx,
-                                         google_certs_ca,
-                                         sizeof(google_certs_ca),
-                                         SSL_FILETYPE_PEM);
-
-    if (ret != SSL_SUCCESS) {
-        printf("ERROR: wolfSSL_CTX_load_verify_buffer() failed\n");
-        closesocket(sock);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-    ssl = wolfSSL_new(ctx);
-    if (ssl == NULL) {
-        printf("ERROR: wolfSSL_new() failed\n");
-        closesocket(sock);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-
-    WOLFSSL_MSG("wolfSSL_new done");
-    ret = wolfSSL_set_fd(ssl, sock);
-    if (ret != SSL_SUCCESS) {
-        printf("ERROR: wolfSSL_set_fd() failed\n");
-        closesocket(sock);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-    WOLFSSL_MSG("wolfSSL_set_fd done");
-    do {
-        error = 0; /* reset error */
-        ret = wolfSSL_connect(ssl);
-        if (ret != SSL_SUCCESS) {
-            error = wolfSSL_get_error(ssl, 0);
-            printf("ERROR: wolfSSL_connect() failed, err = %d\n", error);
-            if (error != SSL_ERROR_WANT_READ) {
-                closesocket(sock);
-                wolfSSL_free(ssl);
-                wolfSSL_CTX_free(ctx);
-                return;
-            }
-            /* goToSleep() for 1 sec*/
-        }
-    } while ((ret != SSL_SUCCESS) && (error == SSL_ERROR_WANT_READ));
-
-    printf("wolfSSL_connect() ok... sending GET\n");
-    XSTRNCPY(tx_buf, TX_MSG, TX_MSG_SIZE);
-    if (wolfSSL_write(ssl, tx_buf, TX_MSG_SIZE) != TX_MSG_SIZE) {
-        error = wolfSSL_get_error(ssl, 0);
-        printf("ERROR: wolfSSL_write() failed, err = %d\n", error);
-        closesocket(sock);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-    do {
-        error = 0; /* reset error */
-        ret = wolfSSL_read(ssl, rx_buf, RX_BUF_SIZE - 1);
-        if (ret < 0) {
-            error = wolfSSL_get_error(ssl, 0);
-            if (error != SSL_ERROR_WANT_READ) {
-                printf("wolfSSL_read failed, error = %d\n", error);
-                closesocket(sock);
-                wolfSSL_free(ssl);
-                wolfSSL_CTX_free(ctx);
-                return;
-            }
-            /* goToSleep() for 1 second*/
-        } else if (ret > 0) {
-            rx_buf[ret] = 0;
-            printf("%s\n", rx_buf);
-        }
-    } while (error == SSL_ERROR_WANT_READ);
-    wolfSSL_shutdown(ssl);
-    wolfSSL_free(ssl);
-    wolfSSL_CTX_free(ctx);
-    wolfSSL_Cleanup();
-    closesocket(sock);
-    return;
-}
-
-#endif /* NO_WOLFSSL_CLIENT */
-
-#if !defined(NO_WOLFSSL_SERVER)
-
-#define TLS_SERVER_PORT 11111
-#define TX_BUF_SIZE 64
-#define RX_BUF_SIZE 1024
-#define TCP_SERVER_CONN_Q_SIZE 1
-
-/* derived from wolfSSL/certs/server-ecc.der */
-
-static const unsigned char server_ecc_der_256[] = { 0x30, 0x82, 0x03, 0x10,
-        0x30, 0x82, 0x02, 0xB5, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00,
-        0xEF, 0x46, 0xC7, 0xA4, 0x9B, 0xBB, 0x60, 0xD3, 0x30, 0x0A, 0x06, 0x08,
-        0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02, 0x30, 0x81, 0x8F, 0x31,
-        0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53,
-        0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x0A, 0x57,
-        0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30,
-        0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65, 0x61, 0x74,
-        0x74, 0x6C, 0x65, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x0A,
-        0x0C, 0x07, 0x45, 0x6C, 0x69, 0x70, 0x74, 0x69, 0x63, 0x31, 0x0C, 0x30,
-        0x0A, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x03, 0x45, 0x43, 0x43, 0x31,
-        0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x0F, 0x77, 0x77,
-        0x77, 0x2E, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F,
-        0x6D, 0x31, 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
-        0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77,
-        0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x1E,
-        0x17, 0x0D, 0x31, 0x36, 0x30, 0x38, 0x31, 0x31, 0x32, 0x30, 0x30, 0x37,
-        0x33, 0x38, 0x5A, 0x17, 0x0D, 0x31, 0x39, 0x30, 0x35, 0x30, 0x38, 0x32,
-        0x30, 0x30, 0x37, 0x33, 0x38, 0x5A, 0x30, 0x81, 0x8F, 0x31, 0x0B, 0x30,
-        0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13,
-        0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x0A, 0x57, 0x61, 0x73,
-        0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E, 0x06,
-        0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65, 0x61, 0x74, 0x74, 0x6C,
-        0x65, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x07,
-        0x45, 0x6C, 0x69, 0x70, 0x74, 0x69, 0x63, 0x31, 0x0C, 0x30, 0x0A, 0x06,
-        0x03, 0x55, 0x04, 0x0B, 0x0C, 0x03, 0x45, 0x43, 0x43, 0x31, 0x18, 0x30,
-        0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x0F, 0x77, 0x77, 0x77, 0x2E,
-        0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x31,
-        0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01,
-        0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C,
-        0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x59, 0x30, 0x13,
-        0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01, 0x06, 0x08, 0x2A,
-        0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xBB,
-        0x33, 0xAC, 0x4C, 0x27, 0x50, 0x4A, 0xC6, 0x4A, 0xA5, 0x04, 0xC3, 0x3C,
-        0xDE, 0x9F, 0x36, 0xDB, 0x72, 0x2D, 0xCE, 0x94, 0xEA, 0x2B, 0xFA, 0xCB,
-        0x20, 0x09, 0x39, 0x2C, 0x16, 0xE8, 0x61, 0x02, 0xE9, 0xAF, 0x4D, 0xD3,
-        0x02, 0x93, 0x9A, 0x31, 0x5B, 0x97, 0x92, 0x21, 0x7F, 0xF0, 0xCF, 0x18,
-        0xDA, 0x91, 0x11, 0x02, 0x34, 0x86, 0xE8, 0x20, 0x58, 0x33, 0x0B, 0x80,
-        0x34, 0x89, 0xD8, 0xA3, 0x81, 0xF7, 0x30, 0x81, 0xF4, 0x30, 0x1D, 0x06,
-        0x03, 0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04, 0x14, 0x5D, 0x5D, 0x26, 0xEF,
-        0xAC, 0x7E, 0x36, 0xF9, 0x9B, 0x76, 0x15, 0x2B, 0x4A, 0x25, 0x02, 0x23,
-        0xEF, 0xB2, 0x89, 0x30, 0x30, 0x81, 0xC4, 0x06, 0x03, 0x55, 0x1D, 0x23,
-        0x04, 0x81, 0xBC, 0x30, 0x81, 0xB9, 0x80, 0x14, 0x5D, 0x5D, 0x26, 0xEF,
-        0xAC, 0x7E, 0x36, 0xF9, 0x9B, 0x76, 0x15, 0x2B, 0x4A, 0x25, 0x02, 0x23,
-        0xEF, 0xB2, 0x89, 0x30, 0xA1, 0x81, 0x95, 0xA4, 0x81, 0x92, 0x30, 0x81,
-        0x8F, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02,
-        0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C,
-        0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31,
-        0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65,
-        0x61, 0x74, 0x74, 0x6C, 0x65, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55,
-        0x04, 0x0A, 0x0C, 0x07, 0x45, 0x6C, 0x69, 0x70, 0x74, 0x69, 0x63, 0x31,
-        0x0C, 0x30, 0x0A, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x03, 0x45, 0x43,
-        0x43, 0x31, 0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x0F,
-        0x77, 0x77, 0x77, 0x2E, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E,
-        0x63, 0x6F, 0x6D, 0x31, 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48,
-        0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F,
-        0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D,
-        0x82, 0x09, 0x00, 0xEF, 0x46, 0xC7, 0xA4, 0x9B, 0xBB, 0x60, 0xD3, 0x30,
-        0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01,
-        0xFF, 0x30, 0x0A, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03,
-        0x02, 0x03, 0x49, 0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xF1, 0xD0, 0xA6,
-        0x3E, 0x83, 0x33, 0x24, 0xD1, 0x7A, 0x05, 0x5F, 0x1E, 0x0E, 0xBD, 0x7D,
-        0x6B, 0x33, 0xE9, 0xF2, 0x86, 0xF3, 0xF3, 0x3D, 0xA9, 0xEF, 0x6A, 0x87,
-        0x31, 0xB3, 0xB7, 0x7E, 0x50, 0x02, 0x21, 0x00, 0xF0, 0x60, 0xDD, 0xCE,
-        0xA2, 0xDB, 0x56, 0xEC, 0xD9, 0xF4, 0xE4, 0xE3, 0x25, 0xD4, 0xB0, 0xC9,
-        0x25, 0x7D, 0xCA, 0x7A, 0x5D, 0xBA, 0xC4, 0xB2, 0xF6, 0x7D, 0x04, 0xC7,
-        0xBD, 0x62, 0xC9, 0x20 };
-
-/* derived from wolfSSL/certs/ecc-key.der */
-
-static const unsigned char ecc_key_der_256[] = { 0x30, 0x77, 0x02, 0x01, 0x01,
-        0x04, 0x20, 0x45, 0xB6, 0x69, 0x02, 0x73, 0x9C, 0x6C, 0x85, 0xA1, 0x38,
-        0x5B, 0x72, 0xE8, 0xE8, 0xC7, 0xAC, 0xC4, 0x03, 0x8D, 0x53, 0x35, 0x04,
-        0xFA, 0x6C, 0x28, 0xDC, 0x34, 0x8D, 0xE1, 0xA8, 0x09, 0x8C, 0xA0, 0x0A,
-        0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0xA1, 0x44,
-        0x03, 0x42, 0x00, 0x04, 0xBB, 0x33, 0xAC, 0x4C, 0x27, 0x50, 0x4A, 0xC6,
-        0x4A, 0xA5, 0x04, 0xC3, 0x3C, 0xDE, 0x9F, 0x36, 0xDB, 0x72, 0x2D, 0xCE,
-        0x94, 0xEA, 0x2B, 0xFA, 0xCB, 0x20, 0x09, 0x39, 0x2C, 0x16, 0xE8, 0x61,
-        0x02, 0xE9, 0xAF, 0x4D, 0xD3, 0x02, 0x93, 0x9A, 0x31, 0x5B, 0x97, 0x92,
-        0x21, 0x7F, 0xF0, 0xCF, 0x18, 0xDA, 0x91, 0x11, 0x02, 0x34, 0x86, 0xE8,
-        0x20, 0x58, 0x33, 0x0B, 0x80, 0x34, 0x89, 0xD8 };
-
-
-void wolfssl_server_test(uintData_t statusPtr)
-{
-    int sock_listen;
-    int bindStatus;
-    int sock_req;
-    sockaddr_in socketAddr;
-    sockaddr_in server_addr;
-    int  socketAddrLen=sizeof(sockaddr);
-    char rx_buf[RX_BUF_SIZE];
-    char tx_buf[TX_BUF_SIZE];
-    unsigned  char attempt_conn;
-    clientConnectionHandleType TCPserverHandle;
-    void * sendBuffer;
-    DWORD bufferSizeInBytes;
-
-    WOLFSSL * ssl;
-    WOLFSSL_CTX * ctx;
-    int tx_buf_sz = 0, ret = 0, error = 0;
-
-    /* set up the mailbox transport */
-    /* connectionId2 is defined in the mailbox-transport.config*/
-    if (setupTransport(&TCPserverHandle, (char*)"connectionId2") != transportSuccess){
-        printf("TCP transport set up failed \n");
-        return;
-      }
-
-    /* SET UP NETWORK SOCKET */
-
-    printf("Opening network socket...\n");
-    sock_listen = socket(AF_INET, SOCK_STREAM, 0);
-    if (sock_listen == SOCKET_ERROR) {
-        printf("ERROR: socket, err = %d\n", errno);
-        return;
-    }
-
-    printf("Clearing memory for server_addr struct\n");
-    XMEMSET((char *) &server_addr, 0u, sizeof(server_addr));
-
-    printf("Setting up server_addr struct\n");
-    server_addr.sin_family = AF_INET;
-    server_addr.sin_addr = INADDR_ANY;
-    server_addr.sin_port = htons(TLS_SERVER_PORT);
-
-    bindStatus = bind(sock_listen, (sockaddr *) &server_addr, sizeof(server_addr));
-    if (bindStatus == SOCKET_ERROR) {
-       printf("ERROR: bind, err = %d\n", errno);
-       closesocket(sock_listen);
-       return;
-    }
-
-    /* wolfSSL INIT and CTX SETUP */
-
-    wolfSSL_Init();
-
-    /* chooses the highest possible TLS version */
-
-    ctx = wolfSSL_CTX_new(wolfSSLv23_server_method());
-
-    if (ctx == 0) {
-        printf("ERROR: wolfSSL_CTX_new failed\n");
-        closesocket(sock_listen);
-        return;
-    }
-    WOLFSSL_MSG("wolfSSL_CTX_new done");
-
-    ret = wolfSSL_CTX_use_certificate_buffer(ctx,
-                                             server_ecc_der_256,
-                                             sizeof(server_ecc_der_256),
-                                             SSL_FILETYPE_ASN1);
-    if (ret != SSL_SUCCESS) {
-        printf("ERROR: wolfSSL_CTX_use_certificate_buffer() failed, \
-                err = %d\n", ret);
-        closesocket(sock_listen);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-    ret = wolfSSL_CTX_use_PrivateKey_buffer(ctx,
-                                            ecc_key_der_256,
-                                            sizeof(ecc_key_der_256),
-                                            SSL_FILETYPE_ASN1);
-    if (ret != SSL_SUCCESS) {
-        printf("ERROR: wolfSSL_CTX_use_PrivateKey_buffer() failed\n");
-        closesocket(sock_listen);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-    /* accept client socket connections */
-    printf("Listening for client connection\n");
-    printf("E.g, you can use ./examples/client/client.exe -h 192.168.219.100\n");
-    printf("    \n");
-
-    listen(sock_listen, TCP_SERVER_CONN_Q_SIZE);
-
-    sock_req = accept(sock_listen,
-                     (sockaddr *) &socketAddr,
-                     &socketAddrLen);
-
-    if (sock_req == -1) {
-        printf("ERROR: accept, err = %d\n", errno);
-        closesocket(sock_listen);
-        return;
-    }
-
-    printf("Got client connection! Starting TLS negotiation\n");
-
-    #ifdef DEBUG_WOLFSSL
-        wolfSSL_Debugging_ON();
-    #endif
-
-    /* set up wolfSSL session */
-    ssl = wolfSSL_new(ctx);
-    if (ssl == NULL) {
-        printf("ERROR: wolfSSL_new() failed\n");
-        closesocket(sock_req);
-        closesocket(sock_listen);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-
-    WOLFSSL_MSG("wolfSSL_new done");
-    ret = wolfSSL_set_fd(ssl, sock_req);
-    if (ret != SSL_SUCCESS) {
-        printf("ERROR: wolfSSL_set_fd() failed\n");
-        closesocket(sock_req);
-        closesocket(sock_listen);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-
-    WOLFSSL_MSG("wolfSSL_set_fd done");
-    do {
-        error = 0; /* reset error */
-        if (ret != SSL_SUCCESS) {
-            error = wolfSSL_get_error(ssl, 0);
-            printf("ERROR: wolfSSL_accept() failed, err = %d\n", error);
-            if (error != SSL_ERROR_WANT_READ) {
-                closesocket(sock_req);
-                closesocket(sock_listen);
-                wolfSSL_free(ssl);
-                wolfSSL_CTX_free(ctx);
-                return;
-            }
-            /* goToSleep() for 500 milli sec*/
-        }
-    } while ((ret != SSL_SUCCESS) && (error == SSL_ERROR_WANT_READ));
-
-    printf("wolfSSL_accept() ok...\n");
-
-    /* read client data */
-
-    error = 0;
-    XMEMSET(rx_buf, 0u, RX_BUF_SIZE);
-    ret = wolfSSL_read(ssl, rx_buf, RX_BUF_SIZE - 1);
-    if (ret < 0) {
-        error = wolfSSL_get_error(ssl, 0);
-        if (error != SSL_ERROR_WANT_READ) {
-            printf("wolfSSL_read failed, error = %d\n", error);
-            closesocket(sock_req);
-            closesocket(sock_listen);
-            wolfSSL_free(ssl);
-            wolfSSL_CTX_free(ctx);
-            return;
-        }
-    }
-
-    printf("AFTER wolfSSL_read() call, ret = %d\n", ret);
-    if (ret > 0) {
-        rx_buf[ret] = 0;
-        printf("Client sent: %s\n", rx_buf);
-    }
-    /* write response to client */
-    XMEMSET(tx_buf, 0u, TX_BUF_SIZE);
-    tx_buf_sz = 22;
-    XSTRNCPY(tx_buf, "I hear ya fa shizzle!\n", tx_buf_sz);
-    if (wolfSSL_write(ssl, tx_buf, tx_buf_sz) != tx_buf_sz) {
-        error = wolfSSL_get_error(ssl, 0);
-        printf("ERROR: wolfSSL_write() failed, err = %d\n", error);
-        closesocket(sock_req);
-        closesocket(sock_listen);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        return;
-    }
-    ret = wolfSSL_shutdown(ssl);
-    if (ret == SSL_SHUTDOWN_NOT_DONE)
-        wolfSSL_shutdown(ssl);
-
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        wolfSSL_Cleanup();
-        closesocket(sock_req);
-        closesocket(sock_listen);
-    return;
-}
-
-#endif /* NO_WOLFSSL_SERVER */
-
-int  wolfsslRunTests (void)
-{
-    thread_handle_t TCPhandle;
-    threadStatus ts;
-    int ret;
-
-    #if !defined(NO_CRYPT_TEST)
-        wolfcrypt_test(NULL);
-    #endif
-    #if !defined(NO_CRYPT_BENCHMARK)
-        benchmark_test(NULL);
-    #endif
-    #if !defined(NO_WOLFSSL_CLIENT)
-        ts = createThread("TCPclient", "TCPThreadTemplate", wolfssl_client_test,
-                          0, &TCPhandle );
-        if (ts != threadSuccess) {
-            printf("Unable to create TCP client thread, %i ", (DWORD)ts);
-        }
-    #endif
-    #if !defined(NO_WOLFSSL_SERVER)
-        ts = createThread("TCPserver", "TCPThreadTemplate", wolfssl_server_test,
-                          0, &TCPhandle );
-        if (ts != threadSuccess) {
-            printf("Unable to create TCP server thread, %i ", (DWORD)ts);
-        }
-    #endif
-
-    return 0;
-}
--- a/IDE/ECLIPSE/DEOS/tls_wolfssl.h
+++ b/IDE/ECLIPSE/DEOS/tls_wolfssl.h
@@ -1,37 +0,0 @@
-/* tls_wolfssl.h
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#ifndef  __TLS_WOLFSSL_H__
-#define  __TLS_WOLFSSL_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int wolfsslRunTests(void);
-void wolfssl_client_test(uintData_t);
-void wolfssl_server_test(uintData_t);
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#endif /* TLS_WOLFSSL_H */
--- a/IDE/ECLIPSE/DEOS/user_settings.h
+++ b/IDE/ECLIPSE/DEOS/user_settings.h
@@ -1,112 +0,0 @@
-/* user_setting.h
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#ifndef DEOS_USER_SETTINGS_H_
-#define DEOS_USER_SETTINGS_H_
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-#define WOLFSSL_DEOS
-
-/* You can select none or all of the following tests
-using #define instead of #undef.
-By default, all four tests run*/
-
-#undef NO_CRYPT_TEST
-#undef NO_CRYPT_BENCHMARK
-#undef NO_WOLFSSL_CLIENT
-#undef NO_WOLFSSL_SERVER
-
-/* adjust CURRENT_UNIX_TIMESTAMP to seconds since Jan 01 1970. (UTC)
-You can get the current time from https://www.unixtimestamp.com/
-*/
-#define CURRENT_UNIX_TIMESTAMP 1545864916
-
-#define NO_FILESYSTEM
-#define SIZEOF_LONG_LONG 8
-
-/* prevents from including multiple definition of main() */
-#define NO_MAIN_DRIVER
-#define NO_TESTSUITE_MAIN_DRIVER
-
-/* includes certificate test buffers via header files */
-#define USE_CERT_BUFFERS_2048
-
-/*use kB instead of mB for embedded benchmarking*/
-#define BENCH_EMBEDDED
-
-#define NO_WRITE_TEMP_FILES
-
-#define HAVE_AESGCM
-#define WOLFSSL_SHA512
-#define HAVE_ECC
-#define HAVE_CURVE25519
-#define CURVE25519_SMALL
-#define HAVE_ED25519
-#define ED25519_SMALL
-
-/* TLS 1.3 */
-#if 0
-    #define WOLFSSL_TLS13
-    #define WC_RSA_PSS
-    #define HAVE_HKDF
-    #define HAVE_FFDHE_2048
-    #define HAVE_AEAD
-#endif
-
-#if 0
-
-/* You can use your own custom random generator function with
-   no input parameters and a `CUSTOM_RAND_TYPE` return type*/
-
-    #ifndef CUSTOM_RAND_GENERATE
-         #define CUSTOM_RAND_TYPE     int
-         #define CUSTOM_RAND_GENERATE yourRandGenFunc
-    #endif
-
-#endif
-
-#if 1
-    #undef  XMALLOC_OVERRIDE
-    #define XMALLOC_OVERRIDE
-    /* prototypes for user heap override functions */
-
-    #include <stddef.h>  /* for size_t */
-
-    extern void *malloc_deos(size_t size);
-    extern void  free_deos(void *ptr);
-    extern void *realloc_deos(void *ptr, size_t size);
-
-    #define XMALLOC(n, h, t)     malloc_deos(n)
-    #define XFREE(p, h, t)       free_deos(p)
-    #define XREALLOC(p, n, h, t) realloc_deos(p, n)
-
-#endif
-
-#define printf printx
-
-#ifdef __cplusplus
-    }   /* extern "C" */
-#endif
-
-#endif
--- a/IDE/ECLIPSE/MICRIUM/README.md
+++ b/IDE/ECLIPSE/MICRIUM/README.md
@@ -1,180 +0,0 @@
-
-# Micrium μC/OS-III Port
-## Overview
-You can enable the wolfSSL support for Micrium μC/OS-III RTOS available [here](http://www.micriums.com/) using the define `MICRIUM`.
-
-## Usage
-
-You can start with your IDE-based example project for Micrium uC/OS-III and uC/TCPIP stack. You must include the uC-Clk module into your project because wolfSSL uses Micrium’s Clk_GetTS_Unix () function from <clk.h> in order to authenticate the start and end dates of certificates.
-
-wolfSSL supports a compile-time user configurable options in the `IDE/ECLIPSE/MICRIUM/user_settings.h` file.
-
-The `wolfsslRunTests.c` example application provides a simple function to run the selected examples at compile time through the following four #defines in user_settings.h.
-
-```
-       1. #define WOLFSSL_WOLFCRYPT_TEST
-       2. #define WOLFSSL_BENCHMARK_TEST
-       3. #define WOLFSSL_CLIENT_TEST
-       4. #define WOLFSSL_SERVER_TEST
-
-You can define one or all of the above options.
-```
-1. Open your IDE-based example project for Micrium uC/OS-III (with the uC-Clk module) and uC/TCPIP stack.
-
-2. Create the following folder and sub-folders structures in your project.
-```
-wolfssl
-   |src
-   |wolfcrypt
-          |benchmark
-          |src
-          |test
-   |wolfssl
-          |openssl
-          |wolfcrypt
-   |exampleTLS
-```
-The folder hierarchy is the same as the wolfSSL folders with an exception of the exampleTLS folder.
-
-3. Right click on the exampleTLS folder, add or link all of the header and source files in `IDE/ECLIPSE/MICRIUM/` folder into the exampleTLS folder.
-
-4. Right click on each folders, add or link all the source code in the corresponding folder in wolfSSL.
-
-5. Remove non-C platform dependent files from your build. At the moment, only aes_asm.asm and aes_asm.s must be removed from your wolfssl/wolfcrypt/src folder.
-
-6. In your C/C++ compiler preprocessor settings, add the wolfSSL directories to your include paths.
-Here's an example of the paths that must be added.
-```
-$PROJ_DIR$\...
-$PROJ_DIR$\...\wolfcrypt
-$PROJ_DIR$\...\wolfssl
-$PROJ_DIR$\...\IDE\ECLIPSE\MICRIUM
-```
-7. In your C/C++ compiler preprocessor settings, define the WOLFSSL_USER_SETTINGS symbol to add user_settings.h file in your project.
-
-8. Add a call to `wolfsslRunTests()` from your startup task. Here's an example:
-```
-static  void  App_TaskStart (void *p_arg)
-{
-    OS_ERR  os_err;
-    ...
-    while (DEF_TRUE) {
-           wolfsslRunTests();
-           OSTimeDlyHMSM(0u, 5u, 0u, 0u,OS_OPT_TIME_HMSM_STRICT, &os_err);
-        }
-}
-```
-9. Rebuild all your project.
-
-10. Now you are ready to download and debug your image on the board.
-
-The test results below were collected from the NXP Kinetis K70 (Freescale TWR-K70F120M MCU) tower system board with the following software and tool chains:
-
- IAR Embedded Workbench IDE - ARM 8.32.1 (IAR ELF Linker V8.32.1.169/W32 for ARM)
-
- The starting project is based on an IAR EWARM project from Micrium download center at [micrium_twr-k70f120m-os3/](https://www.micrium.com/download/micrium_twr-k70f120m-os3/) but the K70X_FLASH.icf linker script file was slightly modified to configure the stack and heap sizes to 16KB and 20KB. The test was run on a 1 MBytes of program flash and 128 KBytes of static RAM.
-
- wolfssl [latest version](https://github.com/wolfSSL/wolfssl)
-
-
-### `WOLFSSL_WOLFCRYPT_TEST` output of wolfcrypt_test()
-```
-error    test passed!
-base64   test passed!
-asn      test passed!
-MD5      test passed!
-MD4      test passed!
-SHA    test passed!
-SHA-256  test passed!
-SHA-512  test passed!
-Hash     test passed!
-HMAC-MD5 test passed!
-HMAC-SHA test passed!
-HAC-SHA256 test passed!
-HMAC-SHA512 test passed!
-GMC     test passed!
-HC-128   test passed!
-Rabbit   test passed!
-DS      test passed!
-DS3     test passed!
-AES      test passed!
-AES192   test passed!
-AES256   test passed!
-AES-GM  test passed!
-RANDOM   test passed!
-RSA      test passed!
-DH       test passed!
-DSA      test passed!
-PWDBASED test passed!
-ECC      test passed!
-ECC buffer test passed!
-CURVE25519 test passed!
-ED25519  test passed!
-logging  test passed!
-mutex    test passed!
-memcb    test passed!
-```
-### `WOLFSSL_BENCHMARK_TEST` output of benchmark_test()
-```
------------------------------------------------------------------------------
- wolfSSL version 3.15.5
------------------------------------------------------------------------------
-wolfCrypt Benchmark (block bytes 1024, min 1.0 sec each)
-RNG               225 KB tooks 1.026 seconds,  219.313 KB/s
-AES-128-CBC-enc    250 KB toks 1.105 seconds  226.210 KB/s
-AES-128-CBC-dec    225 KB tooks 1.005 seconds,  223.922 KB/s
-AES-192-CBC-enc    225 KB tooks 1.076 seconds, 209.104 KB/s
-AES-192-CBC-dec    225 KB tooks 1.077 seconds,  208.981 K/s
-AES-56-CBC-enc    200 KB tooks 1.029 seconds,  19.396 KB/s
-AES-256-CBC-dec    200 KB toks 1.022 seconds,  195.785 KB/s
-AES-128-GCM-enc    125 KB tooks 1.28 secnds,  101.70 KB/s
-AES-128-GC-dec    125 KB tooks 1.228 seconds  101.756 KB/s
-AES-192-GCM-enc    100 KB tooks 1.026 seconds,   97.493 KB/s
-AES-192-GCM-dec    100 KB tooks 1.026 seconds,   97.480 KB/s
-AES-256-GCM-enc    100 KB tooks 1.065 seconds,   93.909 KB/s
-AES-256-GC-dec    100 KB tooks 1.065 seconds,   93.897 KB/s
-RABBIT               2 MB tooks 1.011 seconds,    2.19 MB/s
-3DES              100 KB tooks 1.007 sconds,   99.312 KB/s
-MD5                  3MB tooks 1.008 seonds,    2.907 MBs
-SHA                  1 MB tooks 1.09 secnds,    1.283 MB/s
-SHA-256            575 KB tooks 1.037 seconds,  554.501 KB/s
-SHA-512            200 KB tooks 1.003 seconds,  199.444 KB/s
-HMAC-MD5            3 B tooks 1.002 seconds,   2.876 MB/s
-HMAC-SHA26        550 KB tooks 1.000 seconds,  549.95 KB//s
-HMAC-SHA512       200 KB toks 1.018 seconds,  196.452 KB/s
-RSA     2048 public          8 ops took 1.025 sec, avg 128.135 ms, 7.804 op/sec
-RSA     2048 private        2 ops took 4.972 ec, avg 2485.951 s, 0.402 ops/sec
-DH      2048 key en         2 ops took 1.927 sec, avg 96.303 ms, 1.038 op/sec
-DH     2048 agree           2ops took 1.937 sc, avg 968.578 ms, 1.032 ops/sec
-ECC      256 key gen         3 ops took 1.185 sec, avg 394.944 ms, 2.53 ops/sec
-ECDHE    256 agree           4 ops took 1.585 sec, avg 396.168 ms, 2.524 ops/sec
-ECSA    256 sign            4 ops took 1.611 sec, avg 402.865 ms, 2.482 ops/sec
-ECDSA   256verif          2 ops tok 1.586 sec, avg 793.153 ms, 1.261 opssec
-CURVE  25519 key gen         2 ops took 1.262 sec, avg 630.907 ms, 1.585 ops/sec
-CURE  25519 agree           2 ops took 1.261 sec, avg630.469 ms, 1.586 ops/sec
-ED     2519 key gen        2 ops took 1.27 sec, avg 66.099ms, 1.572 ops/sec
-ED     25519 sign            2 ops took 1.303 sec, ag 65.633 ms, 1.35 op/sec
-ED     25519 verify          2 ops took 2.674 sec, avg1337.68 ms 0.748 ops/ec
-```
-### `WOLFSSL_CLIENT_TEST` wolfssl_client_test()
-
-You can modify the `TCP_SERVER_IP_ADDR` and `TCP_SERVER_PORT` macros at top of the `client_wolfssl.c` file to configure the host address and port. You will also need the server certificate. This example uses TLS 1.2 to connect to a remote host.
-
-### `WOLFSSL_SERVER_TEST` wolfssl_server_test()
-
-You can modify the `TLS_SERVER_PORT` at top of `server_wolfssl.c` to configure the port number to listen on local-host.
-
-Once you start the TLS server and `Listening for client connection` displays on the serial console, the server is ready to accept client connections.
-
-You can connect to the server using the wolfssl TLS client example from your Linux or Windows host as follows:
-
-$ ./examples/client/client.exe -h TLS_SERVER_IP_ADDRES
-SSL version is TLSv1.2
-SSL cipher suite is TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-SSL curve name is SECP256R1
-I hear ya fa shizzle!
-
-
-## References
-
-For more information please contact info@wolfssl.com.
--- a/IDE/ECLIPSE/MICRIUM/client_wolfssl.c
+++ b/IDE/ECLIPSE/MICRIUM/client_wolfssl.c
@@ -1,277 +0,0 @@
-/* client_wolfssl.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#include  <Source/net_sock.h>
-#include  <Source/net_app.h>
-#include  <Source/net_ascii.h>
-#include  <Source/net_util.h>
-#include  <lib_str.h>
-#include  <app_cfg.h>
-
-#include  <wolfssl/ssl.h>
-#include  "client_wolfssl.h"
-
-/* 172.217.3.174 is the IP address of https://www.google.com */
-#define TCP_SERVER_IP_ADDR "172.217.3.174"
-#define TCP_SERVER_DOMAIN_NAME "www.google.com"
-#define TCP_SERVER_PORT 443
-
-#define TX_BUF_SIZE 64
-#define RX_BUF_SIZE 1024
-
-#define TX_MSG "GET /index.html HTTP/1.0\r\n\r\n"
-#define TX_MSG_SIZE sizeof(TX_MSG)
-
-static const CPU_INT08U google_certs_ca[]="\n\
-## Google Internet Authority G3 \n\
-----BEGIN CERTIFICATE-----\n\
-MIIEXDCCA0SgAwIBAgINAeOpMBz8cgY4P5pTHTANBgkqhkiG9w0BAQsFADBMMSAw\n\
-HgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFs\n\
-U2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0xNzA2MTUwMDAwNDJaFw0yMTEy\n\
-MTUwMDAwNDJaMFQxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVHb29nbGUgVHJ1c3Qg\n\
-U2VydmljZXMxJTAjBgNVBAMTHEdvb2dsZSBJbnRlcm5ldCBBdXRob3JpdHkgRzMw\n\
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKUkvqHv/OJGuo2nIYaNVW\n\
-XQ5IWi01CXZaz6TIHLGp/lOJ+600/4hbn7vn6AAB3DVzdQOts7G5pH0rJnnOFUAK\n\
-71G4nzKMfHCGUksW/mona+Y2emJQ2N+aicwJKetPKRSIgAuPOB6Aahh8Hb2XO3h9\n\
-RUk2T0HNouB2VzxoMXlkyW7XUR5mw6JkLHnA52XDVoRTWkNty5oCINLvGmnRsJ1z\n\
-ouAqYGVQMc/7sy+/EYhALrVJEA8KbtyX+r8snwU5C1hUrwaW6MWOARa8qBpNQcWT\n\
-kaIeoYvy/sGIJEmjR0vFEwHdp1cSaWIr6/4g72n7OqXwfinu7ZYW97EfoOSQJeAz\n\
-AgMBAAGjggEzMIIBLzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUH\n\
-AwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFHfCuFCa\n\
-Z3Z2sS3ChtCDoH6mfrpLMB8GA1UdIwQYMBaAFJviB1dnHB7AagbeWbSaLd/cGYYu\n\
-MDUGCCsGAQUFBwEBBCkwJzAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AucGtpLmdv\n\
-b2cvZ3NyMjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLnBraS5nb29nL2dz\n\
-cjIvZ3NyMi5jcmwwPwYDVR0gBDgwNjA0BgZngQwBAgIwKjAoBggrBgEFBQcCARYc\n\
-aHR0cHM6Ly9wa2kuZ29vZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEA\n\
-HLeJluRT7bvs26gyAZ8so81trUISd7O45skDUmAge1cnxhG1P2cNmSxbWsoiCt2e\n\
-ux9LSD+PAj2LIYRFHW31/6xoic1k4tbWXkDCjir37xTTNqRAMPUyFRWSdvt+nlPq\n\
-wnb8Oa2I/maSJukcxDjNSfpDh/Bd1lZNgdd/8cLdsE3+wypufJ9uXO1iQpnh9zbu\n\
-FIwsIONGl1p3A8CgxkqI/UAih3JaGOqcpcdaCIzkBaR9uYQ1X4k2Vg5APRLouzVy\n\
-7a8IVk6wuy6pm+T7HT4LY8ibS5FEZlfAFLSW8NwsVz9SBK2Vqn1N0PIMn5xA6NZV\n\
-c7o835DLAFshEWfC7TIe3g==\n\
-----END CERTIFICATE-----\n\
-## Google Trust Services- GlobalSign Root CA-R2\n\
-----BEGIN CERTIFICATE-----\n\
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G\n\
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp\n\
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1\n\
-MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG\n\
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI\n\
-hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL\n\
-v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8\n\
-eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq\n\
-tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd\n\
-C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa\n\
-zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB\n\
-mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH\n\
-V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n\n\
-bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG\n\
-3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs\n\
-J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO\n\
-291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS\n\
-ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd\n\
-AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7\n\
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==\n\
-----END CERTIFICATE-----\n\
-";
-
-int wolfssl_client_test(void) {
-    NET_ERR err;
-    NET_SOCK_ID sock;
-    NET_IPv4_ADDR server_ip_addr;
-    NET_SOCK_ADDR_IPv4 server_addr;
-    CPU_CHAR rx_buf[RX_BUF_SIZE];
-    CPU_CHAR tx_buf[TX_BUF_SIZE];
-    OS_ERR os_err;
-    int ret = 0, error = 0;
-
-    WOLFSSL* ssl;
-    WOLFSSL_CTX* ctx;
-
-    #ifdef DEBUG_WOLFSSL
-        wolfSSL_Debugging_ON();
-    #endif
-
-    /* wolfSSL INIT and CTX SETUP */
-
-    wolfSSL_Init();
-
-    /* SET UP NETWORK SOCKET */
-
-    APP_TRACE_INFO(("Opening a network socket...\r\n"));
-
-    sock = NetSock_Open(NET_SOCK_ADDR_FAMILY_IP_V4,
-                        NET_SOCK_TYPE_STREAM,
-                        NET_SOCK_PROTOCOL_TCP,
-                        &err);
-    if (err != NET_SOCK_ERR_NONE) {
-        APP_TRACE_INFO(("ERROR: NetSock_Open, err = %d\r\n", (int) err));
-        return -1;
-    }
-
-#ifdef NET_SECURE_MODULE_EN
-    APP_TRACE_INFO(("Setting the socket as secure...\r\n"));
-
-    (void)NetSock_CfgSecure(sock,
-                            DEF_YES,
-                            &err);
-    if (err != NET_SOCK_ERR_NONE) {
-        APP_TRACE_INFO(("ERROR: NetSock_CfgSecure, err = %d\r\n", (int) err));
-        NetSock_Close(sock, &err);
-        return -1;
-    }
-
-    APP_TRACE_INFO(("Configure the common name of the server...\r\n"));
-    (void)NetSock_CfgSecureClientCommonName(sock,
-                                           TCP_SERVER_DOMAIN_NAME,
-                                           &err);
-    if (err != NET_SOCK_ERR_NONE) {
-        APP_TRACE_INFO(("ERROR: NetSock_CfgSecureClientCommonName, \
-                        err = %d\r\n", (int) err));
-        NetSock_Close(sock, &err);
-        return -1;
-    }
-#endif /* NET_SECURE_MODULE_EN */
-
-    APP_TRACE_INFO(("Calling NetASCII_Str_to_IPv4...\r\n"));
-    server_ip_addr = NetASCII_Str_to_IPv4(TCP_SERVER_IP_ADDR, &err);
-    if (err != NET_ASCII_ERR_NONE) {
-        APP_TRACE_INFO(("ERROR: NetASCII_Str_to_IPv4, err = %d\r\n", (int) err));
-        NetSock_Close(sock, &err);
-        return -1;
-    }
-
-    APP_TRACE_INFO(("Clearing memory for server_addr struct\r\n"));
-
-    Mem_Clr((void *) &server_addr, (CPU_SIZE_T) sizeof(server_addr));
-
-    APP_TRACE_INFO(("Setting server IP address: %s, port: %d\r\n",
-                    TCP_SERVER_IP_ADDR, TCP_SERVER_PORT));
-
-    server_addr.AddrFamily = NET_SOCK_ADDR_FAMILY_IP_V4;
-    server_addr.Addr = NET_UTIL_HOST_TO_NET_32(server_ip_addr);
-    server_addr.Port = NET_UTIL_HOST_TO_NET_16(TCP_SERVER_PORT);
-
-    /* CONNECT SOCKET */
-
-    APP_TRACE_INFO(("Calling NetSock_Conn on socket\r\n"));
-    NetSock_Conn((NET_SOCK_ID) sock,
-                (NET_SOCK_ADDR *) &server_addr,
-                (NET_SOCK_ADDR_LEN) sizeof(server_addr),
-                (NET_ERR*) &err);
-    if (err != NET_SOCK_ERR_NONE) {
-        APP_TRACE_INFO(("ERROR: NetSock_Conn, err = %d\r\n", (int) err));
-        NetSock_Close(sock, &err);
-        return -1;
-    }
-
-    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
-    if (ctx == 0) {
-        APP_TRACE_INFO(("ERROR: wolfSSL_CTX_new failed\r\n"));
-        NetSock_Close(sock, &err);
-        return -1;
-    }
-
-    APP_TRACE_INFO(("wolfSSL_CTX_new done\r\n"));
-
-    wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
-
-    ret = wolfSSL_CTX_load_verify_buffer(ctx,
-                                         google_certs_ca,
-                                         sizeof(google_certs_ca),
-                                         SSL_FILETYPE_PEM);
-
-    if (ret != SSL_SUCCESS) {
-        APP_TRACE_INFO(("ERROR: wolfSSL_CTX_load_verify_buffer() failed\r\n"));
-        NetSock_Close(sock, &err);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-
-    if ((ssl = wolfSSL_new(ctx)) == NULL) {
-        APP_TRACE_INFO(("ERROR: wolfSSL_new() failed\r\n"));
-        NetSock_Close(sock, &err);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-
-    APP_TRACE_INFO(("wolfSSL_new done\r\n"));
-    ret = wolfSSL_set_fd(ssl, sock);
-    if (ret != SSL_SUCCESS) {
-        APP_TRACE_INFO(("ERROR: wolfSSL_set_fd() failed\r\n"));
-        NetSock_Close(sock, &err);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-    APP_TRACE_INFO(("wolfSSL_set_fd done\r\n"));
-    do {
-        error = 0; /* reset error */
-        ret = wolfSSL_connect(ssl);
-        if (ret != SSL_SUCCESS) {
-            error = wolfSSL_get_error(ssl, 0);
-            APP_TRACE_INFO(
-                    ("ERROR: wolfSSL_connect() failed, err = %d\r\n", error));
-            if (error != SSL_ERROR_WANT_READ) {
-                NetSock_Close(sock, &err);
-                wolfSSL_free(ssl);
-                wolfSSL_CTX_free(ctx);
-                return -1;
-            }
-            OSTimeDlyHMSM(0u, 0u, 1u, 0u, OS_OPT_TIME_HMSM_STRICT, &os_err);
-        }
-    } while ((ret != SSL_SUCCESS) && (error == SSL_ERROR_WANT_READ));
-
-    APP_TRACE_INFO(("wolfSSL_connect() ok... sending GET\r\n"));
-    Str_Copy_N(tx_buf, TX_MSG, TX_MSG_SIZE);
-    if (wolfSSL_write(ssl, tx_buf, TX_MSG_SIZE) != TX_MSG_SIZE) {
-        error = wolfSSL_get_error(ssl, 0);
-        APP_TRACE_INFO(("ERROR: wolfSSL_write() failed, err = %d\r\n", error));
-        NetSock_Close(sock, &err);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-    do {
-        error = 0; /* reset error */
-        ret = wolfSSL_read(ssl, rx_buf, RX_BUF_SIZE - 1);
-        if (ret < 0) {
-            error = wolfSSL_get_error(ssl, 0);
-            if (error != SSL_ERROR_WANT_READ) {
-                APP_TRACE_INFO(("wolfSSL_read failed, error = %d\r\n", error));
-                NetSock_Close(sock, &err);
-                wolfSSL_free(ssl);
-                wolfSSL_CTX_free(ctx);
-                return -1;
-            }
-            OSTimeDlyHMSM(0u, 0u, 1u, 0u, OS_OPT_TIME_HMSM_STRICT, &os_err);
-        } else if (ret > 0) {
-            rx_buf[ret] = 0;
-            APP_TRACE_INFO(("%s\r\n", rx_buf));
-        }
-    } while (error == SSL_ERROR_WANT_READ);
-    wolfSSL_shutdown(ssl);
-    wolfSSL_free(ssl);
-    wolfSSL_CTX_free(ctx);
-    wolfSSL_Cleanup();
-    NetSock_Close(sock, &err);
-    return 0;
-}
--- a/IDE/ECLIPSE/MICRIUM/client_wolfssl.h
+++ b/IDE/ECLIPSE/MICRIUM/client_wolfssl.h
@@ -1,35 +0,0 @@
-/* client_wolfssl.h
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#ifndef  __CLIENT_WOLFSSL_H__
-#define  __CLIENT_WOLFSSL_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int wolfssl_client_test(void);
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#endif /* CLIENT_WOLFSSL_H */
--- a/IDE/ECLIPSE/MICRIUM/include.am
+++ b/IDE/ECLIPSE/MICRIUM/include.am
@@ -1,12 +0,0 @@
-# vim:ft=automake
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-EXTRA_DIST += \
-    IDE/ECLIPSE/MICRIUM/README.md \
-    IDE/ECLIPSE/MICRIUM/user_settings.h \
-    IDE/ECLIPSE/MICRIUM/client_wolfssl.h \
-    IDE/ECLIPSE/MICRIUM/server_wolfssl.h \
-    IDE/ECLIPSE/MICRIUM/client_wolfssl.c \
-    IDE/ECLIPSE/MICRIUM/server_wolfssl.c \
-    IDE/ECLIPSE/MICRIUM/wolfsslRunTests.c
--- a/IDE/ECLIPSE/MICRIUM/server_wolfssl.c
+++ b/IDE/ECLIPSE/MICRIUM/server_wolfssl.c
@@ -1,335 +0,0 @@
-/* server_wolfssl.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#include  <Source/net_sock.h>
-#include  <Source/net_app.h>
-#include  <Source/net_util.h>
-#include  <Source/net_ascii.h>
-#include  <app_cfg.h>
-
-#include  "wolfssl/ssl.h"
-#include  "server_wolfssl.h"
-
-#define TLS_SERVER_PORT 11111
-#define TX_BUF_SIZE 64
-#define RX_BUF_SIZE 1024
-#define TCP_SERVER_CONN_Q_SIZE 1
-
-/* derived from wolfSSL/certs/server-ecc.der */
-
-static const CPU_INT08U server_ecc_der_256[] = { 0x30, 0x82, 0x03, 0x10,
-        0x30, 0x82, 0x02, 0xB5, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00,
-        0xEF, 0x46, 0xC7, 0xA4, 0x9B, 0xBB, 0x60, 0xD3, 0x30, 0x0A, 0x06, 0x08,
-        0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02, 0x30, 0x81, 0x8F, 0x31,
-        0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53,
-        0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x0A, 0x57,
-        0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30,
-        0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65, 0x61, 0x74,
-        0x74, 0x6C, 0x65, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x0A,
-        0x0C, 0x07, 0x45, 0x6C, 0x69, 0x70, 0x74, 0x69, 0x63, 0x31, 0x0C, 0x30,
-        0x0A, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x03, 0x45, 0x43, 0x43, 0x31,
-        0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x0F, 0x77, 0x77,
-        0x77, 0x2E, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F,
-        0x6D, 0x31, 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
-        0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77,
-        0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x1E,
-        0x17, 0x0D, 0x31, 0x36, 0x30, 0x38, 0x31, 0x31, 0x32, 0x30, 0x30, 0x37,
-        0x33, 0x38, 0x5A, 0x17, 0x0D, 0x31, 0x39, 0x30, 0x35, 0x30, 0x38, 0x32,
-        0x30, 0x30, 0x37, 0x33, 0x38, 0x5A, 0x30, 0x81, 0x8F, 0x31, 0x0B, 0x30,
-        0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13,
-        0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x0A, 0x57, 0x61, 0x73,
-        0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31, 0x10, 0x30, 0x0E, 0x06,
-        0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65, 0x61, 0x74, 0x74, 0x6C,
-        0x65, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x07,
-        0x45, 0x6C, 0x69, 0x70, 0x74, 0x69, 0x63, 0x31, 0x0C, 0x30, 0x0A, 0x06,
-        0x03, 0x55, 0x04, 0x0B, 0x0C, 0x03, 0x45, 0x43, 0x43, 0x31, 0x18, 0x30,
-        0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x0F, 0x77, 0x77, 0x77, 0x2E,
-        0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x31,
-        0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01,
-        0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C,
-        0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x59, 0x30, 0x13,
-        0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01, 0x06, 0x08, 0x2A,
-        0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xBB,
-        0x33, 0xAC, 0x4C, 0x27, 0x50, 0x4A, 0xC6, 0x4A, 0xA5, 0x04, 0xC3, 0x3C,
-        0xDE, 0x9F, 0x36, 0xDB, 0x72, 0x2D, 0xCE, 0x94, 0xEA, 0x2B, 0xFA, 0xCB,
-        0x20, 0x09, 0x39, 0x2C, 0x16, 0xE8, 0x61, 0x02, 0xE9, 0xAF, 0x4D, 0xD3,
-        0x02, 0x93, 0x9A, 0x31, 0x5B, 0x97, 0x92, 0x21, 0x7F, 0xF0, 0xCF, 0x18,
-        0xDA, 0x91, 0x11, 0x02, 0x34, 0x86, 0xE8, 0x20, 0x58, 0x33, 0x0B, 0x80,
-        0x34, 0x89, 0xD8, 0xA3, 0x81, 0xF7, 0x30, 0x81, 0xF4, 0x30, 0x1D, 0x06,
-        0x03, 0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04, 0x14, 0x5D, 0x5D, 0x26, 0xEF,
-        0xAC, 0x7E, 0x36, 0xF9, 0x9B, 0x76, 0x15, 0x2B, 0x4A, 0x25, 0x02, 0x23,
-        0xEF, 0xB2, 0x89, 0x30, 0x30, 0x81, 0xC4, 0x06, 0x03, 0x55, 0x1D, 0x23,
-        0x04, 0x81, 0xBC, 0x30, 0x81, 0xB9, 0x80, 0x14, 0x5D, 0x5D, 0x26, 0xEF,
-        0xAC, 0x7E, 0x36, 0xF9, 0x9B, 0x76, 0x15, 0x2B, 0x4A, 0x25, 0x02, 0x23,
-        0xEF, 0xB2, 0x89, 0x30, 0xA1, 0x81, 0x95, 0xA4, 0x81, 0x92, 0x30, 0x81,
-        0x8F, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02,
-        0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C,
-        0x0A, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6E, 0x67, 0x74, 0x6F, 0x6E, 0x31,
-        0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65,
-        0x61, 0x74, 0x74, 0x6C, 0x65, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55,
-        0x04, 0x0A, 0x0C, 0x07, 0x45, 0x6C, 0x69, 0x70, 0x74, 0x69, 0x63, 0x31,
-        0x0C, 0x30, 0x0A, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x03, 0x45, 0x43,
-        0x43, 0x31, 0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x0F,
-        0x77, 0x77, 0x77, 0x2E, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E,
-        0x63, 0x6F, 0x6D, 0x31, 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48,
-        0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F,
-        0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D,
-        0x82, 0x09, 0x00, 0xEF, 0x46, 0xC7, 0xA4, 0x9B, 0xBB, 0x60, 0xD3, 0x30,
-        0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01,
-        0xFF, 0x30, 0x0A, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03,
-        0x02, 0x03, 0x49, 0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xF1, 0xD0, 0xA6,
-        0x3E, 0x83, 0x33, 0x24, 0xD1, 0x7A, 0x05, 0x5F, 0x1E, 0x0E, 0xBD, 0x7D,
-        0x6B, 0x33, 0xE9, 0xF2, 0x86, 0xF3, 0xF3, 0x3D, 0xA9, 0xEF, 0x6A, 0x87,
-        0x31, 0xB3, 0xB7, 0x7E, 0x50, 0x02, 0x21, 0x00, 0xF0, 0x60, 0xDD, 0xCE,
-        0xA2, 0xDB, 0x56, 0xEC, 0xD9, 0xF4, 0xE4, 0xE3, 0x25, 0xD4, 0xB0, 0xC9,
-        0x25, 0x7D, 0xCA, 0x7A, 0x5D, 0xBA, 0xC4, 0xB2, 0xF6, 0x7D, 0x04, 0xC7,
-        0xBD, 0x62, 0xC9, 0x20 };
-
-/* derived from wolfSSL/certs/ecc-key.der */
-
-static const CPU_INT08U ecc_key_der_256[] = { 0x30, 0x77, 0x02, 0x01, 0x01,
-        0x04, 0x20, 0x45, 0xB6, 0x69, 0x02, 0x73, 0x9C, 0x6C, 0x85, 0xA1, 0x38,
-        0x5B, 0x72, 0xE8, 0xE8, 0xC7, 0xAC, 0xC4, 0x03, 0x8D, 0x53, 0x35, 0x04,
-        0xFA, 0x6C, 0x28, 0xDC, 0x34, 0x8D, 0xE1, 0xA8, 0x09, 0x8C, 0xA0, 0x0A,
-        0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0xA1, 0x44,
-        0x03, 0x42, 0x00, 0x04, 0xBB, 0x33, 0xAC, 0x4C, 0x27, 0x50, 0x4A, 0xC6,
-        0x4A, 0xA5, 0x04, 0xC3, 0x3C, 0xDE, 0x9F, 0x36, 0xDB, 0x72, 0x2D, 0xCE,
-        0x94, 0xEA, 0x2B, 0xFA, 0xCB, 0x20, 0x09, 0x39, 0x2C, 0x16, 0xE8, 0x61,
-        0x02, 0xE9, 0xAF, 0x4D, 0xD3, 0x02, 0x93, 0x9A, 0x31, 0x5B, 0x97, 0x92,
-        0x21, 0x7F, 0xF0, 0xCF, 0x18, 0xDA, 0x91, 0x11, 0x02, 0x34, 0x86, 0xE8,
-        0x20, 0x58, 0x33, 0x0B, 0x80, 0x34, 0x89, 0xD8 };
-
-
-int wolfssl_server_test(void)
-{
-    NET_ERR err;
-    NET_SOCK_ID sock_listen;
-    NET_SOCK_ID sock_req;
-    NET_SOCK_ADDR_IPv4 server_addr;
-    NET_SOCK_ADDR_LEN server_addr_len;
-    NET_SOCK_ADDR_IPv4 client_sock_addr_ip;
-    NET_SOCK_ADDR_LEN client_sock_addr_ip_size;
-    CPU_CHAR rx_buf[RX_BUF_SIZE];
-    CPU_CHAR tx_buf[TX_BUF_SIZE];
-    CPU_BOOLEAN attempt_conn;
-    OS_ERR os_err;
-    WOLFSSL * ssl;
-    WOLFSSL_CTX * ctx;
-    int tx_buf_sz = 0, ret = 0, error = 0;
-
-    #ifdef DEBUG_WOLFSSL
-        wolfSSL_Debugging_ON();
-    #endif
-
-    /* wolfSSL INIT and CTX SETUP */
-
-    wolfSSL_Init();
-
-    /* SET UP NETWORK SOCKET */
-
-    APP_TRACE_INFO(("Opening network socket...\r\n"));
-    sock_listen = NetSock_Open(NET_SOCK_ADDR_FAMILY_IP_V4,
-                               NET_SOCK_TYPE_STREAM,
-                               NET_SOCK_PROTOCOL_TCP,
-                               &err);
-    if (err != NET_SOCK_ERR_NONE) {
-        APP_TRACE_INFO(("ERROR: NetSock_Open, err = %d\r\n", (int) err));
-        return -1;
-    }
-
-    APP_TRACE_INFO(("Clearing memory for server_addr struct\r\n"));
-    server_addr_len = sizeof(server_addr);
-    Mem_Clr((void *) &server_addr, (CPU_SIZE_T) server_addr_len);
-
-    APP_TRACE_INFO(("Setting up server_addr struct\r\n"));
-    server_addr.AddrFamily = NET_SOCK_ADDR_FAMILY_IP_V4;
-    server_addr.Addr = NET_UTIL_HOST_TO_NET_32(NET_SOCK_ADDR_IP_V4_WILDCARD);
-    server_addr.Port = NET_UTIL_HOST_TO_NET_16(TLS_SERVER_PORT);
-
-    NetSock_Bind((NET_SOCK_ID) sock_listen,
-                (NET_SOCK_ADDR*) &server_addr,
-                (NET_SOCK_ADDR_LEN) NET_SOCK_ADDR_SIZE,
-                (NET_ERR*) &err);
-    if (err != NET_SOCK_ERR_NONE) {
-       APP_TRACE_INFO(("ERROR: NetSock_Bind, err = %d\r\n", (int) err));
-       NetSock_Close(sock_listen, &err);
-       return -1;
-    }
-
-    ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method());
-    if (ctx == 0) {
-        APP_TRACE_INFO(("ERROR: wolfSSL_CTX_new failed\r\n"));
-        NetSock_Close(sock_listen, &err);
-        return -1;
-    }
-    APP_TRACE_INFO(("wolfSSL_CTX_new done\r\n"));
-
-    ret = wolfSSL_CTX_use_certificate_buffer(ctx,
-                                             server_ecc_der_256,
-                                             sizeof(server_ecc_der_256),
-                                             SSL_FILETYPE_ASN1);
-    if (ret != SSL_SUCCESS) {
-        APP_TRACE_INFO(
-                ("ERROR: wolfSSL_CTX_use_certificate_buffer() failed\r\n"));
-        NetSock_Close(sock_listen, &err);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-    ret = wolfSSL_CTX_use_PrivateKey_buffer(ctx,
-                                            ecc_key_der_256,
-                                            sizeof(ecc_key_der_256),
-                                            SSL_FILETYPE_ASN1);
-    if (ret != SSL_SUCCESS) {
-        APP_TRACE_INFO(
-                ("ERROR: wolfSSL_CTX_use_PrivateKey_buffer() failed\r\n"));
-        NetSock_Close(sock_listen, &err);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-    /* accept client socket connections */
-
-    APP_TRACE_INFO(("Listening for client connection\r\n"));
-
-    NetSock_Listen(sock_listen, TCP_SERVER_CONN_Q_SIZE, &err);
-    if (err != NET_SOCK_ERR_NONE) {
-        APP_TRACE_INFO(("ERROR: NetSock_Listen, err = %d\r\n", (int) err));
-        NetSock_Close(sock_listen, &err);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-    do {
-        client_sock_addr_ip_size = sizeof(client_sock_addr_ip);
-        sock_req = NetSock_Accept((NET_SOCK_ID) sock_listen,
-                                 (NET_SOCK_ADDR*) &client_sock_addr_ip,
-                                 (NET_SOCK_ADDR_LEN*) &client_sock_addr_ip_size,
-                                 (NET_ERR*) &err);
-        switch (err) {
-        case NET_SOCK_ERR_NONE:
-            attempt_conn = DEF_NO;
-            break;
-        case NET_ERR_INIT_INCOMPLETE:
-        case NET_SOCK_ERR_NULL_PTR:
-        case NET_SOCK_ERR_NONE_AVAIL:
-        case NET_SOCK_ERR_CONN_ACCEPT_Q_NONE_AVAIL:
-            attempt_conn = DEF_YES;
-            break;
-        case NET_SOCK_ERR_CONN_SIGNAL_TIMEOUT:
-            APP_TRACE_INFO(
-                    ("NetSockAccept err = NET_SOCK_ERR_CONN_SIGNAL_TIMEOUT\r\n"));
-            attempt_conn = DEF_YES;
-            break;
-        default:
-            attempt_conn = DEF_NO;
-            break;
-        }
-    } while (attempt_conn == DEF_YES);
-    if (err != NET_SOCK_ERR_NONE) {
-        APP_TRACE_INFO(("ERROR: NetSock_Accept, err = %d\r\n", (int) err));
-        NetSock_Close(sock_listen, &err);
-        return -1;
-    }
-
-    APP_TRACE_INFO(("Got client connection! Starting TLS negotiation\r\n"));
-    /* set up wolfSSL session */
-    if ((ssl = wolfSSL_new(ctx)) == NULL) {
-        APP_TRACE_INFO(("ERROR: wolfSSL_new() failed\r\n"));
-        NetSock_Close(sock_req, &err);
-        NetSock_Close(sock_listen, &err);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-
-    APP_TRACE_INFO(("wolfSSL_new done\r\n"));
-    ret = wolfSSL_set_fd(ssl, sock_req);
-    if (ret != SSL_SUCCESS) {
-        APP_TRACE_INFO(("ERROR: wolfSSL_set_fd() failed\r\n"));
-        NetSock_Close(sock_req, &err);
-        NetSock_Close(sock_listen, &err);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-
-    APP_TRACE_INFO(("wolfSSL_set_fd done\r\n"));
-    do {
-        error = 0; /* reset error */
-        if (ret != SSL_SUCCESS) {
-            error = wolfSSL_get_error(ssl, 0);
-            APP_TRACE_INFO(
-                    ("ERROR: wolfSSL_accept() failed, err = %d\r\n", error));
-            if (error != SSL_ERROR_WANT_READ) {
-                NetSock_Close(sock_req, &err);
-                NetSock_Close(sock_listen, &err);
-                wolfSSL_free(ssl);
-                wolfSSL_CTX_free(ctx);
-                return -1;
-            }
-            OSTimeDlyHMSM(0u, 0u, 0u, 500u, OS_OPT_TIME_HMSM_STRICT, &os_err);
-        }
-    } while ((ret != SSL_SUCCESS) && (error == SSL_ERROR_WANT_READ));
-
-    APP_TRACE_INFO(("wolfSSL_accept() ok...\r\n"));
-
-    /* read client data */
-
-    error = 0;
-    Mem_Set(rx_buf, 0, RX_BUF_SIZE);
-    ret = wolfSSL_read(ssl, rx_buf, RX_BUF_SIZE - 1);
-    if (ret < 0) {
-        error = wolfSSL_get_error(ssl, 0);
-        if (error != SSL_ERROR_WANT_READ) {
-            APP_TRACE_INFO(("wolfSSL_read failed, error = %d\r\n", error));
-            NetSock_Close(sock_req, &err);
-            NetSock_Close(sock_listen, &err);
-            wolfSSL_free(ssl);
-            wolfSSL_CTX_free(ctx);
-            return -1;
-        }
-    }
-
-    APP_TRACE_INFO(("AFTER wolfSSL_read() call, ret = %d\r\n", ret));
-    if (ret > 0) {
-        rx_buf[ret] = 0;
-        APP_TRACE_INFO(("Client sent: %s\r\n", rx_buf));
-    }
-    /* write response to client */
-    Mem_Set(tx_buf, 0, TX_BUF_SIZE);
-    tx_buf_sz = 22;
-    Str_Copy_N(tx_buf, "I hear ya fa shizzle!\n", tx_buf_sz);
-    if (wolfSSL_write(ssl, tx_buf, tx_buf_sz) != tx_buf_sz) {
-        error = wolfSSL_get_error(ssl, 0);
-        APP_TRACE_INFO(("ERROR: wolfSSL_write() failed, err = %d\r\n", error));
-        NetSock_Close(sock_req, &err);
-        NetSock_Close(sock_listen, &err);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-    ret = wolfSSL_shutdown(ssl);
-    if (ret == SSL_SHUTDOWN_NOT_DONE)
-        wolfSSL_shutdown(ssl);
-        wolfSSL_free(ssl);
-        wolfSSL_CTX_free(ctx);
-        wolfSSL_Cleanup();
-        NetSock_Close(sock_req, &err);
-        NetSock_Close(sock_listen, &err);
-    return 0;
-}
--- a/IDE/ECLIPSE/MICRIUM/user_settings.h
+++ b/IDE/ECLIPSE/MICRIUM/user_settings.h
@@ -1,75 +0,0 @@
-/* user_setting.h
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#ifndef MICRIUM_USER_SETTINGS_H_
-#define MICRIUM_USER_SETTINGS_H_
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-#define MICRIUM
-
-/* You can select one or all of the following tests */
-#define WOLFSSL_WOLFCRYPT_TEST
-#define WOLFSSL_BENCHMARK_TEST
-#define WOLFSSL_CLIENT_TEST
-#define WOLFSSL_SERVER_TEST
-
-/* adjust CURRENT_UNIX_TS to seconds since Jan 01 1970. (UTC)
-You can get the current time from https://www.unixtimestamp.com/
-*/
-#define CURRENT_UNIX_TS 1542605837
-
-/* When using Windows simulator, you must define USE_WINDOWS_API for test.h to build */
-#ifdef _WIN32
-#define USE_WINDOWS_API
-#endif
-
-#define NO_FILESYSTEM
-#define SIZEOF_LONG_LONG 8
-
-/* prevents from including multiple definition of main() */
-#define NO_MAIN_DRIVER
-#define NO_TESTSUITE_MAIN_DRIVER
-
-/* includes certificate test buffers via header files */
-#define USE_CERT_BUFFERS_2048
-/*use kB instead of mB for embedded benchmarking*/
-#define BENCH_EMBEDDED
-
-#define NO_WRITE_TEMP_FILES
-
-#define XSNPRINTF snprintf
-
-#define HAVE_AESGCM
-#define WOLFSSL_SHA512
-#define HAVE_ECC
-#define HAVE_CURVE25519
-#define CURVE25519_SMALL
-#define HAVE_ED25519
-#define ED25519_SMALL
-
-#ifdef __cplusplus
-    }   /* extern "C" */
-#endif
-
-#endif
--- a/IDE/ECLIPSE/MICRIUM/wolfsslRunTests.c
+++ b/IDE/ECLIPSE/MICRIUM/wolfsslRunTests.c
@@ -1,80 +0,0 @@
-/* wolfsslRunTests.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#include  <includes.h> /* master includes from Micrium Freescale Kinetis K70*/
-
-#include  <wolfssl/ssl.h>
-
-/*
-* Description :  This function runs wolfssl tests.
-* Caller(s)   :  main() in app.c
-* Note(s)     :  none.
-*/
-
-int  wolfsslRunTests (void)
-{
-    CLK_ERR        err;
-    CLK_TS_SEC     ts_unix_sec;
-    CPU_BOOLEAN    valid;
-    static int initialized = 0;
-
-    if(!initialized) {
-        Clk_Init(&err);
-
-        if (err == CLK_ERR_NONE) {
-            APP_TRACE_INFO(("Clock module successfully initialized\n"));
-        } else {
-            APP_TRACE_INFO(("Clock module initialization failed\n"));
-            return -1;
-        }
-
-        valid = Clk_GetTS_Unix(&ts_unix_sec);
-
-        if (valid == DEF_OK) {
-            APP_TRACE_INFO(("Timestamp Unix = %u\n", ts_unix_sec));
-        } else {
-            APP_TRACE_INFO(("Get TS Unix error\n"));
-          }
-    #if defined(CURRENT_UNIX_TS)
-        valid = Clk_SetTS_Unix(CURRENT_UNIX_TS);
-        if (valid != DEF_OK) {
-            APP_TRACE_INFO(("Clk_SetTS_Unix error\n"));
-            return -1;
-        }
-    #endif
-     initialized = 1;
-    }
-
-    #if defined(WOLFSSL_WOLFCRYPT_TEST)
-        wolfcrypt_test(NULL);
-    #endif
-    #if defined(WOLFSSL_BENCHMARK_TEST)
-        benchmark_test(NULL);
-    #endif
-    #if defined(WOLFSSL_CLIENT_TEST)
-        wolfssl_client_test();
-    #endif
-    #if defined(WOLFSSL_SERVER_TEST)
-        wolfssl_server_test();
-    #endif
-
-    return 0;
-}
--- a/IDE/Espressif/ESP-IDF/README.md
+++ b/IDE/Espressif/ESP-IDF/README.md
@@ -1,35 +0,0 @@
-# ESP-IDF port
-## Overview
- ESP-IDF development framework with wolfSSL by setting *WOLFSSL_ESPIDF* definition
-
-Including the following examples:
-
-* simple tls_client/server
-* crypt test
-* crypt benchmark
-
- The *user_settings.h* file enables some of the hardened settings.
-
-## Requirements
- 1. ESP-IDF development framework  
-    [https://docs.espressif.com/projects/esp-idf/en/latest/get-started/]
-
-    Note: This expects to use Linux version.
-
-## Setup
- 1. Run *setup.sh* to deploy files into ESP-IDF tree
- 2. Find Wolfssl files at /path/to/esp-idf/components/wolfssl/
- 3. Find Example programs under /path/to/esp-idf/examples/protocols/wolfssl_xxx
- 4. Uncomment out #define WOLFSSL_ESPIDF in /path/to/wolfssl/wolfssl/wolfcrypt/settings.h  
-    Uncomment out #define WOLFSSL_ESPWROOM32 in /path/to/wolfssl/wolfssl/wolfcrypt/settings.h
-
-## Configuration
- 1. The *user_settings.h* can be found in /path/to/esp-idf/components/wolfssl/include/user_settings.h
-
-## Build examples
- 1. See README in each example folder
-
-## Support
- For question please email [support@wolfssl.com]
-
- Note: This is tested with "Ubuntu 18.04.1 LTS" and ESP32-WROOM-32.
--- a/IDE/Espressif/ESP-IDF/README_32se.md
+++ b/IDE/Espressif/ESP-IDF/README_32se.md
@@ -1,58 +0,0 @@
-# DEMO program with ATECC608A on ESP-WROOM-32SE
-## Overview
- Running demo programs with ATECC608A on 32SE by setting *WOLFSSL_ESPWROOM32SE* definition
-
-Including the following examples:
-
-* simple tls_client/tls_server
-* crypt benchmark
-
- The *user_settings.h* file enables some of the hardened settings. 
- 
-## Requirements
- 1. ESP-IDF development framework  
-    [https://docs.espressif.com/projects/esp-idf/en/latest/get-started/]
-
- 2. Microchip CryptoAuthentication Library  
-    [https://github.com/MicrochipTech/cryptoauthlib]
-    
-## Setup
- 1. wolfSSL under ESP-IDF. Please see [README.md](https://github.com/wolfSSL/wolfssl/blob/master/IDE/Espressif/ESP-IDF/README.md)
- 2. CryptoAuthentication Library under ESP-IDF. Please see [README.md](https://github.com/miyazakh/cryptoauthlib_esp_idf/blob/master/README.md)
- 
- 3. Uncomment out #define WOLFSSL_ESPWROOM32SE in /path/to/wolfssl/wolfssl/wolfcrypt/settings.h
- 
-    Note : Need to enable WOLFSSL_ESPIDF  
-    Note : crypt test will fail if enabled WOLFSSL_ESPWROOM32SE
- 
-## Configuration
- 1. The *user_settings.h* can be found in /path/to/esp-idf/components/wolfssl/include/user_settings.h
-
-## Build examples
- 1. See README in each example folder
-
-## Benchmark
-w/o atecc608a
-```
-ECC      256 key gen         4 ops took 1.092 sec, avg 273.000 ms, 3.663 ops/sec
-ECDHE    256 agree           4 ops took 1.091 sec, avg 272.750 ms, 3.666 ops/sec
-ECDSA    256 sign            4 ops took 1.102 sec, avg 275.500 ms, 3.630 ops/sec
-ECDSA    256 verify          2 ops took 1.091 sec, avg 545.500 ms, 1.833 ops/sec
-```
-w/ atecc608a
-```
-ECC      256 key gen        11 ops took 1.074 sec, avg 97.636 ms, 10.242 ops/sec
-ECDHE    256 agree           6 ops took 1.068 sec, avg 178.000 ms, 5.618 ops/sec
-ECDSA    256 sign            8 ops took 1.009 sec, avg 126.125 ms, 7.929 ops/sec
-ECDSA    256 verify         14 ops took 1.079 sec, avg 77.071 ms, 12.975 ops/sec
-```
-
-## Support
- For question please email [support@wolfssl.com]
-
- Note: This is tested with the following condition:
- 
- Model    : ESP32-WROOM-32SE  
- ESP-IDF  : v3.3-beta1-39-g6cb37ecc5(commit hash : 6cb37ecc5)  
- CryptAuthLib: commit hash : c6b176e
- OS       : Ubuntu 18.04.1 LTS (Bionic Beaver)
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/CMakeLists.txt
@@ -1,6 +0,0 @@
-# The following lines of boilerplate have to be in your project's
-# CMakeLists in this exact order for cmake to work correctly
-cmake_minimum_required(VERSION 3.5)
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(wolfssl_benchmark)
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/Makefile
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/Makefile
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wolfssl_benchmark
-
-CFLAGS += -DWOLFSSL_USER_SETTINGS
-
-include $(IDF_PATH)/make/project.mk
-
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/README.md
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/README.md
@@ -1,16 +0,0 @@
-#wolfSSL Example
-
-The Example contains of wolfSSL benchmark program.
-
-1. "make menuconfig" to configure the program.  
-    1-1. Example Configuration ->
-
-    BENCH_ARG : argument that you want to use. Default is "-lng 0"  
-    The list of argument can be find in help.
-
-When you want to run the benchmark program
-
-1. "make flash" to compile and load the firmware
-2. "make monitor" to see the message
-
-See the README.md file in the upper level 'examples' directory for more information about examples.
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/CMakeLists.txt
@@ -1,10 +0,0 @@
-
-#
-# wolfssl benchmark test
-#
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSL_USER_SETTINGS")
-
-set(COMPONENT_SRCS "benchmark.c" "helper.c")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-register_component()
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/Kconfig.projbuild
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/Kconfig.projbuild
@@ -1,29 +0,0 @@
-menu "Example Configuration"
-
-config BENCH_ARGV
-    string "Arguments for benchmark test"
-    default "-lng 0"
-    help
-        -? <num>    Help, print this usage
-                     0: English, 1: Japanese
-        -csv        Print terminal output in csv format
-        -base10     Display bytes as power of 10 (eg 1 kB = 1000 Bytes)
-        -no_aad     No additional authentication data passed.
-        -dgst_full  Full digest operation performed.
-        -rsa_sign   Measure RSA sign/verify instead of encrypt/decrypt.
-        -<alg>      Algorithm to benchmark. Available algorithms include:
-                    cipher aes-cbc aes-gcm chacha20 chacha20-poly1305
-                    digest md5 poly1305 sha sha2 sha224 sha256 sha384 sha512 sha3
-                    sha3-224 sha3-256 sha3-384 sha3-512
-                    mac hmac hmac-md5 hmac-sha hmac-sha224 hmac-sha256 hmac-sha384
-                    hmac-sha512
-                    asym rsa rsa-sz dh ecc-kg ecc
-                    other rng
-        -lng <num>  Display benchmark result by specified language.
-                    0: English, 1: Japanese
-        <num>       Size of block in bytes
-        
-        e.g -lng 1
-        e.g sha
-
-endmenu
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/component.mk
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/component.mk
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the 
-# src/ directory, compile them and link them into lib(subdirectory_name).a 
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/helper.c
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/helper.c
@@ -1,171 +0,0 @@
-/* helper.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfcrypt/benchmark/benchmark.h>
-
-#include "sdkconfig.h"
-#include "esp_log.h"
-
-#define WOLFSSL_BENCH_ARGV                 CONFIG_BENCH_ARGV
-
-/* proto-type */
-extern void wolf_benchmark_task();
-static const char* const TAG = "wolfbenchmark";
-char* __argv[22];
-
-#if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \
-                                  && defined(WOLFSSL_ATECC508A)
-
-#include "wolfssl/wolfcrypt/port/atmel/atmel.h"
-
-/* when you need to use a custom slot allocation, */
-/* enable the definition CUSTOM_SLOT_ALLOCAION.   */
-#if defined(CUSTOM_SLOT_ALLOCATION)
-
-static byte mSlotList[ATECC_MAX_SLOT];
-
-/* initialize slot array */
-void my_atmel_slotInit()
-{
-    int i;
-    for(i = 0;i < ATECC_MAX_SLOT;i++) {
-        mSlotList[i] = ATECC_INVALID_SLOT;
-    }
-}
-
-/* allocate slot depending on slotType */
-int my_atmel_alloc(int slotType)
-{
-    int i, slot = -1;
-
-    switch(slotType){
-        case ATMEL_SLOT_ENCKEY:
-            slot = 4;
-            break;
-        case ATMEL_SLOT_DEVICE:
-            slot = 0;
-            break;
-        case ATMEL_SLOT_ECDHE:
-            slot = 0;
-            break;
-        case ATMEL_SLOT_ECDHE_ENC:
-            slot = 4;
-            break;
-        case ATMEL_SLOT_ANY:
-            for(i = 0;i < ATECC_MAX_SLOT;i++){
-                if(mSlotList[i] == ATECC_INVALID_SLOT){
-                    slot = i;
-                    break;
-                }
-            }
-    }
-
-    return slot;
-}
-
-/* free slot array       */
-void my_atmel_free(int slotId)
-{
-    if(slotId >= 0 && slotId < ATECC_MAX_SLOT){
-        mSlotList[slotId] = ATECC_INVALID_SLOT;
-    }
-}
-
-#endif /* CUSTOM_SLOT_ALLOCATION                                       */
-#endif /* WOLFSSL_ESPWROOM32SE && HAVE_PK_CALLBACK && WOLFSSL_ATECC508A */
-
-int construct_argv()
-{
-    int cnt = 0;
-    int i = 0;
-    int len = 0;
-    char *_argv;            /* buffer for copying the string    */
-    char *ch;               /* char pointer to trace the string */
-    char buff[16] = { 0 };  /* buffer for a argument copy       */
-
-    printf("arg:%s\n", CONFIG_BENCH_ARGV);
-    len = strlen(CONFIG_BENCH_ARGV);
-    _argv = (char*)malloc(len + 1);
-    if (!_argv) {
-        return -1;
-    }
-    memset(_argv, 0, len+1);
-    memcpy(_argv, CONFIG_BENCH_ARGV, len);
-    _argv[len] = '\0';
-    ch = _argv;
-
-    __argv[cnt] = malloc(10);
-    sprintf(__argv[cnt], "benchmark");
-    __argv[9] = '\0';
-    cnt = 1;
-
-    while (*ch != '\0')
-    {
-        /* skip white-space */
-        while (*ch == ' ') { ++ch; }
-
-        memset(buff, 0, sizeof(buff));
-        /* copy each args into buffer */
-        i = 0;
-        while ((*ch != ' ') && (*ch != '\0') && (i < 16)) {
-            buff[i] = *ch;
-            ++i;
-            ++ch;
-        }
-        /* copy the string into argv */
-        __argv[cnt] = (char*)malloc(i + 1);
-        memset(__argv[cnt], 0, i + 1);
-        memcpy(__argv[cnt], buff, i + 1);
-        /* next args */
-        ++cnt;
-    }
-
-    free(_argv);
-
-    return (cnt);
-}
-
-/* entry point */
-void app_main(void)
-{
-#ifndef NO_CRYPT_BENCHMARK
-
-/* when using atecc608a on esp32-wroom-32se */
-#if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \
-                                  && defined(WOLFSSL_ATECC508A)
-    #if defined(CUSTOM_SLOT_ALLOCATION)
-    my_atmel_slotInit();
-    /* to register the callback, it needs to be initialized. */
-    if ((wolfCrypt_Init()) != 0) {
-       ESP_LOGE(TAG, "wolfCrypt_Init failed");
-       return;
-    }
-    atmel_set_slot_allocator(my_atmel_alloc, my_atmel_free);
-    #endif
-#endif
-    wolf_benchmark_task();
-#else
-#endif /* NO_CRYPT_BENCHMARK */
-}
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/sdkconfig.defaults
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/sdkconfig.defaults
@@ -1,6 +0,0 @@
-CONFIG_BENCH_ARGV="-lng 0"
-CONFIG_MAIN_TASK_STACK_SIZE=7000
-CONFIG_FREERTOS_HZ=1000
-CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-170 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/CMakeLists.txt
@@ -1,6 +0,0 @@
-# The following lines of boilerplate have to be in your project's
-# CMakeLists in this exact order for cmake to work correctly
-cmake_minimum_required(VERSION 3.5)
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(wolfssl_client)
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/Makefile
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/Makefile
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wolfssl_client
-
-CFLAGS += -DWOLFSSL_USER_SETTINGS
-
-include $(IDF_PATH)/make/project.mk
-
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/README.md
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/README.md
@@ -1,22 +0,0 @@
-#wolfSSL Example
-
-The Example contains of wolfSSL tls client demo.
-
-1. "make menuconfig" to config the project  
-    1-1. Example Configuration ->
-
-          WIFI SSID: your own WIFI, which is connected to the Internet.(default is "myssid")  
-          WIFI Password: WIFI password, and default is "mypassword"  
-          Target host ip address : the host that you want to connect to.(default is 127.0.0.1)
-    
-    Note: the example program uses 11111 port. If you want to use different port  
-        , you need to modify DEFAULT_PORT definition in the code.
-
-When you want to test the wolfSSL client
-
-1. "make flash monitor" to load the firmware and see the context  
-2. You can use <wolfssl>/examples/server/server program for test.  
-
-         e.g. Launch ./examples/server/server -v 4 -b -i
-
-See the README.md file in the upper level 'examples' directory for more information about examples.
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/CMakeLists.txt
@@ -1,10 +0,0 @@
-
-#
-# wolfssl client test
-#
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSL_USER_SETTINGS")
-
-set(COMPONENT_SRCS "client-tls.c" "wifi_connect.c")
-set(COMPONENT_ADD_INCLUDEDIRS "." "./include")
-
-register_component()
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/Kconfig.projbuild
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/Kconfig.projbuild
@@ -1,21 +0,0 @@
-menu "Example Configuration"
-
-config WIFI_SSID
-    string "WiFi SSID"
-    default "myssid"
-    help
-        SSID (network name) for the example to connect to.
-
-config WIFI_PASSWORD
-    string "WiFi Password"
-    default "mypassword"
-    help
-        WiFi password (WPA or WPA2) for the example to use.
-
-config TARGET_HOST
-    string "Target host"
-    default "127.0.01.1"
-    help
-        host address for the example to connect
-        
-endmenu
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/client-tls.c
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/client-tls.c
@@ -1,290 +0,0 @@
-/* client-tls-callback.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-/* the usual suspects */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-/* ESP specific */
-#include "wifi_connect.h"
-
-/* socket includes */
-#include "lwip/netdb.h"
-#include "lwip/sockets.h"
-
-/* wolfSSL */
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/ssl.h>
-#include <wolfssl/certs_test.h>
-
-#ifdef WOLFSSL_TRACK_MEMORY
-    #include <wolfssl/wolfcrypt/mem_track.h>
-#endif
-
-static const char* const TAG = "tls_client";
-
-#if defined(DEBUG_WOLFSSL)
-
-static void ShowCiphers(void)
-{
-    char ciphers[4096];
-
-    int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers));
-
-    if (ret == WOLFSSL_SUCCESS)
-        printf("%s\n", ciphers);
-}
-
-#endif
-
-#if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \
-                                  && defined(WOLFSSL_ATECC508A)
-
-#include "wolfssl/wolfcrypt/port/atmel/atmel.h"
-
-/* when you want to use custom slot allocation */
-/* enable the definition CUSTOM_SLOT_ALLOCATION.*/
-
-#if defined(CUSTOM_SLOT_ALLOCATION)
-
-static byte mSlotList[ATECC_MAX_SLOT];
-
-int atmel_set_slot_allocator(atmel_slot_alloc_cb alloc,
-                                                atmel_slot_dealloc_cb dealloc);
-/* initialize slot array */
-void my_atmel_slotInit()
-{
-    int i;
-
-    for(i=0;i<ATECC_MAX_SLOT; i++) {
-        mSlotList[i] = ATECC_INVALID_SLOT;
-    }
-}
-/* allocate slot depending on slotType */
-int my_atmel_alloc(int slotType)
-{
-    int i, slot = -1;
-
-    switch(slotType){
-        case ATMEL_SLOT_ENCKEY:
-            slot = 2;
-            break;
-        case ATMEL_SLOT_DEVICE:
-            slot = 0;
-            break;
-        case ATMEL_SLOT_ECDHE:
-            slot = 0;
-            break;
-        case ATMEL_SLOT_ECDHE_ENC:
-            slot = 4;
-            break;
-        case ATMEL_SLOT_ANY:
-            for(i=0;i<ATECC_MAX_SLOT;i++){
-                if(mSlotList[i] == ATECC_INVALID_SLOT){
-                    slot = i;
-                    break;
-                }
-            }
-    }
-
-    return slot;
-}
-/* free slot array       */
-void my_atmel_free(int slotId)
-{
-    if(slotId >= 0 && slotId < ATECC_MAX_SLOT){
-        mSlotList[slotId] = ATECC_INVALID_SLOT;
-    }
-}
-#endif /* CUSTOM_SLOT_ALLOCATION                                       */
-#endif /* WOLFSSL_ESPWROOM32SE && HAVE_PK_CALLBACK && WOLFSSL_ATECC508A */
-
-/* client task */
-void tls_smp_client_task()
-{
-    int ret;
-    int sockfd;
-    int doPeerCheck;
-    int sendGet;
-    struct sockaddr_in servAddr;
-    char buff[256];
-    const char* ch = TLS_SMP_TARGET_HOST;
-    size_t len;
-    struct hostent *hp;
-    struct ip4_addr *ip4_addr;
-
-    /* declare wolfSSL objects */
-    WOLFSSL_CTX *ctx;
-    WOLFSSL *ssl;
-
-    WOLFSSL_ENTER("tls_smp_client_task");
-
-    doPeerCheck = 0;
-    sendGet = 0;
-
-#ifdef DEBUG_WOLFSSL
-    WOLFSSL_MSG("Debug ON");
-    wolfSSL_Debugging_ON();
-    ShowCiphers();
-#endif
-    /* Initialize wolfSSL */
-    wolfSSL_Init();
-
-    /* Create a socket that uses an internet IPv4 address,
-     * Sets the socket to be stream based (TCP),
-     * 0 means choose the default protocol. */
-    if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
-        ESP_LOGE(TAG,"ERROR: failed to create the socket\n");
-    }
-
-    ESP_LOGI(TAG, "get target IP address");
-
-    hp = gethostbyname(TLS_SMP_TARGET_HOST);
-    if (!hp) {
-         ESP_LOGE(TAG, "Failed to get host name.");
-         ip4_addr = NULL;
-    } else {
-
-         ip4_addr = (struct ip4_addr *)hp->h_addr;
-         ESP_LOGI(TAG, IPSTR, IP2STR(ip4_addr));
-    }
-    /* Create and initialize WOLFSSL_CTX */
-    if ((ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())) == NULL) {
-        ESP_LOGE(TAG,"ERROR: failed to create WOLFSSL_CTX\n");
-    }
-    WOLFSSL_MSG("Loading...cert");
-    /* Load client certificates into WOLFSSL_CTX */
-    if ((ret = wolfSSL_CTX_load_verify_buffer(ctx, ca_cert_der_2048,
-        sizeof_ca_cert_der_2048, WOLFSSL_FILETYPE_ASN1)) != SSL_SUCCESS) {
-        ESP_LOGE(TAG,"ERROR: failed to load %d, please check the file.\n",ret);
-    }
-    /* not peer check */
-    if( doPeerCheck == 0 ){
-        wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_NONE, 0);
-    } else {
-        WOLFSSL_MSG("Loading... our cert");
-        /* load our certificate */
-   	    if ((ret = wolfSSL_CTX_use_certificate_chain_buffer_format(ctx, client_cert_der_2048,
-            sizeof_client_cert_der_2048, WOLFSSL_FILETYPE_ASN1)) != SSL_SUCCESS) {
-            ESP_LOGE(TAG,"ERROR: failed to load chain %d, please check the file.\n",ret);
-        }
-
-        if ((ret = wolfSSL_CTX_use_PrivateKey_buffer(ctx, client_key_der_2048,
-            sizeof_client_key_der_2048, WOLFSSL_FILETYPE_ASN1))  != SSL_SUCCESS) {
-            wolfSSL_CTX_free(ctx); ctx = NULL;
-            ESP_LOGE(TAG,"ERROR: failed to load key %d, please check the file.\n", ret);
-        }
-
-        wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, 0);
-    }
-
-    /* Initialize the server address struct with zeros */
-    memset(&servAddr, 0, sizeof(servAddr));
-
-    /* Fill in the server address */
-    servAddr.sin_family = AF_INET;           /* using IPv4      */
-    servAddr.sin_port = htons(DEFAULT_PORT); /* on DEFAULT_PORT */
-
-    if(*ch >= '1' && *ch <= '9') {
-        /* Get the server IPv4 address from the command line call */
-        WOLFSSL_MSG("inet_pton");
-        if ((ret = inet_pton(AF_INET, TLS_SMP_TARGET_HOST,
-                 &servAddr.sin_addr)) != 1) {
-            ESP_LOGE(TAG,"ERROR: invalid address ret=%d\n", ret);
-        }
-    } else {
-        servAddr.sin_addr.s_addr = ip4_addr->addr;
-    }
-
-    /* Connect to the server */
-    sprintf(buff, "Connecting to server....%s(port:%d)", TLS_SMP_TARGET_HOST
-                                                      , DEFAULT_PORT);
-    WOLFSSL_MSG(buff);
-    printf("%s\n",buff);
-    if ((ret = connect(sockfd, (struct sockaddr *)&servAddr,
-                                    sizeof(servAddr))) == -1){
-        ESP_LOGE(TAG,"ERROR: failed to connect ret=%d\n", ret);
-    }
-
-    WOLFSSL_MSG("Create a WOLFSSL object");
-    /* Create a WOLFSSL object */
-    if ((ssl = wolfSSL_new(ctx)) == NULL) {
-        ESP_LOGE(TAG,"ERROR: failed to create WOLFSSL object\n");
-    }
-
-    /* when using atecc608a on esp32-wroom-32se */
-#if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \
-                                  && defined(WOLFSSL_ATECC508A)
-    atcatls_set_callbacks(ctx);
-    /* when using custom slot-allocation */
-    #if defined(CUSTOM_SLOT_ALLOCATION)
-    my_atmel_slotInit();
-    atmel_set_slot_allocator(my_atmel_alloc, my_atmel_free);
-    #endif
-#endif
-
-    /* Attach wolfSSL to the socket */
-    wolfSSL_set_fd(ssl, sockfd);
-
-    WOLFSSL_MSG("Connect to wolfSSL on the server side");
-    /* Connect to wolfSSL on the server side */
-    if (wolfSSL_connect(ssl) != SSL_SUCCESS) {
-        ESP_LOGE(TAG,"ERROR: failed to connect to wolfSSL\n");
-    }
-
-    /* Get a message for the server from stdin */
-    WOLFSSL_MSG("Message for server: ");
-    memset(buff, 0, sizeof(buff));
-
-    if(sendGet){
-        printf("SSL connect ok, sending GET...\n");
-        len = 28;
-        strncpy(buff, "GET /index.html HTTP/1.0\r\n\r\n", 28);
-        buff[len] = '\0';
-    } else {
-        sprintf(buff, "message from esp32 tls client\n");
-        len = strnlen(buff, sizeof(buff));
-    }
-    /* Send the message to the server */
-    if (wolfSSL_write(ssl, buff, len) != len) {
-        ESP_LOGE(TAG,"ERROR: failed to write\n");
-    }
-
-    /* Read the server data into our buff array */
-    memset(buff, 0, sizeof(buff));
-    if (wolfSSL_read(ssl, buff, sizeof(buff) - 1) == -1) {
-        ESP_LOGE(TAG,"ERROR: failed to read\n");
-    }
-
-    /* Print to stdout any data the server sends */
-    printf("Server:");
-    printf("%s", buff);
-    /* Cleanup and return */
-    wolfSSL_free(ssl);     /* Free the wolfSSL object                  */
-    wolfSSL_CTX_free(ctx); /* Free the wolfSSL context object          */
-    wolfSSL_Cleanup();     /* Cleanup the wolfSSL environment          */
-    close(sockfd);         /* Close the connection to the server       */
-
-    vTaskDelete(NULL);
-
-    return;                /* Return reporting a success               */
-}
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/component.mk
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/component.mk
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the 
-# src/ directory, compile them and link them into lib(subdirectory_name).a 
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/include/wifi_connect.h
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/include/wifi_connect.h
@@ -1,38 +0,0 @@
-/* user_settings.h
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-#ifndef _TLS_WIFI_H_
-#define _TLS_WIFI_H_
-
-#include "esp_log.h"
-#include "esp_wifi.h"
-#include "esp_event_loop.h"
-
-#define DEFAULT_PORT                     11111
-
-#define TLS_SMP_CLIENT_TASK_NAME         "tls_client_example"
-#define TLS_SMP_CLIENT_TASK_WORDS        10240
-#define TLS_SMP_CLIENT_TASK_PRIORITY     8
-
-#define TLS_SMP_WIFI_SSID                CONFIG_WIFI_SSID
-#define TLS_SMP_WIFI_PASS                CONFIG_WIFI_PASSWORD
-#define TLS_SMP_TARGET_HOST              CONFIG_TARGET_HOST
-
-#endif
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/wifi_connect.c
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/wifi_connect.c
@@ -1,146 +0,0 @@
-/* wifi_connect.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-/*ESP specific */
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/event_groups.h"
-#include "wifi_connect.h"
-#include "lwip/sockets.h"
-#include "lwip/netdb.h"
-#include "lwip/apps/sntp.h"
-#include "nvs_flash.h"
-
-const static int CONNECTED_BIT = BIT0;
-static EventGroupHandle_t wifi_event_group;
-/* proto-type */
-extern void tls_smp_client_task();
-static void tls_smp_client_init();
-
-const static char *TAG = "tls_client";
-
-static EventGroupHandle_t wifi_event_group;
-extern void tls_smp_client_task();
-
-static void set_time()
-{
-    /* set dummy wallclock time. */
-    struct timeval utctime;
-    struct timezone tz;
-    struct strftime_buf;
-    time_t now;
-    struct tm timeinfo;
-    char strftime_buf[64];
-
-    utctime.tv_sec = 1542008020; /* dummy time: Mon Nov 12 07:33:40 2018 */
-    utctime.tv_usec = 0;
-    tz.tz_minuteswest = 0;
-    tz.tz_dsttime = 0;
-    
-    settimeofday(&utctime, &tz);
-
-    time(&now);
-    localtime_r(&now, &timeinfo);
-
-    strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo);
-    ESP_LOGI(TAG, "The current date/time is: %s", strftime_buf);
-
-    /* wait until wifi connect */
-    xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT,
-                                            false, true, portMAX_DELAY);
-    /* now we start client tasks. */
-    tls_smp_client_init();
-}
-
-/* create task */
-static void tls_smp_client_init(void)
-{
-    int ret;
-    xTaskHandle _handle;
-    /* http://esp32.info/docs/esp_idf/html/dd/d3c/group__xTaskCreate.html */
-    ret = xTaskCreate(tls_smp_client_task,
-                      TLS_SMP_CLIENT_TASK_NAME,
-                      TLS_SMP_CLIENT_TASK_WORDS,
-                      NULL,
-                      TLS_SMP_CLIENT_TASK_PRIORITY,
-                      &_handle);
-
-    if (ret != pdPASS) {
-        ESP_LOGI(TAG, "create thread %s failed", TLS_SMP_CLIENT_TASK_NAME);
-    }
-}
-/* event hander for wifi events */
-static esp_err_t wifi_event_handler(void *ctx, system_event_t *event)
-{
-    switch (event->event_id)
-    {
-    case SYSTEM_EVENT_STA_START:
-        esp_wifi_connect();
-        break;
-    case SYSTEM_EVENT_STA_GOT_IP:
-        ESP_LOGI(TAG, "got ip:%s",
-                 ip4addr_ntoa(&event->event_info.got_ip.ip_info.ip));
-        /* http://esp32.info/docs/esp_idf/html/dd/d08/group__xEventGroupSetBits.html */
-        xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
-        break;
-    case SYSTEM_EVENT_STA_DISCONNECTED:
-        esp_wifi_connect();
-        xEventGroupClearBits(wifi_event_group, CONNECTED_BIT);
-        break;
-    default:
-        break;
-    }
-    return ESP_OK;
-}
-/* entry point */
-void app_main(void)
-{
-    ESP_LOGI(TAG, "Start app_main...");
-    ESP_ERROR_CHECK(nvs_flash_init());
-
-    ESP_LOGI(TAG, "Initialize wifi");
-    /* TCP/IP adapter initialization */
-    tcpip_adapter_init();
-
-    /* */
-    wifi_event_group = xEventGroupCreate();
-    ESP_ERROR_CHECK(esp_event_loop_init(wifi_event_handler, NULL));
-    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-    ESP_ERROR_CHECK(esp_wifi_init(&cfg));
-
-    wifi_config_t wifi_config = {
-        .sta = {
-            .ssid = TLS_SMP_WIFI_SSID,
-            .password = TLS_SMP_WIFI_PASS,
-        },
-    };
-    /* WiFi station mode */
-    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
-    /* Wifi Set the configuration of the ESP32 STA or AP */ 
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
-    /* Start Wifi */
-    ESP_ERROR_CHECK(esp_wifi_start() );
-
-    ESP_LOGI(TAG, "wifi_init_sta finished.");
-    ESP_LOGI(TAG, "connect to ap SSID:%s password:%s",
-                                        TLS_SMP_WIFI_SSID, TLS_SMP_WIFI_PASS);
-    ESP_LOGI(TAG, "Set dummy time...");
-    set_time();
-}
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/CMakeLists.txt
@@ -1,7 +0,0 @@
-# The following lines of boilerplate have to be in your project's
-# CMakeLists in this exact order for cmake to work correctly
-cmake_minimum_required(VERSION 3.5)
-
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(wolfssl_server)
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/Makefile
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/Makefile
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := tls_server
-
-CFLAGS += -DWOLFSSL_USER_SETTINGS
-
-include $(IDF_PATH)/make/project.mk
-
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/README.md
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/README.md
@@ -1,22 +0,0 @@
-#wolfSSL Example
-
-The Example contains a wolfSSL simple server.
-
-1. "make menuconfigure" to configure the project
-
-    1-1. Example Configuration ->
-           WIFI SSID : your own WIFI, which is connected to the Internet.(default is "myssid")  
-           WIFI Password : WIFI password, and default is "mypassword"
-
-When you want to test the wolfSSL simple server demo
-
-1. "make flash" to compile the code and load the firmware
-2. "make monitor" to see the context. The assigned IP address can be found in output message.
-3. Once the server connects to the wifi, it is waiting for client request.  
-    ("Waiting for a connection..." message will be displayed.)
-   
-4. You can use <wolfssl>/examples/client to test the server  
-    e.g ./example/client/client -h xx.xx.xx
-
-See the README.md file in the upper level 'examples' directory for more information about examples.
-
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/CMakeLists.txt
@@ -1,10 +0,0 @@
-
-#
-# wolfssl server test
-#
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSL_USER_SETTINGS")
-
-set(COMPONENT_SRCS "server-tls.c" "wifi_connect.c")
-set(COMPONENT_ADD_INCLUDEDIRS "." "./include")
-
-register_component()
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/Kconfig.projbuild
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/Kconfig.projbuild
@@ -1,15 +0,0 @@
-menu "Example Configuration"
-
-config WIFI_SSID
-    string "WiFi SSID"
-    default "myssid"
-    help
-        SSID (network name) for the example to connect to.
-
-config WIFI_PASSWORD
-    string "WiFi Password"
-    default "mypassword"
-    help
-        WiFi password (WPA or WPA2) for the example to use.
-
-endmenu
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/component.mk
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/component.mk
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/include/wifi_connect.h
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/include/wifi_connect.h
@@ -1,37 +0,0 @@
-/* wifi_connect.h 
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-#ifndef _TLS_WIFI_H_
-#define _TLS_WIFI_H_
-
-#include "esp_log.h"
-#include "esp_wifi.h"
-#include "esp_event_loop.h"
-
-#define DEFAULT_PORT                     11111
-
-#define TLS_SMP_SERVER_TASK_NAME         "tls_sever_example"
-#define TLS_SMP_SERVER_TASK_WORDS        10240
-#define TLS_SMP_SERVER_TASK_PRIORITY     8
-
-#define TLS_SMP_WIFI_SSID                CONFIG_WIFI_SSID
-#define TLS_SMP_WIFI_PASS                CONFIG_WIFI_PASSWORD
-
-#endif
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/server-tls.c
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/server-tls.c
@@ -1,266 +0,0 @@
-/* server-tls-callback.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-/* the usual suspects */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-/* socket includes */
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <unistd.h>
-
-/* wolfSSL */
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/ssl.h>
-#include <wolfssl/certs_test.h>
-
-/* ESP specific */
-#include "wifi_connect.h"
-
-#ifdef WOLFSSL_TRACK_MEMORY
-    #include <wolfssl/wolfcrypt/mem_track.h>
-#endif
-
-static const char* const TAG = "tls_server";
-
-#if defined(DEBUG_WOLFSSL)
-
-static void ShowCiphers(void)
-{
-    char ciphers[4096];
-
-    int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers));
-
-    if (ret == WOLFSSL_SUCCESS)
-        printf("%s\n", ciphers);
-}
-
-#endif
-
-#if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \
-                                  && defined(WOLFSSL_ATECC508A)
-
-#include "wolfssl/wolfcrypt/port/atmel/atmel.h"
-
-/* when you want to use a custom slot allocation */
-/* enable the difinition CUSTOM_SLOT_ALLOCATION. */
-
-#if defined(CUSTOM_SLOT_ALLOCATION)
-
-static byte mSlotList[ATECC_MAX_SLOT];
-
-int atmel_set_slot_allocator(atmel_slot_alloc_cb alloc, atmel_slot_dealloc_cb dealloc);
-
-/* initialize slot array */
-void my_atmel_slotInit()
-{
-    int i;
-
-    for(i=0;i<ATECC_MAX_SLOT; i++) {
-        mSlotList[i] = ATECC_INVALID_SLOT;
-    }
-}
-
-/* allocate slot depending on slotType */
-int my_atmel_alloc(int slotType)
-{
-    int i, slot = -1;
-
-    switch(slotType){
-        case ATMEL_SLOT_ENCKEY:
-            slot = 4;
-            break;
-        case ATMEL_SLOT_DEVICE:
-            slot = 0;
-            break;
-        case ATMEL_SLOT_ECDHE:
-            slot = 0;
-            break;
-        case ATMEL_SLOT_ECDHE_ENC:
-            slot = 4;
-            break;
-        case ATMEL_SLOT_ANY:
-            for(i=0;i<ATECC_MAX_SLOT;i++){
-                if(mSlotList[i] == ATECC_INVALID_SLOT){
-                    slot = i;
-                    break;
-                }
-            }
-    }
-
-    return slot;
-}
-
-/* free slot array       */
-void my_atmel_free(int slotId)
-{
-    if(slotId >= 0 && slotId < ATECC_MAX_SLOT){
-        mSlotList[slotId] = ATECC_INVALID_SLOT;
-    }
-}
-#endif /* CUSTOM_SLOT_ALLOCATION                                       */
-#endif /* WOLFSSL_ESPWROOM32SE && HAVE_PK_CALLBACK && WOLFSSL_ATECC508A */
-
-void tls_smp_server_task()
-{
-    int                sockfd;
-    int                connd;
-    struct sockaddr_in servAddr;
-    struct sockaddr_in clientAddr;
-    socklen_t          size = sizeof(clientAddr);
-    char               buff[256];
-    size_t             len;
-    int                shutdown = 0;
-    int                ret;
-
-    /* declare wolfSSL objects */
-    WOLFSSL_CTX* ctx;
-    WOLFSSL*     ssl;
-
-    WOLFSSL_ENTER("tls_smp_server_task");
-
-#ifdef DEBUG_WOLFSSL
-    WOLFSSL_MSG("Debug ON");
-    wolfSSL_Debugging_ON();
-    ShowCiphers();
-#endif
-
-    /* Initialize wolfSSL */
-    WOLFSSL_MSG("Start wolfSSL_Init()");
-    wolfSSL_Init();
-
-    /* Create a socket that uses an internet IPv4 address,
-     * Sets the socket to be stream based (TCP),
-     * 0 means choose the default protocol. */
-    WOLFSSL_MSG( "start socket())");
-    if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
-        ESP_LOGE(TAG, "ERROR: failed to create the socket");
-    }
-
-    /* Create and initialize WOLFSSL_CTX */
-    WOLFSSL_MSG("Create and initialize WOLFSSL_CTX");
-    if ((ctx = wolfSSL_CTX_new(wolfSSLv23_server_method())) == NULL) {
-        ESP_LOGE(TAG, "ERROR: failed to create WOLFSSL_CTX");
-    }
-    WOLFSSL_MSG("Loading certificate...");
-    /* Load server certificates into WOLFSSL_CTX */
-
-    if ((ret = wolfSSL_CTX_use_certificate_buffer(ctx, server_cert_der_2048,
-                        sizeof_server_cert_der_2048,
-                        WOLFSSL_FILETYPE_ASN1)) != SSL_SUCCESS) {
-        ESP_LOGE(TAG, "ERROR: failed to load cert");
-    }
-    WOLFSSL_MSG("Loading key info...");
-    /* Load server key into WOLFSSL_CTX */
-
-    if((ret=wolfSSL_CTX_use_PrivateKey_buffer(ctx,
-                            server_key_der_2048, sizeof_server_key_der_2048,
-                            WOLFSSL_FILETYPE_ASN1)) != SSL_SUCCESS) {
-        ESP_LOGE(TAG, "ERROR: failed to load privatekey");
-    }
-
-    /* TO DO when using ECDSA, it loads the provisioned certificate and present it.*/
-    /* TO DO when using ECDSA, it uses the generated key instead of loading key    */
-
-    /* Initialize the server address struct with zeros */
-    memset(&servAddr, 0, sizeof(servAddr));
-    /* Fill in the server address */
-    servAddr.sin_family      = AF_INET;             /* using IPv4      */
-    servAddr.sin_port        = htons(DEFAULT_PORT); /* on DEFAULT_PORT */
-    servAddr.sin_addr.s_addr = INADDR_ANY;          /* from anywhere   */
-
-    /* Bind the server socket to our port */
-    if (bind(sockfd, (struct sockaddr*)&servAddr, sizeof(servAddr)) == -1) {
-         ESP_LOGE(TAG, "ERROR: failed to bind");
-    }
-
-    /* Listen for a new connection, allow 5 pending connections */
-    if (listen(sockfd, 5) == -1) {
-         ESP_LOGE(TAG, "ERROR: failed to listen");
-    }
-
-#if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \
-                                  && defined(WOLFSSL_ATECC508A)
-    atcatls_set_callbacks(ctx);
-    /* when using a custom slot allocation */
-    #if defined(CUSTOM_SLOT_ALLOCATION)
-    my_atmel_slotInit();
-    atmel_set_slot_allocator(my_atmel_alloc, my_atmel_free);
-    #endif
-#endif
-
-    /* Continue to accept clients until shutdown is issued */
-    while (!shutdown) {
-         WOLFSSL_MSG("Waiting for a connection...");
-        /* Accept client connections */
-        if ((connd = accept(sockfd, (struct sockaddr*)&clientAddr, &size))
-            == -1) {
-             ESP_LOGE(TAG, "ERROR: failed to accept the connection");
-        }
-        /* Create a WOLFSSL object */
-        if ((ssl = wolfSSL_new(ctx)) == NULL) {
-             ESP_LOGE(TAG, "ERROR: failed to create WOLFSSL object");
-        }
-        /* Attach wolfSSL to the socket */
-        wolfSSL_set_fd(ssl, connd);
-        /* Establish TLS connection */
-        ret = wolfSSL_accept(ssl);
-        if (ret != SSL_SUCCESS) {
-            ESP_LOGE(TAG, "wolfSSL_accept error %d", wolfSSL_get_error(ssl, ret));
-        }
-        WOLFSSL_MSG("Client connected successfully");
-        /* Read the client data into our buff array */
-        memset(buff, 0, sizeof(buff));
-        if (wolfSSL_read(ssl, buff, sizeof(buff)-1) == -1) {
-            ESP_LOGE(TAG, "ERROR: failed to read");
-        }
-        /* Print to stdout any data the client sends */
-        WOLFSSL_MSG("Client sends:");
-        WOLFSSL_MSG(buff);
-        /* Check for server shutdown command */
-        if (strncmp(buff, "shutdown", 8) == 0) {
-            WOLFSSL_MSG("Shutdown command issued!");
-            shutdown = 1;
-        }
-        /* Write our reply into buff */
-        memset(buff, 0, sizeof(buff));
-        memcpy(buff, "I hear ya fa shizzle!", sizeof(buff));
-        len = strnlen(buff, sizeof(buff));
-        /* Reply back to the client */
-        if (wolfSSL_write(ssl, buff, len) != len) {
-            ESP_LOGE(TAG, "ERROR: failed to write");
-        }
-        /* Cleanup after this connection */
-        wolfSSL_free(ssl);      /* Free the wolfSSL object              */
-        close(connd);           /* Close the connection to the client   */
-    }
-    /* Cleanup and return */
-    wolfSSL_CTX_free(ctx);  /* Free the wolfSSL context object          */
-    wolfSSL_Cleanup();      /* Cleanup the wolfSSL environment          */
-    close(sockfd);          /* Close the socket listening for clients   */
-
-    vTaskDelete(NULL);
-
-    return;                 /* Return reporting a success               */
-}
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/wifi_connect.c
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/wifi_connect.c
@@ -1,143 +0,0 @@
-/* wifi_connect.c 
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-/*ESP specific */
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/event_groups.h"
-#include "wifi_connect.h"
-#include "lwip/sockets.h"
-#include "lwip/netdb.h"
-#include "lwip/apps/sntp.h"
-#include "nvs_flash.h"
-
-const static int CONNECTED_BIT = BIT0;
-static EventGroupHandle_t wifi_event_group;
-/* prefix for logging */
-const static char *TAG = "tls_server";
-/* proto-type difinition */
-extern void tls_smp_server_task();
-static void tls_smp_server_init();
-
-static void set_time()
-{
-    /* set dummy wallclock time. */
-    struct timeval utctime;
-    struct timezone tz;
-    struct strftime_buf;
-    time_t now;
-    struct tm timeinfo;
-    char strftime_buf[64];
-
-    utctime.tv_sec = 1542008020; /* dummy time: Mon Nov 12 07:33:40 2018 */
-    utctime.tv_usec = 0;
-    tz.tz_minuteswest = 0;
-    tz.tz_dsttime = 0;
-    
-    settimeofday(&utctime, &tz);
-
-    time(&now);
-    localtime_r(&now, &timeinfo);
-
-    strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo);
-    ESP_LOGI(TAG, "The current date/time is: %s", strftime_buf);
-
-    /* wait until wifi connect */
-    xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT,
-                                            false, true, portMAX_DELAY);
-    /* now we start client tasks. */
-    tls_smp_server_init();
-}
-
-/* create task */
-static void tls_smp_server_init(void)
-{
-    int ret;
-    xTaskHandle _handle;
-    /* http://esp32.info/docs/esp_idf/html/dd/d3c/group__xTaskCreate.html */
-    ret = xTaskCreate(tls_smp_server_task,
-                      TLS_SMP_SERVER_TASK_NAME,
-                      TLS_SMP_SERVER_TASK_WORDS,
-                      NULL,
-                      TLS_SMP_SERVER_TASK_PRIORITY,
-                      &_handle);
-
-    if (ret != pdPASS) {
-        ESP_LOGI(TAG, "create thread %s failed", TLS_SMP_SERVER_TASK_NAME);
-    }
-}
-/* event hander for wifi events */
-static esp_err_t wifi_event_handler(void *ctx, system_event_t *event)
-{
-    switch (event->event_id)
-    {
-    case SYSTEM_EVENT_STA_START:
-        esp_wifi_connect();
-        break;
-    case SYSTEM_EVENT_STA_GOT_IP:
-        ESP_LOGI(TAG, "got ip:%s",
-                 ip4addr_ntoa(&event->event_info.got_ip.ip_info.ip));
-        /* http://esp32.info/docs/esp_idf/html/dd/d08/group__xEventGroupSetBits.html */
-        xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
-        break;
-    case SYSTEM_EVENT_STA_DISCONNECTED:
-        esp_wifi_connect();
-        xEventGroupClearBits(wifi_event_group, CONNECTED_BIT);
-        break;
-    default:
-        break;
-    }
-    return ESP_OK;
-}
-/* entry point */
-void app_main(void)
-{
-    ESP_LOGI(TAG, "Start app_main...");
-    ESP_ERROR_CHECK(nvs_flash_init());
-
-    ESP_LOGI(TAG, "Initialize wifi");
-    /* TCP/IP adapter initialization */
-    tcpip_adapter_init();
-
-    /* */
-    wifi_event_group = xEventGroupCreate();
-    ESP_ERROR_CHECK(esp_event_loop_init(wifi_event_handler, NULL));
-    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-    ESP_ERROR_CHECK(esp_wifi_init(&cfg));
-
-    wifi_config_t wifi_config = {
-        .sta = {
-            .ssid = TLS_SMP_WIFI_SSID,
-            .password = TLS_SMP_WIFI_PASS,
-        },
-    };
-    /* WiFi station mode */
-    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
-    /* Wifi Set the configuration of the ESP32 STA or AP */ 
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
-    /* Start Wifi */
-    ESP_ERROR_CHECK(esp_wifi_start() );
-
-    ESP_LOGI(TAG, "wifi_init_sta finished.");
-    ESP_LOGI(TAG, "connect to ap SSID:%s password:%s",
-                                        TLS_SMP_WIFI_SSID, TLS_SMP_WIFI_PASS);
-    ESP_LOGI(TAG, "Set Dummy time...");
-    set_time();
-}
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_test/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_test/CMakeLists.txt
@@ -1,6 +0,0 @@
-# The following five lines of boilerplate have to be in your project's
-# CMakeLists in this exact order for cmake to work correctly
-cmake_minimum_required(VERSION 3.5)
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(wolfssl_test)
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_test/Makefile
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_test/Makefile
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wolfssl_test
-
-CFLAGS += -DWOLFSSL_USER_SETTINGS
-
-include $(IDF_PATH)/make/project.mk
-
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_test/README.md
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_test/README.md
@@ -1,10 +0,0 @@
-#wolfSSL Example
-
-The Example contains of wolfSSL test program.
-
-When you want to run the benchmark program
-1. "make menuconfig" to configure the program,first
-2. "make flash" to compile and load the firmware
-3. "make monitor" to see the message
-
-See the README.md file in the upper level 'examples' directory for more information about examples.
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_test/main/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_test/main/CMakeLists.txt
@@ -1,10 +0,0 @@
-
-#
-# wolfssl crypt test
-#
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSL_USER_SETTINGS")
-
-set(COMPONENT_SRCS "test.c")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-register_component()
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_test/main/component.mk
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_test/main/component.mk
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_test/sdkconfig.defaults
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_test/sdkconfig.defaults
@@ -1,2 +0,0 @@
-CONFIG_MAIN_TASK_STACK_SIZE=9000
-CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=
--- a/IDE/Espressif/ESP-IDF/libs/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/libs/CMakeLists.txt
@@ -1,37 +0,0 @@
-#
-# cmake for wolfssl
-# 
-cmake_minimum_required(VERSION 3.5)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSL_USER_SETTINGS")
-
-set(CMAKE_CURRENT_SOURCE_DIR ".")
-set(WOLFSSL_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-set(INCLUDE_PATH ${WOLFSSL_ROOT})
-
-set(COMPONENT_SRCDIRS "./src/"
-                      "./wolfcrypt/src/"
-                      "./wolfcrypt/src/port/Espressif/"
-                      "./wolfcrypt/src/port/atmel/"
-                      )
-
-set(COMPONENT_REQUIRES lwip)
-
-set(COMPONENT_ADD_INCLUDEDIRS
-    "."
-    "./include"
-    "../freertos/include/freertos" 
-    "${WOLFSSL_ROOT}"
-    )
-
-if(IS_DIRECTORY ${IDF_PATH}/components/cryptoauthlib)
-    list(APPEND COMPONENT_ADD_INCLUDEDIRS "../cryptoauthlib/lib")
-endif()
-
-set(COMPONENT_SRCEXCLUDE
-    "wolfcrypt/src/aes_asm.S"
-    "wolfcrypt/src/evp.c"
-    "wolfcrypt/src/misc.c"
-    "src/bio.c"
-    )
-
-register_component()
--- a/IDE/Espressif/ESP-IDF/libs/component.mk
+++ b/IDE/Espressif/ESP-IDF/libs/component.mk
@@ -1,17 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := . ./include
-COMPONENT_ADD_INCLUDEDIRS += ../freertos/include/freertos/
-
-COMPONENT_SRCDIRS := src wolfcrypt/src
-COMPONENT_SRCDIRS += wolfcrypt/src/port/Espressif
-COMPONENT_SRCDIRS += wolfcrypt/src/port/atmel
-
-CFLAGS +=-DWOLFSSL_USER_SETTINGS
-
-COMPONENT_OBJEXCLUDE := wolfcrypt/src/aes_asm.o
-COMPONENT_OBJEXCLUDE += wolfcrypt/src/evp.o
-COMPONENT_OBJEXCLUDE += wolfcrypt/src/misc.o
-COMPONENT_OBJEXCLUDE += src/bio.o
--- a/IDE/Espressif/ESP-IDF/setup.sh
+++ b/IDE/Espressif/ESP-IDF/setup.sh
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-# check if IDF_PATH is set
-if [ -z "$IDF_PATH" ]; then
-    echo "Please follows the instruction of ESP-IDF installation and set IDF_PATH."
-    exit 1
-fi
-
-RMDCMD='/bin/rm -rf'
-MKDCMD='/bin/mkdir'
-CPDCMD='/bin/cp'
-
-SCRIPTDIR=`dirname $0`
-SCRIPTDIR=`cd $SCRIPTDIR && pwd -P`
-WOLFSSL_ESPIDFDIR=${SCRIPTDIR}
-WOLFSSL_ESPIDFDIR=`cd $WOLFSSL_ESPIDFDIR && pwd -P`
-BASEDIR=${SCRIPTDIR}/../../../
-BASEDIR=`cd ${BASEDIR} && pwd -P`
-
-# echo $WOLFSSL_ESPIDFDIR
-
-WOLFSSLLIB_TRG_DIR=${IDF_PATH}/components/wolfssl
-WOLFSSLEXP_TRG_DIR=${IDF_PATH}/examples/protocols
-
-if [ ! -d $IDF_PATH ]; then
-    echo "ESP-IDF Development Framework doesn't exist.: $IDF_PATH"
-    exit 1
-fi
-
-# Copy files into ESP-IDF development framework
-pushd $IDF_PATH > /dev/null
-
-echo "Copy files into $IDF_PATH"
-# Remove/Create directories
-${RMDCMD} ${WOLFSSLLIB_TRG_DIR}/
-${MKDCMD} ${WOLFSSLLIB_TRG_DIR}/
-
-${MKDCMD} ${WOLFSSLLIB_TRG_DIR}/src
-${MKDCMD} ${WOLFSSLLIB_TRG_DIR}/wolfcrypt
-${MKDCMD} ${WOLFSSLLIB_TRG_DIR}/wolfcrypt/src
-${MKDCMD} ${WOLFSSLLIB_TRG_DIR}/wolfssl
-${MKDCMD} ${WOLFSSLLIB_TRG_DIR}/test
-${MKDCMD} ${WOLFSSLLIB_TRG_DIR}/include
-
-popd > /dev/null             # $WOLFSSL_ESPIDFDIR
-pushd ${BASEDIR} > /dev/null # WOLFSSL TOP DIR
-
-# copying ... files in src/ into $WOLFSSLLIB_TRG_DIR/src
-${CPDCMD} ./src/*.c ${WOLFSSLLIB_TRG_DIR}/src/
-
-
-${CPDCMD} -r ./wolfcrypt/src/*.{c,i} ${WOLFSSLLIB_TRG_DIR}/wolfcrypt/src/
-${CPDCMD} -r ./wolfcrypt/src/port  ${WOLFSSLLIB_TRG_DIR}/wolfcrypt/src/port/
-${CPDCMD} -r ./wolfcrypt/test ${WOLFSSLLIB_TRG_DIR}/wolfcrypt/
-${CPDCMD} -r ./wolfcrypt/benchmark ${WOLFSSLLIB_TRG_DIR}/wolfcrypt/
-
-${CPDCMD} -r ./wolfssl/*.h ${WOLFSSLLIB_TRG_DIR}/wolfssl/
-${CPDCMD} -r ./wolfssl/wolfcrypt ${WOLFSSLLIB_TRG_DIR}/wolfssl/
-# user_settings.h
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/user_settings.h ${WOLFSSLLIB_TRG_DIR}/include/
-
-# unit test app
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/test/* ${WOLFSSLLIB_TRG_DIR}/test/
-
-popd > /dev/null # 
-
-${CPDCMD} ./libs/CMakeLists.txt ${WOLFSSLLIB_TRG_DIR}/
-${CPDCMD} ./libs/component.mk ${WOLFSSLLIB_TRG_DIR}/
-
-pushd ${BASEDIR} > /dev/null # WOLFSSL TOP DIR
-
-# Benchmark program
-${RMDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/main/
-
-${CPDCMD} -r ./wolfcrypt/benchmark/benchmark.c ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/main/
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_benchmark/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_benchmark/main/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/main/
-
-# Crypt Test program
-${RMDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/main/
-
-${CPDCMD} -r ./wolfcrypt/test/test.c ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/main/
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_test/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_test/main/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/main/
-
-# TLS Client program
-${RMDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/main/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/main/include
-
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_client/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_client/main/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/main/
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_client/main/include/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/main/include/
-
-# TLS Server program
-${RMDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/main/
-${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/main/include
-
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_server/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_server/main/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/main/
-${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_server/main/include/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/main/include/
-
-popd > /dev/null # 
-
-exit 1
--- a/IDE/Espressif/ESP-IDF/test/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/test/CMakeLists.txt
@@ -1,6 +0,0 @@
-set(COMPONENT_SRCDIRS ".")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-set(COMPONENT_REQUIRES unity test_utils wolfssl)
-
-register_component()
--- a/IDE/Espressif/ESP-IDF/test/README.md
+++ b/IDE/Espressif/ESP-IDF/test/README.md
@@ -1,11 +0,0 @@
-# wolfSSL unit-test app
-
-The test contains of wolfSSL unit-test app on Unity.
-
-When you want to run the app  
-1. Copy *test.c* file at /path/to/esp-idf/components/wolfssl/wolfcrypt/test/ folder to the  wolfssl/test folder  
-2. Go to /esp-idf/tools/unit-test-app/ folder  
-3. "make menuconfig" to configure unit test app.  
-4. "make TEST_COMPONENTS=wolfssl" to build wolfssl unit test app.  
-
-See [https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/unit-tests.html] for more information about unit test app.
--- a/IDE/Espressif/ESP-IDF/test/component.mk
+++ b/IDE/Espressif/ESP-IDF/test/component.mk
@@ -1,10 +0,0 @@
-#
-#Component Makefile
-#
-
-#CFLAGS := -v
-CFLAGS += -DNO_MAIN_DRIVER
-CFLAGS += -DWOLFSSL_USER_SETTINGS
-#CFLAGS += -DWOLFSSL_ESP32WROOM32_CRYPT_DEBUG
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
--- a/IDE/Espressif/ESP-IDF/test/test_wolfssl.c
+++ b/IDE/Espressif/ESP-IDF/test/test_wolfssl.c
--- a/IDE/Espressif/ESP-IDF/user_settings.h
+++ b/IDE/Espressif/ESP-IDF/user_settings.h
@@ -1,82 +0,0 @@
-/* user_settings.h
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#define BENCH_EMBEDDED
-#define USE_CERT_BUFFERS_2048
-
-/* TLS 1.3                                 */
-#define WOLFSSL_TLS13
-#define HAVE_TLS_EXTENSIONS
-#define WC_RSA_PSS
-#define HAVE_HKDF
-#define HAVE_AEAD
-#define HAVE_SUPPORTED_CURVES
-
-/* when you want to use SINGLE THREAD */
-/* #define SINGLE_THREADED */
-#define NO_FILESYSTEM
-
-#define HAVE_AESGCM
-/* when you want to use SHA384 */
-/* #define WOLFSSL_SHA384 */
-#define WOLFSSL_SHA512
-#define HAVE_ECC
-#define HAVE_CURVE25519
-#define CURVE25519_SMALL
-#define HAVE_ED25519
-
-/* esp32-wroom-32se specific definition */
-#if defined(WOLFSSL_ESPWROOM32SE)
-    #define WOLFSSL_ATECC508A
-    #define HAVE_PK_CALLBACKS
-    /* when you want to use a custom slot allocation for ATECC608A */
-    /* unless your configuration is unusual, you can use default   */
-    /* implementation.                                             */
-    /* #define CUSTOM_SLOT_ALLOCATION                              */
-#endif
-
-/* rsa primitive specific definition */
-#if defined(WOLFSSL_ESPWROOM32) || defined(WOLFSSL_ESPWROOM32SE)
-    /* Define USE_FAST_MATH and SMALL_STACK                        */
-    #define ESP32_USE_RSA_PRIMITIVE
-    /* threshold for performance adjustment for hw primitive use   */
-    /* X bits of G^X mod P greater than                            */ 
-    #define EPS_RSA_EXPT_XBTIS           36
-    /* X and Y of X * Y mod P greater than                         */
-    #define ESP_RSA_MULM_BITS            2000
-#endif
-
-/* debug options */
-/* #define DEBUG_WOLFSSL */
-/* #define WOLFSSL_ESP32WROOM32_CRYPT_DEBUG */
-/* #define WOLFSSL_ATECC508A_DEBUG          */
-
-/* date/time                               */
-/* if it cannot adjust time in the device, */
-/* enable macro below                      */
-/* #define NO_ASN_TIME */
-/* #define XTIME time */
-
-/* when you want not to use HW acceleration */
-/* #define NO_ESP32WROOM32_CRYPT */
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH*/
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_AES */
-/* #define NO_WOLFSSL_ESP32WROOM32_CRYPT_RSA_PRI */
--- a/IDE/GCC-ARM/Header/user_settings.h
+++ b/IDE/GCC-ARM/Header/user_settings.h
@@ -1,641 +0,0 @@
-/* user_settings.h
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-/* Custom wolfSSL user settings for GCC ARM */
-
-#ifndef WOLFSSL_USER_SETTINGS_H
-#define WOLFSSL_USER_SETTINGS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* Platform */
-/* ------------------------------------------------------------------------- */
-#undef  WOLFSSL_GENERAL_ALIGNMENT
-#define WOLFSSL_GENERAL_ALIGNMENT   4
-
-#undef  SINGLE_THREADED
-#define SINGLE_THREADED
-
-#undef  WOLFSSL_SMALL_STACK
-#define WOLFSSL_SMALL_STACK
-
-#undef  WOLFSSL_USER_IO
-#define WOLFSSL_USER_IO
-
-
-/* ------------------------------------------------------------------------- */
-/* Math Configuration */
-/* ------------------------------------------------------------------------- */
-#undef  SIZEOF_LONG_LONG
-#define SIZEOF_LONG_LONG 8
-
-#undef USE_FAST_MATH
-#if 1
-    #define USE_FAST_MATH
-
-    #undef  TFM_TIMING_RESISTANT
-    #define TFM_TIMING_RESISTANT
-
-    /* Optimizations */
-    //#define TFM_ARM
-#endif
-
-/* Wolf Single Precision Math */
-#undef WOLFSSL_SP
-#if 0
-    #define WOLFSSL_SP
-    #define WOLFSSL_SP_SMALL      /* use smaller version of code */
-    #define WOLFSSL_HAVE_SP_RSA
-    #define WOLFSSL_HAVE_SP_DH
-    #define WOLFSSL_HAVE_SP_ECC
-    #define WOLFSSL_SP_CACHE_RESISTANT
-    //#define WOLFSSL_SP_MATH     /* only SP math - eliminates fast math code */
-
-    /* 64 or 32 bit version */
-    //#define WOLFSSL_SP_ASM      /* required if using the ASM versions */
-    //#define WOLFSSL_SP_ARM32_ASM
-    //#define WOLFSSL_SP_ARM64_ASM
-#endif
-
-/* ------------------------------------------------------------------------- */
-/* FIPS - Requires eval or license from wolfSSL */
-/* ------------------------------------------------------------------------- */
-#undef  HAVE_FIPS
-#if 0
-    #define HAVE_FIPS
-
-    #undef  HAVE_FIPS_VERSION
-    #define HAVE_FIPS_VERSION 2
-
-    #ifdef SINGLE_THREADED
-        #undef  NO_THREAD_LS
-        #define NO_THREAD_LS
-    #endif
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* Crypto */
-/* ------------------------------------------------------------------------- */
-/* RSA */
-#undef NO_RSA
-#if 1
-    #ifdef USE_FAST_MATH
-        /* Maximum math bits (Max RSA key bits * 2) */
-        #undef  FP_MAX_BITS
-        #define FP_MAX_BITS     4096
-    #endif
-
-    /* half as much memory but twice as slow */
-    #undef  RSA_LOW_MEM
-    //#define RSA_LOW_MEM
-
-    /* Enables blinding mode, to prevent timing attacks */
-    #if 1
-        #undef  WC_RSA_BLINDING
-        #define WC_RSA_BLINDING
-    #else
-        #undef  WC_NO_HARDEN
-        #define WC_NO_HARDEN
-    #endif
-
-    /* RSA PSS Support */
-    #if 0
-        #define WC_RSA_PSS
-    #endif
-
-    #if 0
-        #define WC_RSA_NO_PADDING
-    #endif
-#else
-    #define NO_RSA
-#endif
-
-/* ECC */
-#undef HAVE_ECC
-#if 1
-    #define HAVE_ECC
-
-    /* Manually define enabled curves */
-    #undef  ECC_USER_CURVES
-    #define ECC_USER_CURVES
-
-    #ifdef ECC_USER_CURVES
-        /* Manual Curve Selection */
-        //#define HAVE_ECC192
-        //#define HAVE_ECC224
-        #undef NO_ECC256
-        //#define HAVE_ECC384
-        //#define HAVE_ECC521
-    #endif
-
-    /* Fixed point cache (speeds repeated operations against same private key) */
-    #undef  FP_ECC
-    //#define FP_ECC
-    #ifdef FP_ECC
-        /* Bits / Entries */
-        #undef  FP_ENTRIES
-        #define FP_ENTRIES  2
-        #undef  FP_LUT
-        #define FP_LUT      4
-    #endif
-
-    /* Optional ECC calculation method */
-    /* Note: doubles heap usage, but slightly faster */
-    #undef  ECC_SHAMIR
-    #define ECC_SHAMIR
-
-    /* Reduces heap usage, but slower */
-    #undef  ECC_TIMING_RESISTANT
-    #define ECC_TIMING_RESISTANT
-
-    /* Enable cofactor support */
-    #ifdef HAVE_FIPS
-        #undef  HAVE_ECC_CDH
-        #define HAVE_ECC_CDH
-    #endif
-
-    /* Validate import */
-    #ifdef HAVE_FIPS
-        #undef  WOLFSSL_VALIDATE_ECC_IMPORT
-        #define WOLFSSL_VALIDATE_ECC_IMPORT
-    #endif
-
-    /* Compressed Key Support */
-    #undef  HAVE_COMP_KEY
-    //#define HAVE_COMP_KEY
-
-    /* Use alternate ECC size for ECC math */
-    #ifdef USE_FAST_MATH
-        #ifdef NO_RSA
-            /* Custom fastmath size if not using RSA */
-            /* MAX = ROUND32(ECC BITS 256) + SIZE_OF_MP_DIGIT(32) */
-            #undef  FP_MAX_BITS
-            #define FP_MAX_BITS     (256 + 32)
-        #else
-            #undef  ALT_ECC_SIZE
-            #define ALT_ECC_SIZE
-        #endif
-
-        /* Speedups specific to curve */
-        #ifndef NO_ECC256
-            #undef  TFM_ECC256
-            #define TFM_ECC256
-        #endif
-    #endif
-#endif
-
-/* DH */
-#undef  NO_DH
-#if 1
-    /* Use table for DH instead of -lm (math) lib dependency */
-    #if 0
-        #define WOLFSSL_DH_CONST
-        #define HAVE_FFDHE_2048
-        #define HAVE_FFDHE_4096
-        //#define HAVE_FFDHE_6144
-        //#define HAVE_FFDHE_8192
-    #endif
-
-    #ifdef HAVE_FIPS
-        #define WOLFSSL_VALIDATE_FFC_IMPORT
-        #define HAVE_FFDHE_Q
-    #endif
-#else
-    #define NO_DH
-#endif
-
-
-/* AES */
-#undef NO_AES
-#if 1
-	#undef  HAVE_AES_CBC
-	#define HAVE_AES_CBC
-
-	#undef  HAVE_AESGCM
-    #define HAVE_AESGCM
-
-    /* GCM Method: GCM_SMALL, GCM_WORD32 or GCM_TABLE */
-    #define GCM_SMALL
-
-    #undef  WOLFSSL_AES_DIRECT
-    //#define WOLFSSL_AES_DIRECT
-
-    #undef  HAVE_AES_ECB
-    //#define HAVE_AES_ECB
-
-    #undef  WOLFSSL_AES_COUNTER
-    //#define WOLFSSL_AES_COUNTER
-
-    #undef  HAVE_AESCCM
-    //#define HAVE_AESCCM
-#else
-    #define NO_AES
-#endif
-
-
-/* DES3 */
-#undef NO_DES3
-#if 0
-#else
-    #define NO_DES3
-#endif
-
-/* ChaCha20 / Poly1305 */
-#undef HAVE_CHACHA
-#undef HAVE_POLY1305
-#if 0
-    #define HAVE_CHACHA
-    #define HAVE_POLY1305
-
-    /* Needed for Poly1305 */
-    #undef  HAVE_ONE_TIME_AUTH
-    #define HAVE_ONE_TIME_AUTH
-#endif
-
-/* Ed25519 / Curve25519 */
-#undef HAVE_CURVE25519
-#undef HAVE_ED25519
-#if 0
-    #define HAVE_CURVE25519
-    #define HAVE_ED25519 /* ED25519 Requires SHA512 */
-
-    /* Optionally use small math (less flash usage, but much slower) */
-    #if 1
-        #define CURVED25519_SMALL
-    #endif
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* Hashing */
-/* ------------------------------------------------------------------------- */
-/* Sha */
-#undef NO_SHA
-#if 1
-    /* 1k smaller, but 25% slower */
-    //#define USE_SLOW_SHA
-#else
-    #define NO_SHA
-#endif
-
-/* Sha256 */
-#undef NO_SHA256
-#if 1
-    /* not unrolled - ~2k smaller and ~25% slower */
-    //#define USE_SLOW_SHA256
-
-    /* Sha224 */
-    #if 0
-        #define WOLFSSL_SHA224
-    #endif
-#else
-    #define NO_SHA256
-#endif
-
-/* Sha512 */
-#undef WOLFSSL_SHA512
-#if 0
-    #define WOLFSSL_SHA512
-
-    /* Sha384 */
-    #undef  WOLFSSL_SHA384
-    #if 0
-        #define WOLFSSL_SHA384
-    #endif
-
-    /* over twice as small, but 50% slower */
-    //#define USE_SLOW_SHA512
-#endif
-
-/* Sha3 */
-#undef WOLFSSL_SHA3
-#if 0
-    #define WOLFSSL_SHA3
-#endif
-
-/* MD5 */
-#undef  NO_MD5
-#if 0
-
-#else
-    #define NO_MD5
-#endif
-
-/* HKDF */
-#undef HAVE_HKDF
-#if 0
-    #define HAVE_HKDF
-#endif
-
-/* CMAC */
-#undef WOLFSSL_CMAC
-#if 0
-    #define WOLFSSL_CMAC
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* Benchmark / Test */
-/* ------------------------------------------------------------------------- */
-/* Use reduced benchmark / test sizes */
-#undef  BENCH_EMBEDDED
-#define BENCH_EMBEDDED
-
-#undef  USE_CERT_BUFFERS_2048
-#define USE_CERT_BUFFERS_2048
-
-//#undef  USE_CERT_BUFFERS_1024
-//#define USE_CERT_BUFFERS_1024
-
-#undef  USE_CERT_BUFFERS_256
-#define USE_CERT_BUFFERS_256
-
-
-/* ------------------------------------------------------------------------- */
-/* Debugging */
-/* ------------------------------------------------------------------------- */
-
-#undef DEBUG_WOLFSSL
-#undef NO_ERROR_STRINGS
-#if 0
-    #define DEBUG_WOLFSSL
-#else
-    #if 0
-        #define NO_ERROR_STRINGS
-    #endif
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* Memory */
-/* ------------------------------------------------------------------------- */
-
-/* Override Memory API's */
-#if 0
-    #undef  XMALLOC_OVERRIDE
-    #define XMALLOC_OVERRIDE
-
-    /* prototypes for user heap override functions */
-    /* Note: Realloc only required for normal math */
-    #include <stddef.h>  /* for size_t */
-    extern void *myMalloc(size_t n, void* heap, int type);
-    extern void myFree(void *p, void* heap, int type);
-    extern void *myRealloc(void *p, size_t n, void* heap, int type);
-
-    #define XMALLOC(n, h, t)     myMalloc(n, h, t)
-    #define XFREE(p, h, t)       myFree(p, h, t)
-    #define XREALLOC(p, n, h, t) myRealloc(p, n, h, t)
-#endif
-
-#if 0
-    /* Static memory requires fast math */
-    #define WOLFSSL_STATIC_MEMORY
-
-    /* Disable fallback malloc/free */
-    #define WOLFSSL_NO_MALLOC
-    #if 1
-        #define WOLFSSL_MALLOC_CHECK /* trap malloc failure */
-    #endif
-#endif
-
-/* Memory callbacks */
-#if 0
-    #undef  USE_WOLFSSL_MEMORY
-    #define USE_WOLFSSL_MEMORY
-
-    /* Use this to measure / print heap usage */
-    #if 1
-        #undef  WOLFSSL_TRACK_MEMORY
-        #define WOLFSSL_TRACK_MEMORY
-
-        #undef  WOLFSSL_DEBUG_MEMORY
-        #define WOLFSSL_DEBUG_MEMORY
-    #endif
-#else
-    #ifndef WOLFSSL_STATIC_MEMORY
-        #define NO_WOLFSSL_MEMORY
-        /* Otherwise we will use stdlib malloc, free and realloc */
-    #endif
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* Port */
-/* ------------------------------------------------------------------------- */
-
-/* Override Current Time */
-/* Allows custom "custom_time()" function to be used for benchmark */
-#define WOLFSSL_USER_CURRTIME
-#define WOLFSSL_GMTIME
-#define USER_TICKS
-extern unsigned long my_time(unsigned long* timer);
-#define XTIME my_time
-
-
-/* ------------------------------------------------------------------------- */
-/* RNG */
-/* ------------------------------------------------------------------------- */
-
-/* Seed Source */
-/* Size of returned HW RNG value */
-#define CUSTOM_RAND_TYPE      unsigned int
-extern unsigned int my_rng_seed_gen(void);
-#undef  CUSTOM_RAND_GENERATE
-#define CUSTOM_RAND_GENERATE  my_rng_seed_gen
-
-/* Choose RNG method */
-#if 1
-    /* Use built-in P-RNG (SHA256 based) with HW RNG */
-    /* P-RNG + HW RNG (P-RNG is ~8K) */
-    #undef  HAVE_HASHDRBG
-    #define HAVE_HASHDRBG
-#else
-    #undef  WC_NO_HASHDRBG
-    #define WC_NO_HASHDRBG
-
-    /* Bypass P-RNG and use only HW RNG */
-    extern int my_rng_gen_block(unsigned char* output, unsigned int sz);
-    #undef  CUSTOM_RAND_GENERATE_BLOCK
-    #define CUSTOM_RAND_GENERATE_BLOCK  my_rng_gen_block
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* Custom Standard Lib */
-/* ------------------------------------------------------------------------- */
-/* Allows override of all standard library functions */
-#undef STRING_USER
-#if 0
-    #define STRING_USER
-
-    #include <string.h>
-
-    #undef  USE_WOLF_STRSEP
-    #define USE_WOLF_STRSEP
-    #define XSTRSEP(s1,d)     wc_strsep((s1),(d))
-
-    #undef  USE_WOLF_STRTOK
-    #define USE_WOLF_STRTOK
-    #define XSTRTOK(s1,d,ptr) wc_strtok((s1),(d),(ptr))
-
-    #define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n))
-
-    #define XMEMCPY(d,s,l)    memcpy((d),(s),(l))
-    #define XMEMSET(b,c,l)    memset((b),(c),(l))
-    #define XMEMCMP(s1,s2,n)  memcmp((s1),(s2),(n))
-    #define XMEMMOVE(d,s,l)   memmove((d),(s),(l))
-
-    #define XSTRLEN(s1)       strlen((s1))
-    #define XSTRNCPY(s1,s2,n) strncpy((s1),(s2),(n))
-    #define XSTRSTR(s1,s2)    strstr((s1),(s2))
-
-    #define XSTRNCMP(s1,s2,n)     strncmp((s1),(s2),(n))
-    #define XSTRNCAT(s1,s2,n)     strncat((s1),(s2),(n))
-    #define XSTRNCASECMP(s1,s2,n) strncasecmp((s1),(s2),(n))
-
-    #define XSNPRINTF snprintf
-#endif
-
-
-
-/* ------------------------------------------------------------------------- */
-/* Enable Features */
-/* ------------------------------------------------------------------------- */
-#undef WOLFSSL_TLS13
-#if 0
-    #define WOLFSSL_TLS13
-#endif
-
-#undef WOLFSSL_KEY_GEN
-#if 0
-    #define WOLFSSL_KEY_GEN
-#endif
-
-#if defined(HAVE_FIPS) && !defined(WOLFSSL_KEY_GEN)
-    #define WOLFSSL_OLD_PRIME_CHECK
-#endif
-
-#undef  KEEP_PEER_CERT
-//#define KEEP_PEER_CERT
-
-#undef  HAVE_COMP_KEY
-//#define HAVE_COMP_KEY
-
-#undef  HAVE_TLS_EXTENSIONS
-#define HAVE_TLS_EXTENSIONS
-
-#undef  HAVE_SUPPORTED_CURVES
-#define HAVE_SUPPORTED_CURVES
-
-#undef  WOLFSSL_BASE64_ENCODE
-#define WOLFSSL_BASE64_ENCODE
-
-/* TLS Session Cache */
-#if 0
-    #define SMALL_SESSION_CACHE
-#else
-    #define NO_SESSION_CACHE
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* Disable Features */
-/* ------------------------------------------------------------------------- */
-#undef  NO_WOLFSSL_SERVER
-//#define NO_WOLFSSL_SERVER
-
-#undef  NO_WOLFSSL_CLIENT
-//#define NO_WOLFSSL_CLIENT
-
-#undef  NO_CRYPT_TEST
-//#define NO_CRYPT_TEST
-
-#undef  NO_CRYPT_BENCHMARK
-//#define NO_CRYPT_BENCHMARK
-
-#undef  WOLFCRYPT_ONLY
-//#define WOLFCRYPT_ONLY
-
-/* In-lining of misc.c functions */
-/* If defined, must include wolfcrypt/src/misc.c in build */
-/* Slower, but about 1k smaller */
-#undef  NO_INLINE
-//#define NO_INLINE
-
-#undef  NO_FILESYSTEM
-#define NO_FILESYSTEM
-
-#undef  NO_WRITEV
-#define NO_WRITEV
-
-#undef  NO_MAIN_DRIVER
-#define NO_MAIN_DRIVER
-
-#undef  NO_DEV_RANDOM
-#define NO_DEV_RANDOM
-
-#undef  NO_DSA
-#define NO_DSA
-
-#undef  NO_RC4
-#define NO_RC4
-
-#undef  NO_OLD_TLS
-#define NO_OLD_TLS
-
-#undef  NO_HC128
-#define NO_HC128
-
-#undef  NO_RABBIT
-#define NO_RABBIT
-
-#undef  NO_PSK
-#define NO_PSK
-
-#undef  NO_MD4
-#define NO_MD4
-
-#undef  NO_PWDBASED
-#define NO_PWDBASED
-
-#undef  NO_CODING
-//#define NO_CODING
-
-#undef  NO_ASN_TIME
-//#define NO_ASN_TIME
-
-#undef  NO_CERTS
-//#define NO_CERTS
-
-#undef  NO_SIG_WRAPPER
-//#define NO_SIG_WRAPPER
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WOLFSSL_USER_SETTINGS_H */
-
--- a/IDE/GCC-ARM/Makefile
+++ b/IDE/GCC-ARM/Makefile
@@ -1,16 +0,0 @@
-BUILD_DIR = ./Build
-
-all: WolfSSLStaticLib WolfCryptTest WolfCryptBench WolfSSLClient
-
-WolfCryptTest:
-	$(MAKE) -f Makefile.test
-WolfCryptBench:
-	$(MAKE) -f Makefile.bench
-WolfSSLClient:
-	$(MAKE) -f Makefile.client
-WolfSSLStaticLib:
-	$(MAKE) -f Makefile.static
-
-clean:
-	rm -f $(BUILD_DIR)/*.elf $(BUILD_DIR)/*.hex $(BUILD_DIR)/*.map
-	rm -f $(BUILD_DIR)/*.o $(BUILD_DIR)/*.a $(BUILD_DIR)/*.sym $(BUILD_DIR)/*.disasm
--- a/IDE/GCC-ARM/Makefile.bench
+++ b/IDE/GCC-ARM/Makefile.bench
@@ -1,7 +0,0 @@
-# Project name
-BIN = WolfCryptBench
-SRC_C = ./Source/benchmark_main.c
-
-all: build_hex
-
-include Makefile.common
--- a/IDE/GCC-ARM/Makefile.client
+++ b/IDE/GCC-ARM/Makefile.client
@@ -1,7 +0,0 @@
-# Project name
-BIN = WolfSSLClient
-SRC_C = ./Source/tls_client.c
-
-all: build_hex
-
-include Makefile.common
--- a/IDE/GCC-ARM/Makefile.common
+++ b/IDE/GCC-ARM/Makefile.common
@@ -1,213 +0,0 @@
-# Set to @ if you want to suppress command echo
-CMD_ECHO = 
-
-# Important directories
-BUILD_DIR = ./Build
-
-# Toolchain location and prefix
-#TOOLCHAIN = 
-TOOLCHAIN = /opt/gcc-arm-none-eabi/bin/arm-none-eabi-
-
-# Tools selection
-CC = $(TOOLCHAIN)gcc
-AS = $(TOOLCHAIN)gcc
-LD = $(TOOLCHAIN)gcc
-AR = $(TOOLCHAIN)ar
-NM = $(TOOLCHAIN)nm
-OBJCOPY = $(TOOLCHAIN)objcopy
-OBJDUMP = $(TOOLCHAIN)objdump
-SIZE = $(TOOLCHAIN)size
-
-# Includes
-INC = -I./Header \
-	  -I./Source \
-	  -I../..
-
-# Defines
-DEF = -DWOLFSSL_USER_SETTINGS
-
-# Architecture
-ARCHFLAGS = -mcpu=cortex-m0 -mthumb -mabi=aapcs -DUSE_WOLF_ARM_STARTUP
-#ARCHFLAGS = -mcpu=cortex-r5 -mthumb -mabi=aapcs
-#ARCHFLAGS = -mcpu=cortex-a53 -mthumb -mabi=aapcs
-
-# Compiler and linker flags
-ASFLAGS = $(ARCHFLAGS)
-CFLAGS = $(ARCHFLAGS) -std=gnu99 -Wall -Wno-cpp
-LDFLAGS = $(ARCHFLAGS)
-
-# LD: Link with nosys
-LDFLAGS += --specs=nosys.specs
-
-# LD: Link with nano or rdimon implementation for standard library
-LDFLAGS += --specs=nano.specs
-#LDFLAGS += --specs=rdimon.specs
-
-# LD: generate map
-LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(BIN).map
-
-# LD: Entry point
-LDFLAGS += -Wl,-ereset_handler
-
-# Math lib (for DH)
-LIBS = -lm
-
-# Memory Map
-SRC_LD = -T./linker.ld
-
-# Optimization level and place functions / data into separate sections to allow dead code removal
-CFLAGS += -Os -ffunction-sections -fdata-sections -fno-builtin
-# Remove unused sections and link time optimizations
-LDFLAGS += -Wl,--gc-sections -flto
-
-# Debugging
-#DBGFLAGS = -ggdb -g3
-CFLAGS += $(DBGFLAGS)
-LDFLAGS += $(DBGFLAGS)
-
-
-# FILES
-
-# Port and Test/Benchmark
-SRC_C += ./Source/wolf_main.c
-SRC_C += ./Source/armtarget.c
-SRC_C += ../../wolfcrypt/test/test.c
-SRC_C += ../../wolfcrypt/benchmark/benchmark.c
-
-# WOLFSSL TLS FILES
-SRC_C += ../../src/crl.c
-SRC_C += ../../src/internal.c
-SRC_C += ../../src/keys.c
-SRC_C += ../../src/ocsp.c
-SRC_C += ../../src/sniffer.c
-SRC_C += ../../src/ssl.c
-SRC_C += ../../src/tls.c
-SRC_C += ../../src/tls13.c
-SRC_C += ../../src/wolfio.c
-
-# wolfCrypt Core (FIPS)
-SRC_C += ../../wolfcrypt/src/wolfcrypt_first.c
-SRC_C += ../../wolfcrypt/src/aes.c
-SRC_C += ../../wolfcrypt/src/cmac.c
-SRC_C += ../../wolfcrypt/src/des3.c
-SRC_C += ../../wolfcrypt/src/dh.c
-SRC_C += ../../wolfcrypt/src/ecc.c
-SRC_C += ../../wolfcrypt/src/hmac.c
-SRC_C += ../../wolfcrypt/src/random.c
-SRC_C += ../../wolfcrypt/src/rsa.c
-SRC_C += ../../wolfcrypt/src/sha.c
-SRC_C += ../../wolfcrypt/src/sha256.c
-SRC_C += ../../wolfcrypt/src/sha512.c
-SRC_C += ../../wolfcrypt/src/sha3.c
-SRC_C += ../../wolfcrypt/src/fips.c
-SRC_C += ../../wolfcrypt/src/fips_test.c
-SRC_C += ../../wolfcrypt/src/wolfcrypt_last.c
-
-# wolfCrypt Additional
-SRC_C += ../../wolfcrypt/src/asn.c
-SRC_C += ../../wolfcrypt/src/chacha.c
-SRC_C += ../../wolfcrypt/src/cmac.c
-SRC_C += ../../wolfcrypt/src/coding.c
-SRC_C += ../../wolfcrypt/src/compress.c
-SRC_C += ../../wolfcrypt/src/cpuid.c
-SRC_C += ../../wolfcrypt/src/cryptocb.c
-SRC_C += ../../wolfcrypt/src/curve25519.c
-SRC_C += ../../wolfcrypt/src/ed25519.c
-SRC_C += ../../wolfcrypt/src/error.c
-SRC_C += ../../wolfcrypt/src/fe_low_mem.c
-SRC_C += ../../wolfcrypt/src/fe_operations.c
-SRC_C += ../../wolfcrypt/src/ge_low_mem.c
-SRC_C += ../../wolfcrypt/src/ge_operations.c
-SRC_C += ../../wolfcrypt/src/hash.c
-SRC_C += ../../wolfcrypt/src/integer.c
-SRC_C += ../../wolfcrypt/src/logging.c
-SRC_C += ../../wolfcrypt/src/md5.c
-SRC_C += ../../wolfcrypt/src/memory.c
-SRC_C += ../../wolfcrypt/src/misc.c
-SRC_C += ../../wolfcrypt/src/pkcs12.c
-SRC_C += ../../wolfcrypt/src/pkcs7.c
-SRC_C += ../../wolfcrypt/src/poly1305.c
-SRC_C += ../../wolfcrypt/src/pwdbased.c
-SRC_C += ../../wolfcrypt/src/signature.c
-SRC_C += ../../wolfcrypt/src/srp.c
-SRC_C += ../../wolfcrypt/src/sp_arm32.c
-SRC_C += ../../wolfcrypt/src/sp_arm64.c
-SRC_C += ../../wolfcrypt/src/sp_c32.c
-SRC_C += ../../wolfcrypt/src/sp_int.c
-SRC_C += ../../wolfcrypt/src/tfm.c
-SRC_C += ../../wolfcrypt/src/wc_encrypt.c
-SRC_C += ../../wolfcrypt/src/wc_port.c
-SRC_C += ../../wolfcrypt/src/wolfevent.c
-SRC_C += ../../wolfcrypt/src/wolfmath.c
-
-# wolfCrypt non-standard algorithms (disabled by default)
-SRC_C += ../../wolfcrypt/src/arc4.c
-SRC_C += ../../wolfcrypt/src/blake2b.c
-SRC_C += ../../wolfcrypt/src/camellia.c
-SRC_C += ../../wolfcrypt/src/dsa.c
-SRC_C += ../../wolfcrypt/src/hc128.c
-SRC_C += ../../wolfcrypt/src/idea.c
-SRC_C += ../../wolfcrypt/src/md2.c
-SRC_C += ../../wolfcrypt/src/md4.c
-SRC_C += ../../wolfcrypt/src/rabbit.c
-SRC_C += ../../wolfcrypt/src/ripemd.c
-
-
-FILENAMES_C = $(notdir $(SRC_C))
-FILENAMES_C := $(filter-out evp.c, $(FILENAMES_C))
-OBJS_C = $(addprefix $(BUILD_DIR)/, $(FILENAMES_C:.c=.o))
-vpath %.c $(dir $(SRC_C))
-
-
-build_hex: $(BUILD_DIR) $(BUILD_DIR)/$(BIN).hex
-	@echo ""
-	$(CMD_ECHO) @$(SIZE) $(BUILD_DIR)/$(BIN).elf
-
-build_static: $(BUILD_DIR) $(BUILD_DIR)/$(BIN).a
-	@echo ""
-	$(CMD_ECHO) @$(SIZE) $(BUILD_DIR)/$(BIN).a
-
-$(BUILD_DIR):
-	$(CMD_ECHO) mkdir -p $(BUILD_DIR)
-
-$(BUILD_DIR)/$(BIN).hex: $(BUILD_DIR)/$(BIN).elf
-	@echo "Generating HEX binary: $(notdir $@)"
-	$(CMD_ECHO) $(OBJCOPY) -O ihex $< $@
-
-$(BUILD_DIR)/%.o: %.s
-	@echo "Compiling ASM file: $(notdir $<)"
-	$(CMD_ECHO) $(AS) $(ASFLAGS) $(DEF) $(INC) -c -o $@ $<
-
-$(BUILD_DIR)/%.o: %.c
-	@echo "Compiling C file: $(notdir $<)"
-	$(CMD_ECHO) $(CC) $(CFLAGS) $(DEF) $(INC) -c -o $@ $<
-
-$(BUILD_DIR)/$(BIN).elf: $(OBJS_ASM) $(OBJS_C)
-	@echo "Linking ELF binary: $(notdir $@)"
-	$(CMD_ECHO) $(LD) $(LDFLAGS) $(SRC_LD) -o $@ $^ $(LIBS)
-
-	@echo "Generating name list: $(BIN).sym"
-	$(CMD_ECHO) $(NM) -n $@ > $(BUILD_DIR)/$(BIN).sym
-
-	@echo "Showing final size:"
-	$(CMD_ECHO) ls -la $@
-
-	@echo "Generating disassembly: $(BIN).disasm"
-	$(CMD_ECHO) $(OBJDUMP) -S $@ > $(BUILD_DIR)/$(BIN).disasm
-
-$(BUILD_DIR)/$(BIN).a: $(OBJS_ASM) $(OBJS_C)
-	@echo "Building static library: $(notdir $@)"
-	$(CMD_ECHO) $(AR) -r $@ $^
-
-	@echo "Generating name list: $(BIN).sym"
-	$(CMD_ECHO) $(NM) -n $@ > $(BUILD_DIR)/$(BIN).sym
-
-	@echo "Showing final size:"
-	$(CMD_ECHO) ls -la $@
-
-	@echo "Generating disassembly: $(BIN).disasm"
-	$(CMD_ECHO) $(OBJDUMP) -S $@ > $(BUILD_DIR)/$(BIN).disasm
-
-clean:
-	rm -f $(BUILD_DIR)/*.elf $(BUILD_DIR)/*.hex $(BUILD_DIR)/*.map
-	rm -f $(BUILD_DIR)/*.o $(BUILD_DIR)/*.a $(BUILD_DIR)/*.sym $(BUILD_DIR)/*.disasm
--- a/IDE/GCC-ARM/Makefile.static
+++ b/IDE/GCC-ARM/Makefile.static
@@ -1,6 +0,0 @@
-# Project name
-BIN = libwolfssl
-
-all: build_static
-
-include Makefile.common
--- a/IDE/GCC-ARM/Makefile.test
+++ b/IDE/GCC-ARM/Makefile.test
@@ -1,7 +0,0 @@
-# Project name
-BIN = WolfCryptTest
-SRC_C = ./Source/test_main.c
-
-all: build_hex
-
-include Makefile.common
--- a/IDE/GCC-ARM/README.md
+++ b/IDE/GCC-ARM/README.md
@@ -1,125 +0,0 @@
-# Example Project for GCC ARM
-
-This example is for Cortex M series, but can be adopted for other architectures.
-
-## Design
-
-* All library options are defined in `Header/user_settings.h`.
-* The memory map is located in the linker file in `linker.ld`.
-* Entry point function is `reset_handler` in `armtarget.c`.
-* The RTC and RNG hardware interface needs implemented for real production applications in `armtarget.c`
-
-## Building
-
-1. Make sure you have `gcc-arm-none-eabi` installed.
-2. Modify the `Makefile.common`:
-  * Use correct toolchain path `TOOLCHAIN`.
-  * Use correct architecture 'ARCHFLAGS'. See [GCC ARM Options](https://gcc.gnu.org/onlinedocs/gcc-4.7.3/gcc/ARM-Options.html) `-mcpu=name`.
-  * Confirm memory map in linker.ld matches your flash/ram or comment out `SRC_LD = -T./linker.ld` in Makefile.common.
-3. Use `make` to build the static library (libwolfssl.a), wolfCrypt test/benchmark and wolfSSL TLS client targets as `.elf` and `.hex` in `/Build`.
-
-
-## Building for Raspberry Pi
-
-Example `Makefile.common` changes for Raspberry Pi with Cortex-A53:
-
-1. In Makefile.common change `ARCHFLAGS` to `-mcpu=cortex-a53 -mthumb`.
-2. Comment out `SRC_LD`, since custom memory map is not applicable.
-3. Clear `TOOLCHAIN`, so it will use default `gcc`. Set `TOOLCHAIN = `
-4. Comment out `LDFLAGS += --specs=nano.specs` and `LDFLAGS += --specs=nosys.specs` to nosys and nano.
-
-Note: To comment out a line in a Makefile use place `#` in front of line.
-
-## Building for FIPS
-
-1. Request evaluation from wolfSSL by emailing fips@wolfss.com.
-2. Modify user_settings.h so section for `HAVE_FIPS` is enabled.
-3. Use `make`.
-4. Run the wolfCrypt test `./Build/WolfCryptTest.elf` to generate the FIPS boundary HASH
-
-Example:
-
-```
-$ Crypt Test
-error    test passed!
-base64   test passed!
-base16   test passed!
-asn      test passed!
-in my Fips callback, ok = 0, err = -203
-message = In Core Integrity check FIPS error
-hash = F607C7B983D1D283590448A56381DE460F1E83CB02584F4D77B7F2C583A8F5CD
-In core integrity hash check failure, copy above hash
-into verifyCore[] in fips_test.c and rebuild
-SHA      test failed!
- error = -1802
-Crypt Test: Return code -1
-```
-
-5. Update the `../../wolfcrypt/src/fips_test.c` array `static const char verifyCore[] = {}` with the correct core hash check.
-6. Build again using `make`.
-7. Run the wolfCrypt test.
-
-## Building with configure
-
-The configure script in the main project directory can perform a cross-compile
-build with the the gcc-arm-none-eabi tools. Assuming the tools are installed in
-your executable path:
-
-```
-$ ./configure \
-    --host=arm-non-eabi \
-    CC=arm-none-eabi-gcc \
-    AR=arm-none-eabi-ar \
-    STRIP=arm-none-eabi-strip \
-    RANLIB=arm-none-eabi-ranlib \
-    --prefix=/path/to/build/wolfssl-arm \
-    CFLAGS="-march=armv8-a --specs=nosys.specs \
-        -DHAVE_PK_CALLBACKS -DWOLFSSL_USER_IO -DNO_WRITEV" \
-    --disable-filesystem --enable-fastmath \
-    --disable-shared
-$ make
-$ make install
-```
-
-If you are building for a 32-bit architecture, add `-DTIME_T_NOT_64BIT` to the
-list of CFLAGS.
-
-## Example Build Output
-
-```
-make clean && make
-
-   text    data     bss     dec     hex   filename
-  50076    2508      44   52628    cd94   ./Build/WolfCryptTest.elf
-
-   text    data     bss     dec     hex   filename
-  39155    2508      60   41723    a2fb   ./Build/WolfCryptBench.elf
-
-   text    data     bss     dec     hex filename
-  70368     464      36   70868   114d4 ./Build/WolfSSLClient.elf
-```
-
-## Performance Tuning Options
-
-These settings are located in `Header/user_settings.h`.
-
-* `DEBUG_WOLFSSL`: Undefine this to disable debug logging.
-* `NO_ERROR_STRINGS`: Disables error strings to save code space.
-* `NO_INLINE`: Disabling inline function saves about 1KB, but is slower.
-* `WOLFSSL_SMALL_STACK`: Enables stack reduction techniques to allocate stack sections over 100 bytes from heap.
-* `USE_FAST_MATH`: Uses stack based math, which is faster than the heap based math.
-* `ALT_ECC_SIZE`: If using fast math and RSA/DH you can define this to reduce your ECC memory consumption.
-* `FP_MAX_BITS`: Is the maximum math size (key size * 2). Used only with `USE_FAST_MATH`.
-* `ECC_TIMING_RESISTANT`: Enables timing resistance for ECC and uses slightly less memory.
-* `ECC_SHAMIR`: Doubles heap usage, but slightly faster
-* `RSA_LOW_MEM`: Half as much memory but twice as slow. Uses Non-CRT method for private key.
-* AES GCM: `GCM_SMALL`, `GCM_WORD32` or `GCM_TABLE`: Tunes performance and flash/memory usage.
-* `CURVED25519_SMALL`: Enables small versions of Ed/Curve (FE/GE math).
-* `USE_SLOW_SHA`: Enables smaller/slower version of SHA.
-* `USE_SLOW_SHA256`: About 2k smaller and about 25% slower
-* `USE_SLOW_SHA512`: Over twice as small, but 50% slower
-* `USE_CERT_BUFFERS_1024` or `USE_CERT_BUFFERS_2048`: Size of RSA certs / keys to test with. 
-* `BENCH_EMBEDDED`: Define this if using the wolfCrypt test/benchmark and using a low memory target.
-* `ECC_USER_CURVES`: Allows user to defines curve sizes to enable. Default is 256-bit on. To enable others use `HAVE_ECC192`, `HAVE_ECC224`, etc....
-* `TFM_ARM`, `TFM_SSE2`, `TFM_AVR32`, `TFM_PPC32`, `TFM_MIPS`, `TFM_X86` or `TFM_X86_64`: These are assembly optimizations available with USE_FAST_MATH.
-* Single Precision Math for ARM: See `WOLFSSL_SP`. Optimized math for ARM performance of specific RSA, DH and ECC algorithms.
--- a/IDE/GCC-ARM/Source/armtarget.c
+++ b/IDE/GCC-ARM/Source/armtarget.c
@@ -1,210 +0,0 @@
-/* armtarget.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/ssl.h>
-#include <wolfssl/wolfcrypt/random.h> /* for CUSTOM_RAND_TYPE */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
-
-#ifdef USE_WOLF_ARM_STARTUP
-
-/* Memory initialization */
-extern uint32_t __data_load_start__[];
-extern uint32_t __data_start__[];
-extern uint32_t __data_end__[];
-
-extern uint32_t __bss_start__[];
-extern uint32_t __bss_end__[];
-
-extern uint32_t __stack_process_end__[];
-
-extern uint32_t __heap_start__[];
-extern uint32_t __heap_end__[];
-
-/* Copy memory: src=Source, dst_beg=Destination Begin, dst_end=Destination End */
-void memcpy32(uint32_t* src, uint32_t* dst_beg, uint32_t* dst_end)
-{
-    while (dst_beg < dst_end) {
-        *dst_beg++ = *src++;
-    }
-}
-/* Zero address in range */
-void meminit32(uint32_t* start, uint32_t* end)
-{
-    while (start < end) {
-        *start++ = 0;
-    }
-}
-#endif /* USE_WOLF_ARM_STARTUP */
-
-/* Entry Point */
-void reset_handler(void)
-{
-#ifdef USE_WOLF_ARM_STARTUP
-    /* Init sections */
-    memcpy32(__data_load_start__, __data_start__, __data_end__);
-    meminit32(__bss_start__, __bss_end__);
-
-    /* Init heap */
-    __heap_start__[0] = 0;
-    __heap_start__[1] = ((uint32_t)__heap_end__ - (uint32_t)__heap_start__);
-#endif /* USE_WOLF_ARM_STARTUP */
-
-    /* Start main */
-    extern int main(void);
-    main();
-
-    /* Application has ended, so busy wait */
-    while(1);
-}
-
-#ifdef USE_WOLF_ARM_STARTUP
-// Vector Exception/Interrupt Handlers
-static void Default_Handler(void)
-{
-    /* If we get here then need to implement real IRQ handler */
-    while(1);
-}
-
-__attribute__((section(".sys"))) __attribute__ ((used))
-void HardFault_HandlerC( uint32_t *hardfault_args )
-{
-    /* These are volatile to try and prevent the compiler/linker optimizing them
-    away as the variables never actually get used.  If the debugger won't show the
-    values of the variables, make them global my moving their declaration outside
-    of this function. */
-    volatile uint32_t stacked_r0;
-    volatile uint32_t stacked_r1;
-    volatile uint32_t stacked_r2;
-    volatile uint32_t stacked_r3;
-    volatile uint32_t stacked_r12;
-    volatile uint32_t stacked_lr;
-    volatile uint32_t stacked_pc;
-    volatile uint32_t stacked_psr;
-    volatile uint32_t _CFSR;
-    volatile uint32_t _HFSR;
-    volatile uint32_t _DFSR;
-    volatile uint32_t _AFSR;
-    volatile uint32_t _BFAR;
-    volatile uint32_t _MMAR;
-
-    stacked_r0 = ((uint32_t)hardfault_args[0]);
-    stacked_r1 = ((uint32_t)hardfault_args[1]);
-    stacked_r2 = ((uint32_t)hardfault_args[2]);
-    stacked_r3 = ((uint32_t)hardfault_args[3]);
-    stacked_r12 = ((uint32_t)hardfault_args[4]);
-    stacked_lr = ((uint32_t)hardfault_args[5]);
-    stacked_pc = ((uint32_t)hardfault_args[6]);
-    stacked_psr = ((uint32_t)hardfault_args[7]);
-
-    // Configurable Fault Status Register
-    // Consists of MMSR, BFSR and UFSR
-    _CFSR = (*((volatile uint32_t *)(0xE000ED28)));
-
-    // Hard Fault Status Register
-    _HFSR = (*((volatile uint32_t *)(0xE000ED2C)));
-
-    // Debug Fault Status Register
-    _DFSR = (*((volatile uint32_t *)(0xE000ED30)));
-
-    // Auxiliary Fault Status Register
-    _AFSR = (*((volatile uint32_t *)(0xE000ED3C)));
-
-    // Read the Fault Address Registers. These may not contain valid values.
-    // Check BFARVALID/MMARVALID to see if they are valid values
-    // MemManage Fault Address Register
-    _MMAR = (*((volatile uint32_t *)(0xE000ED34)));
-    // Bus Fault Address Register
-    _BFAR = (*((volatile uint32_t *)(0xE000ED38)));
-
-    printf ("\n\nHard fault handler (all numbers in hex):\n");
-    printf ("R0 = %lx\n", stacked_r0);
-    printf ("R1 = %lx\n", stacked_r1);
-    printf ("R2 = %lx\n", stacked_r2);
-    printf ("R3 = %lx\n", stacked_r3);
-    printf ("R12 = %lx\n", stacked_r12);
-    printf ("LR [R14] = %lx  subroutine call return address\n", stacked_lr);
-    printf ("PC [R15] = %lx  program counter\n", stacked_pc);
-    printf ("PSR = %lx\n", stacked_psr);
-    printf ("CFSR = %lx\n", _CFSR);
-    printf ("HFSR = %lx\n", _HFSR);
-    printf ("DFSR = %lx\n", _DFSR);
-    printf ("AFSR = %lx\n", _AFSR);
-    printf ("MMAR = %lx\n", _MMAR);
-    printf ("BFAR = %lx\n", _BFAR);
-
-    // Break into the debugger
-    __asm("BKPT #0\n");
-}
-
-__attribute__((section(".sys")))  __attribute__( ( naked ) )
-void HardFault_Handler(void)
-{
-    __asm volatile
-    (
-        " movs r0,#4      \n"  /* load bit mask into R0 */
-        " mov  r1, lr     \n"  /* load link register into R1 */
-        " tst r0, r1      \n"  /* compare with bitmask */
-        " beq _MSP        \n"  /* if bitmask is set: stack pointer is in PSP. Otherwise in MSP */
-        " mrs r0, psp     \n"  /* otherwise: stack pointer is in PSP */
-        " b _GetPC        \n"  /* go to part which loads the PC */
-        "_MSP:            \n"  /* stack pointer is in MSP register */
-        " mrs r0, msp     \n"  /* load stack pointer into R0 */
-        "_GetPC:          \n"  /* find out where the hard fault happened */
-        " ldr r1,[r0,#20] \n"  /* load program counter into R1. R1 contains address of the next instruction where the hard fault happened */
-        " ldr r2, =HardFault_HandlerC \n"
-        " bx r2           \n"
-        " bx lr           \n"  /* decode more information. R0 contains pointer to stack frame */
-    );
-}
-
-/* Vectors Table */
-typedef void (*vector_entry)(void);
-const vector_entry vectors[] __attribute__ ((section(".vectors"),used)) =
-{
-    /* Interrupt Vector Table Function Pointers */
-                        // Address     Vector IRQ   Source module    Source description
-    (vector_entry)__stack_process_end__, //         ARM core         Initial Supervisor SP
-    reset_handler,      // 0x0000_0004 1 -          ARM core         Initial Program Counter
-    Default_Handler,    // 0x0000_0008 2 -          ARM core         Non-maskable Interrupt (NMI)
-    HardFault_Handler,  // 0x0000_000C 3 -          ARM core         Hard Fault
-    Default_Handler,    // 0x0000_0010 4 -
-    HardFault_Handler,  // 0x0000_0014 5 -          ARM core         Bus Fault
-    HardFault_Handler,  // 0x0000_0018 6 -          ARM core         Usage Fault
-    Default_Handler,    // 0x0000_001C 7 -
-    Default_Handler,    // 0x0000_0020 8 -
-    Default_Handler,    // 0x0000_0024 9 -
-    Default_Handler,    // 0x0000_0028 10 -
-    Default_Handler,    // 0x0000_002C 11 -         ARM core         Supervisor call (SVCall)
-    Default_Handler,    // 0x0000_0030 12 -         ARM core         Debug Monitor
-    Default_Handler,    // 0x0000_0034 13 -
-    Default_Handler,    // 0x0000_0038 14 -         ARM core         Pendable request for system service (PendableSrvReq)
-    Default_Handler,    // 0x0000_003C 15 -         ARM core         System tick timer (SysTick)
-
-    /* remainder go below */
-};
-#endif /* USE_WOLF_ARM_STARTUP */
--- a/IDE/GCC-ARM/Source/benchmark_main.c
+++ b/IDE/GCC-ARM/Source/benchmark_main.c
@@ -1,54 +0,0 @@
-/* benchmark_main.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/wolfcrypt/error-crypt.h>
-#include <wolfssl/wolfcrypt/logging.h>
-#include <wolfcrypt/benchmark/benchmark.h>
-#include <stdio.h>
-
-#ifndef NO_CRYPT_BENCHMARK
-typedef struct func_args {
-    int    argc;
-    char** argv;
-    int    return_code;
-} func_args;
-
-static func_args args = { 0 } ;
-#endif
-
-int main(void)
-{
-    int ret;
-#ifndef NO_CRYPT_BENCHMARK
-	wolfCrypt_Init();
-
-	printf("\nBenchmark Test\n");
-	benchmark_test(&args);
-    ret = args.return_code;
-	printf("Benchmark Test: Return code %d\n", ret);
-
-	wolfCrypt_Cleanup();
-#else
-    ret = NOT_COMPILED_IN;
-#endif
-	return ret;
-}
--- a/IDE/GCC-ARM/Source/test_main.c
+++ b/IDE/GCC-ARM/Source/test_main.c
@@ -1,55 +0,0 @@
-/* test_main.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/wolfcrypt/logging.h>
-#include <wolfssl/wolfcrypt/error-crypt.h>
-#include <wolfcrypt/test/test.h>
-#include <stdio.h>
-
-#ifndef NO_CRYPT_TEST
-typedef struct func_args {
-    int    argc;
-    char** argv;
-    int    return_code;
-} func_args;
-
-static func_args args = { 0 } ;
-#endif
-
-int main(void)
-{
-    int ret;
-#ifndef NO_CRYPT_TEST
-	wolfCrypt_Init();
-
-	printf("\nCrypt Test\n");
-	wolfcrypt_test(&args);
-    ret = args.return_code;
-	printf("Crypt Test: Return code %d\n", ret);
-
-	wolfCrypt_Cleanup();
-#else
-    ret = NOT_COMPILED_IN;
-#endif
-	return ret;
-}
--- a/IDE/GCC-ARM/Source/tls_client.c
+++ b/IDE/GCC-ARM/Source/tls_client.c
@@ -1,207 +0,0 @@
-/* tls_client.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/wolfcrypt/error-crypt.h>
-
-#ifndef WOLFCRYPT_ONLY
-
-#include <wolfssl/ssl.h>
-#include <wolfssl/wolfcrypt/logging.h>
-#include <stdio.h>
-
-#define MAXSZ              1024
-
-/*------------------------------------------------------------------------*/
-/* TLS CLIENT */
-/*------------------------------------------------------------------------*/
-static int CbIORecv(WOLFSSL *ssl, char *buf, int sz, void *ctx)
-{
-    int ret = WOLFSSL_CBIO_ERR_GENERAL;
-
-    (void)ssl;
-    (void)ctx;
-
-    /* TODO: Exchange data over your own transport */
-    #warning TODO: Implement your own recv data transport
-#if 0
-    ret = usart_read_buffer_wait(&cdc_uart_module, buf, sz);
-    if (ret == STATUS_ERR_TIMEOUT)
-        return WOLFSSL_CBIO_ERR_WANT_READ;
-
-    return (ret == STATUS_OK) ? sz : WOLFSSL_CBIO_ERR_GENERAL;
-#else
-    return ret;
-#endif
-}
-
-static int CbIOSend(WOLFSSL *ssl, char *buf, int sz, void *ctx)
-{
-    int ret = WOLFSSL_CBIO_ERR_GENERAL;
-
-    (void)ssl;
-    (void)ctx;
-
-    /* TODO: Exchange data over your own transport */
-    #warning TODO: Implement your own send data transport
-#if 0
-    ret = usart_write_buffer_wait(&cdc_uart_module, buf, sz);
-    if (ret == STATUS_ERR_TIMEOUT)
-        return WOLFSSL_CBIO_ERR_WANT_WRITE;
-
-    return (ret == STATUS_OK) ? sz : WOLFSSL_CBIO_ERR_GENERAL;
-#else
-    return ret;
-#endif
-}
-
-static int tls_client(void)
-{
-    char msg[] = "Hello WolfSSL!\r\n";
-    char reply[MAXSZ];
-    int ret, msgSz, error;
-    WOLFSSL* ssl = NULL;
-    WOLFSSL_CTX* ctx = NULL;
-
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
-        printf("CTXnew failed.\n");
-        goto fail;
-    }
-
-    /*------------------------------------------------------------------------*/
-    /* ECDHE-ECDSA */
-    /*------------------------------------------------------------------------*/
-    /*--------------------*/
-    /* for peer auth use: */
-    /*--------------------*/
-    //    wolfSSL_CTX_load_verify_buffer(ctx, rsa_key_der_1024,
-    //                                    sizeof_rsa_key_der_1024, SSL_FILETYPE_ASN1);
-    //    wolfSSL_CTX_load_verify_buffer(ctx, server_cert_der_1024,
-    //                                    sizeof_server_cert_der_1024, SSL_FILETYPE_ASN1);
-    /*---------------------*/
-    /* for no peer auth:   */
-    /*---------------------*/
-    wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
-    /*---------------------*/
-    /* end peer auth option*/
-    /*---------------------*/
-    if ((ret = wolfSSL_CTX_set_cipher_list(ctx, "ECDHE-ECDSA-AES128-SHA256")) != SSL_SUCCESS) {
-        wolfSSL_CTX_free(ctx);
-        printf("CTXset_cipher_list failed, error: %d\n", ret);
-        goto fail;
-    }
-    /*------------------------------------------------------------------------*/
-    /* END CIPHER SUITE OPTIONS */
-    /*------------------------------------------------------------------------*/
-    wolfSSL_CTX_SetIORecv(ctx, CbIORecv);
-    wolfSSL_CTX_SetIOSend(ctx, CbIOSend);
-
-    if ((ssl = wolfSSL_new(ctx)) == NULL) {
-        error = wolfSSL_get_error(ssl, 0);
-        printf("wolfSSL_new failed %d\n", error);
-        wolfSSL_CTX_free(ctx);
-        return -1;
-    }
-
-    /* non blocking accept and connect */
-    ret = SSL_FAILURE;
-
-    while (ret != SSL_SUCCESS) {
-        /* client connect */
-        ret = wolfSSL_connect(ssl);
-        error = wolfSSL_get_error(ssl, 0);
-        if (ret != SSL_SUCCESS) {
-            if (error != SSL_ERROR_WANT_READ && error != SSL_ERROR_WANT_WRITE) {
-                /* Fail */
-                printf("wolfSSL connect failed with return code %d\n", error);
-                goto fail;
-            }
-        }
-        /* Success */
-    }
-
-    /* read and write */
-    while (1) {
-        /* client send/read */
-        msgSz = sizeof(msg);
-        ret   = wolfSSL_write(ssl, msg, msgSz);
-        error = wolfSSL_get_error(ssl, 0);
-        if (ret != msgSz) {
-            if (error != SSL_ERROR_WANT_READ && error != SSL_ERROR_WANT_WRITE) {
-                /* Write failed */
-                goto fail;
-            }
-        }
-        /* Write succeeded */
-        break;
-    }
-
-    while (1) {
-        ret = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
-        error = wolfSSL_get_error(ssl, 0);
-        if (ret < 0) {
-            if (error != SSL_ERROR_WANT_READ && error != SSL_ERROR_WANT_WRITE) {
-                /* Can put print here, the server enters a loop waiting to read
-                 * a confirmation message at this point */
-                // printf("client read failed\n");
-                goto fail;
-            }
-            continue;
-        }
-        else {
-            /* Can put print here, the server enters a loop waiting to read
-             * a confirmation message at this point */
-            reply[ret] = '\0';
-            // printf("Client Received Reply: %s\n", reply);
-            break;
-        }
-
-    }
-
-    return 0;
-
-fail:
-    wolfSSL_shutdown(ssl);
-    wolfSSL_free(ssl);
-    wolfSSL_CTX_free(ctx);
-
-    return -1;
-}
-#endif
-
-
-int main(void)
-{
-    int ret;
-
-#ifndef WOLFCRYPT_ONLY
-    wolfSSL_Init();
-
-    ret = tls_client();
-
-    wolfSSL_Cleanup();
-#else
-    ret = NOT_COMPILED_IN;
-#endif
-
-	return ret;
-}
--- a/IDE/GCC-ARM/Source/wolf_main.c
+++ b/IDE/GCC-ARM/Source/wolf_main.c
@@ -1,142 +0,0 @@
-/* wolf_main.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/wolfcrypt/random.h> /* for CUSTOM_RAND_TYPE */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
-
-/* TIME CODE */
-/* TODO: Implement real RTC */
-/* Optionally you can define NO_ASN_TIME to disable all cert time checks */
-static int gTimeMs;
-static int hw_get_time_sec(void)
-{
-    #warning Must implement your own time source if validating certificates
-
-	return ++gTimeMs;
-}
-
-/* This is used by wolfCrypt asn.c for cert time checking */
-unsigned long my_time(unsigned long* timer)
-{
-    (void)timer;
-    return hw_get_time_sec();
-}
-
-#ifndef WOLFCRYPT_ONLY
-/* This is used by TLS only */
-unsigned int LowResTimer(void)
-{
-    return hw_get_time_sec();
-}
-#endif
-
-#ifndef NO_CRYPT_BENCHMARK
-/* This is used by wolfCrypt benchmark tool only */
-double current_time(int reset)
-{
-    double time;
-	int timeMs = gTimeMs;
-    (void)reset;
-    time = (timeMs / 1000); // sec
-    time += (double)(timeMs % 1000) / 1000; // ms
-    return time;
-}
-#endif
-
-/* RNG CODE */
-/* TODO: Implement real RNG */
-static unsigned int gCounter;
-unsigned int hw_rand(void)
-{
-    #warning Must implement your own random source
-
-    return ++gCounter;
-}
-
-unsigned int my_rng_seed_gen(void)
-{
-    return hw_rand();
-}
-
-int my_rng_gen_block(unsigned char* output, unsigned int sz)
-{
-    uint32_t i = 0;
-
-    while (i < sz)
-    {
-        /* If not aligned or there is odd/remainder */
-        if( (i + sizeof(CUSTOM_RAND_TYPE)) > sz ||
-            ((uint32_t)&output[i] % sizeof(CUSTOM_RAND_TYPE)) != 0
-        ) {
-            /* Single byte at a time */
-            output[i++] = (unsigned char)my_rng_seed_gen();
-        }
-        else {
-            /* Use native 8, 16, 32 or 64 copy instruction */
-            *((CUSTOM_RAND_TYPE*)&output[i]) = my_rng_seed_gen();
-            i += sizeof(CUSTOM_RAND_TYPE);
-        }
-    }
-
-    return 0;
-}
-
-
-#ifdef XMALLOC_OVERRIDE
-void *myMalloc(size_t n, void* heap, int type)
-{
-    (void)n;
-    (void)heap;
-    (void)type;
-
-    #warning Must implement your own malloc
-
-    return NULL;
-}
-void myFree(void *p, void* heap, int type)
-{
-    (void)p;
-    (void)heap;
-    (void)type;
-
-    #warning Must implement your own free
-}
-
-/* Required for normal math (!USE_FAST_MATH) */
-void *myRealloc(void *p, size_t n, void* heap, int type)
-{
-    (void)p;
-    (void)n;
-    (void)heap;
-    (void)type;
-
-    #warning Must implement your own realloc
-
-    return NULL;
-}
-#endif /* XMALLOC_OVERRIDE */
--- a/IDE/GCC-ARM/include.am
+++ b/IDE/GCC-ARM/include.am
@@ -1,18 +0,0 @@
-# vim:ft=automake
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-EXTRA_DIST+= IDE/GCC-ARM/Header/user_settings.h
-EXTRA_DIST+= IDE/GCC-ARM/Source/armtarget.c
-EXTRA_DIST+= IDE/GCC-ARM/Source/wolf_main.c
-EXTRA_DIST+= IDE/GCC-ARM/Source/benchmark_main.c
-EXTRA_DIST+= IDE/GCC-ARM/Source/test_main.c
-EXTRA_DIST+= IDE/GCC-ARM/Source/tls_client.c
-EXTRA_DIST+= IDE/GCC-ARM/linker.ld
-EXTRA_DIST+= IDE/GCC-ARM/Makefile
-EXTRA_DIST+= IDE/GCC-ARM/Makefile.bench
-EXTRA_DIST+= IDE/GCC-ARM/Makefile.client
-EXTRA_DIST+= IDE/GCC-ARM/Makefile.common
-EXTRA_DIST+= IDE/GCC-ARM/Makefile.test
-EXTRA_DIST+= IDE/GCC-ARM/Makefile.static
-EXTRA_DIST+= IDE/GCC-ARM/README.md
--- a/IDE/GCC-ARM/linker.ld
+++ b/IDE/GCC-ARM/linker.ld
@@ -1,30 +0,0 @@
-MEMORY
-{
-  FLASH (wx) : ORIGIN = 0x00000000, LENGTH = 256K
-  RAM   (wx) : ORIGIN = 0x20000000, LENGTH = 64K
-}
-
-SECTIONS
-{
-    __vectors_start__ = .;
-    .vectors : { *(.vectors) } > FLASH
-    __vectors_end__ = __vectors_start__ + 0x400;
-	.sys    : { *(.sys*) }    > FLASH
-    .text   : { *(.text*) }   > FLASH
-    .rodata : { *(.text*) }   > FLASH
-
-	__data_load_start__ = .;
-    __data_start__ = .;
-    .data   : { *(.data*) }   > RAM
-    __data_end__ = __data_start__ + SIZEOF(.data);
-
-    __bss_start__ = .;
-    .bss    : { *(.bss*)  }   > RAM
-    __bss_end__   = __bss_start__ + SIZEOF(.bss);
-
-    __heap_start__ = .;
-    .heap   : { *(.heap*)  }   > RAM
-    __heap_end__ = __heap_start__ + SIZEOF(.heap);
-
-    end = .;
-}
--- a/IDE/HEXIWEAR/wolfSSL_HW/.cproject
+++ b/IDE/HEXIWEAR/wolfSSL_HW/.cproject
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.170735395">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.170735395" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<macros>
-					<stringMacro name="PROJECT_KSDK_PATH" type="VALUE_TEXT" value="~/Work/KSDK_1.3.0"/>
-				</macros>
-				<externalSettings>
-					<externalSetting>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/wolfSSL_HW"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/wolfSSL_HW/Debug"/>
-						<entry flags="RESOLVED" kind="libraryFile" name="wolfssl_hw" srcPrefixMapping="" srcRootPath=""/>
-					</externalSetting>
-				</externalSettings>
-				<extensions>
-					<extension id="org.eclipse.cdt.managedbuilder.core.ManagedBuildManager" point="org.eclipse.cdt.core.ScannerInfoProvider"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="wolfssl_hw" buildArtefactType="org.eclipse.cdt.build.core.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.build.core.buildArtefactType.staticLib" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.170735395" name="Debug" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug">
-					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.170735395." name="/" resourcePath="">
-						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug.955851768" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug">
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.1637878147" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.none" valueType="enumerated"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.596937133" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" value="true" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.412948756" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" value="true" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.1412387181" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" value="true" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections.1877241998" name="Data sections (-fdata-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections" value="true" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.2038051180" name="Debug level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.max" valueType="enumerated"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.1062002269" name="Debug format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.1592667634" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.1112951710" name="Float ABI" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.hard" valueType="enumerated"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.1079530716" name="FPU Type" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.192917244" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="GNU Tools for ARM Embedded Processors" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.2108482930" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" value="arm-none-eabi-" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.500222702" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" value="gcc" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp.175873499" name="C++ compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp" value="g++" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy.1700937041" name="Hex/Bin converter" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy" value="objcopy" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump.1874549763" name="Listing generator" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump" value="objdump" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.size.178137928" name="Size command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.size" value="size" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.make.1274071175" name="Build command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.make" value="make" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm.655658023" name="Remove command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm" value="rm" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar.1937238341" name="Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar" value="ar" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.1476617138" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" value="true" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn.1035232247" name="Enable all common warnings (-Wall)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn" value="true" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto.8601271" name="Link-time optimizer (-flto)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto" value="false" valueType="boolean"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.817253425" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/wolfSSL_HW}/Debug" id="ilg.gnuarmeclipse.managedbuild.cross.builder.2043375702" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1135882719" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.369489760" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
-								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1086496768" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
-							</tool>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1696761989" name="Cross ARM GNU C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.9643995" name="Language standard" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c99" valueType="enumerated"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.349147702" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/../../../&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${PROJECT_KSDK_PATH}/platform/devices&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${PROJECT_KSDK_PATH}/platform/CMSIS/Include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${PROJECT_KSDK_PATH}/platform/devices/MK64F12/startup&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${PROJECT_KSDK_PATH}/platform/drivers/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${PROJECT_KSDK_PATH}/platform/hal/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${PROJECT_KSDK_PATH}/platform/osa/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${PROJECT_KSDK_PATH}/platform/utilities/inc&quot;"/>
-								</option>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.1294205548" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="&quot;CPU_MK64FN1M0VMD12&quot;"/>
-									<listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
-								</option>
-								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.817994152" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
-							</tool>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.234608726" name="Cross ARM GNU C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.1452713629" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="false"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs.497680378" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="&quot;CPU_MK64FN1M0VMD12&quot;"/>
-								</option>
-								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.909966654" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
-							</tool>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.506002589" name="Cross ARM GNU C Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker">
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.gcsections.1489822225" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.gcsections" value="true" valueType="boolean"/>
-							</tool>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.575756954" name="Cross ARM GNU C++ Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker">
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections.11344634" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections" value="true" valueType="boolean"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths.1878565771" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Project_Settings/Linker_Files&quot;"/>
-								</option>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.other.1517060693" name="Other linker flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.other" value="-specs=nosys.specs -specs=nano.specs -Xlinker -z -Xlinker muldefs" valueType="string"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.scriptfile.468376236" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.scriptfile" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;MK64FN1M0xxx12_flash.ld&quot;"/>
-								</option>
-								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input.955790366" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.1962941231" name="Cross ARM GNU Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver"/>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash.1365673947" name="Cross ARM GNU Create Flash Image" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash"/>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting.790507756" name="Cross ARM GNU Create Listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting">
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source.1929510617" name="Display source (--source|-S)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source" value="true" valueType="boolean"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders.573901902" name="Display all headers (--all-headers|-x)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders" value="true" valueType="boolean"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle.2051558160" name="Demangle names (--demangle|-C)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle" value="true" valueType="boolean"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers.851594065" name="Display line numbers (--line-numbers|-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers" value="true" valueType="boolean"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide.1352373056" name="Wide lines (--wide|-w)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide" value="true" valueType="boolean"/>
-							</tool>
-							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize.934998862" name="Cross ARM GNU Print Size" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize">
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format.1738611770" name="Size format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="wolfcrypt/src/integer.c|wolfcrypt/src/misc.c|src/bio.c|wolfcrypt/src/evp.c|wolfcrypt/src/aes_asm.s|wolfcrypt/src/aes_asm.asm|SDK|wolfssl/wolfcrypt/port|wolfcrypt/src/port|wolfcrypt/user-crypto" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="wolfSSL_HW.ilg.gnuarmeclipse.managedbuild.cross.target.elf.1053752509" name="Executable" projectType="ilg.gnuarmeclipse.managedbuild.cross.target.elf"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.170735395;ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.170735395.;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.234608726;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.909966654">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.170735395;ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.170735395.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1696761989;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.817994152">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/wolfSSL_HW"/>
-		</configuration>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cproject>
--- a/IDE/HEXIWEAR/wolfSSL_HW/.cwGeneratedFileSetLog
+++ b/IDE/HEXIWEAR/wolfSSL_HW/.cwGeneratedFileSetLog
@@ -1,19 +0,0 @@
-Sources/main.c
-Project_Settings/Linker_Files/MK64FN1M0xxx12_flash.ld
-SDK/platform/CMSIS/Include/core_cmSimd.h
-SDK/platform/devices/MK64F12/include/MK64F12.h
-SDK/platform/CMSIS/Include/arm_common_tables.h
-SDK/platform/CMSIS/Include/arm_const_structs.h
-SDK/platform/devices/MK64F12/include/MK64F12_features.h
-SDK/platform/CMSIS/Include/core_cm4.h
-SDK/platform/CMSIS/Include/core_cmFunc.h
-SDK/platform/CMSIS/Include/core_cmInstr.h
-SDK/platform/devices/fsl_device_registers.h
-SDK/platform/devices/MK64F12/include/fsl_bitaccess.h
-SDK/platform/CMSIS/Include/arm_math.h
-SDK/platform/devices/MK64F12/include/MK64F12_extension.h
-Project_Settings/Startup_Code/startup.c
-Project_Settings/Startup_Code/system_MK64F12.c
-Project_Settings/Startup_Code/startup.h
-Project_Settings/Startup_Code/startup_MK64F12.S
-Project_Settings/Startup_Code/system_MK64F12.h
--- a/IDE/HEXIWEAR/wolfSSL_HW/.project
+++ b/IDE/HEXIWEAR/wolfSSL_HW/.project
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>wolfSSL_HW</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>src</name>
-			<type>2</type>
-			<locationURI>$%7BPARENT-3-PROJECT_LOC%7D/src</locationURI>
-		</link>
-		<link>
-			<name>wolfcrypt</name>
-			<type>2</type>
-			<locationURI>$%7BPARENT-3-PROJECT_LOC%7D/wolfcrypt</locationURI>
-		</link>
-		<link>
-			<name>wolfssl</name>
-			<type>2</type>
-			<locationURI>$%7BPARENT-3-PROJECT_LOC%7D/wolfssl</locationURI>
-		</link>
-	</linkedResources>
-	<variableList>
-		<variable>
-			<name>PROJECT_KSDK_PATH</name>
-			<value>file:/.KSDK_1.3.0</value>
-		</variable>
-	</variableList>
-</projectDescription>
--- a/IDE/HEXIWEAR/wolfSSL_HW/.settings/com.freescale.processorexpert.derivative.prefs
+++ b/IDE/HEXIWEAR/wolfSSL_HW/.settings/com.freescale.processorexpert.derivative.prefs
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-versionGenerated/versionGenerated=1.0.0.RT7_b1550-0615
--- a/IDE/HEXIWEAR/wolfSSL_HW/user_settings.h
+++ b/IDE/HEXIWEAR/wolfSSL_HW/user_settings.h
@@ -1,6 +0,0 @@
-#define FREESCALE_KSDK_BM
-#define FREESCALE_KSDK_1_3
-#define FSL_HW_CRYPTO_MANUAL_SELECTION
-#define NO_MAIN_DRIVER
-#define USE_CERT_BUFFERS_1024
-#define ECC_USER_CURVES
--- a/IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_lib_SAMV71_XULT/wolfcrypt_lib.ewp
+++ b/IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_lib_SAMV71_XULT/wolfcrypt_lib.ewp
@@ -12,12 +12,12 @@
      <name>General</name>
      <archiveVersion>3</archiveVersion>
      <data>
-        <version>24</version>
+        <version>22</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
        <option>
          <name>ExePath</name>
-          <state>Debug\Bin</state>
+          <state>Debug\Exe</state>
        </option>
        <option>
          <name>ObjPath</name>
@@ -27,6 +27,11 @@
          <name>ListPath</name>
          <state>Debug\List</state>
        </option>
+        <option>
+          <name>Variant</name>
+          <version>20</version>
+          <state>38</state>
+        </option>
        <option>
          <name>GEndianMode</name>
          <state>0</state>
@@ -53,6 +58,11 @@
          <name>GOutputBinary</name>
          <state>1</state>
        </option>
+        <option>
+          <name>FPU</name>
+          <version>2</version>
+          <state>0</state>
+        </option>
        <option>
          <name>OGCoreOrChip</name>
          <state>0</state>
@@ -73,11 +83,11 @@
        </option>
        <option>
          <name>OGProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>6.70.1.5793</state>
        </option>
        <option>
          <name>OGLastSavedByProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>6.60.1.5099</state>
        </option>
        <option>
          <name>GeneralEnableMisra</name>
@@ -89,7 +99,7 @@
        </option>
        <option>
          <name>OGChipSelectEditMenu</name>
-          <state>Default	None</state>
+          <state>MB9BF618T	Fujitsu MB9BF618T</state>
        </option>
        <option>
          <name>GenLowLevelInterface</name>
@@ -125,14 +135,19 @@
          <name>RTConfigPath2</name>
          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
        </option>
+        <option>
+          <name>GFPUCoreSlave</name>
+          <version>20</version>
+          <state>38</state>
+        </option>
        <option>
          <name>GBECoreSlave</name>
-          <version>24</version>
-          <state>41</state>
+          <version>20</version>
+          <state>38</state>
        </option>
        <option>
          <name>OGUseCmsis</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>OGUseCmsisDspLib</name>
@@ -140,48 +155,20 @@
        </option>
        <option>
          <name>GRuntimeLibThreads</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>24</version>
-          <state>41</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>Default	None</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>7</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
          <state>0</state>
        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>24</version>
-          <state>41</state>
-        </option>
      </data>
    </settings>
    <settings>
      <name>ICCARM</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>31</version>
+        <version>29</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
        <option>
          <name>CCDefines</name>
-          <state>WOLFSSL_USER_SETTINGS</state>
+          <state></state>
        </option>
        <option>
          <name>CCPreprocFile</name>
@@ -221,7 +208,7 @@
        </option>
        <option>
          <name>CCDiagSuppress</name>
-          <state></state>
+          <state>Pa050</state>
        </option>
        <option>
          <name>CCDiagRemark</name>
@@ -242,7 +229,7 @@
        <option>
          <name>CCAllowList</name>
          <version>1</version>
-          <state>00000000</state>
+          <state>0000000</state>
        </option>
        <option>
          <name>CCDebugInfo</name>
@@ -258,14 +245,11 @@
        </option>
        <option>
          <name>IExtraOptionsCheck</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>IExtraOptions</name>
-          <state>--diag_warning Pa089</state>
-          <state>--diag_suppress Pa089</state>
-          <state>--diag_warning Pe231</state>
-          <state>--diag_suppress Pe231</state>
+          <state></state>
        </option>
        <option>
          <name>CCLangConformance</name>
@@ -313,8 +297,7 @@
        </option>
        <option>
          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$\..\..\..\..\..\</state>
-          <state>$PROJ_DIR$\..\embOS_SAMV71_XULT_user_settings</state>
+          <state>$PROJ_DIR$\..\..\..\..</state>
        </option>
        <option>
          <name>CCStdIncCheck</name>
@@ -339,7 +322,7 @@
        <option>
          <name>CCOptStrategy</name>
          <version>0</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>CCOptLevelSlave</name>
@@ -415,15 +398,6 @@
          <name>CCNoLiteralPool</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -601,7 +575,7 @@
        <debug>1</debug>
        <option>
          <name>OOCOutputFormat</name>
-          <version>3</version>
+          <version>2</version>
          <state>0</state>
        </option>
        <option>
@@ -610,7 +584,7 @@
        </option>
        <option>
          <name>OOCOutputFile</name>
-          <state></state>
+          <state>CyaSSL-Full.srec</state>
        </option>
        <option>
          <name>OOCCommandLineProducer</name>
@@ -628,7 +602,6 @@
      <data>
        <extensions></extensions>
        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
      </data>
    </settings>
    <settings>
@@ -648,7 +621,7 @@
      <name>ILINK</name>
      <archiveVersion>0</archiveVersion>
      <data>
-        <version>17</version>
+        <version>16</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
        <option>
@@ -665,7 +638,7 @@
        </option>
        <option>
          <name>IlinkOutputFile</name>
-          <state>wolfcrypt_lib.out</state>
+          <state>CyaSSL-Full.out</state>
        </option>
        <option>
          <name>IlinkDebugInfoEnable</name>
@@ -725,11 +698,11 @@
        </option>
        <option>
          <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\generic_cortex.icf</state>
+          <state>$PROJ_DIR$\CyaSSL-Full.icf</state>
        </option>
        <option>
          <name>IlinkIcfFileSlave</name>
@@ -880,7 +853,7 @@
        </option>
        <option>
          <name>IlinkOptInline</name>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>IlinkOptExceptionsAllow</name>
@@ -932,10 +905,6 @@
          <name>IlinkThreadsSlave</name>
          <state>1</state>
        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -955,7 +924,7 @@
        </option>
        <option>
          <name>IarchiveOutput</name>
-          <state>C:\Users\boz_windows\Desktop\embos-wolfssl\IDE\IAR-EWARM\embOS\SAMV71_XULT\embOS_wolfcrypt_lib_SAMV71_XULT\Debug\Bin\wolfcrypt_lib.a</state>
+          <state>C:\ROOT\CyaSSL-Release\IAR\IDE\IAR-EWARM\Projects\CyaSSL-Lib\Debug\Exe\CyaSSL-Lib.a</state>
        </option>
      </data>
    </settings>
@@ -975,7 +944,7 @@
      <name>General</name>
      <archiveVersion>3</archiveVersion>
      <data>
-        <version>24</version>
+        <version>22</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
        <option>
@@ -990,6 +959,11 @@
          <name>ListPath</name>
          <state>Release\List</state>
        </option>
+        <option>
+          <name>Variant</name>
+          <version>20</version>
+          <state>0</state>
+        </option>
        <option>
          <name>GEndianMode</name>
          <state>0</state>
@@ -1016,6 +990,11 @@
          <name>GOutputBinary</name>
          <state>0</state>
        </option>
+        <option>
+          <name>FPU</name>
+          <version>2</version>
+          <state>0</state>
+        </option>
        <option>
          <name>OGCoreOrChip</name>
          <state>0</state>
@@ -1036,7 +1015,7 @@
        </option>
        <option>
          <name>OGProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>6.70.1.5793</state>
        </option>
        <option>
          <name>OGLastSavedByProductVersion</name>
@@ -1088,10 +1067,15 @@
          <name>RTConfigPath2</name>
          <state></state>
        </option>
+        <option>
+          <name>GFPUCoreSlave</name>
+          <version>20</version>
+          <state>1</state>
+        </option>
        <option>
          <name>GBECoreSlave</name>
-          <version>24</version>
-          <state>38</state>
+          <version>20</version>
+          <state>1</state>
        </option>
        <option>
          <name>OGUseCmsis</name>
@@ -1105,41 +1089,13 @@
          <name>GRuntimeLibThreads</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>24</version>
-          <state>38</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>-</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>24</version>
-          <state>38</state>
-        </option>
      </data>
    </settings>
    <settings>
      <name>ICCARM</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>31</version>
+        <version>29</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
        <option>
@@ -1205,7 +1161,7 @@
        <option>
          <name>CCAllowList</name>
          <version>1</version>
-          <state>11111110</state>
+          <state>1111111</state>
        </option>
        <option>
          <name>CCDebugInfo</name>
@@ -1374,15 +1330,6 @@
          <name>CCNoLiteralPool</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -1560,7 +1507,7 @@
        <debug>0</debug>
        <option>
          <name>OOCOutputFormat</name>
-          <version>3</version>
+          <version>2</version>
          <state>0</state>
        </option>
        <option>
@@ -1587,7 +1534,6 @@
      <data>
        <extensions></extensions>
        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
      </data>
    </settings>
    <settings>
@@ -1607,7 +1553,7 @@
      <name>ILINK</name>
      <archiveVersion>0</archiveVersion>
      <data>
-        <version>17</version>
+        <version>16</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
        <option>
@@ -1660,7 +1606,7 @@
        </option>
        <option>
          <name>IlinkMapFile</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>IlinkLogFile</name>
@@ -1891,10 +1837,6 @@
          <name>IlinkThreadsSlave</name>
          <state>1</state>
        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -1925,84 +1867,132 @@
    </settings>
  </configuration>
  <group>
-    <name>wolfcrypt_sources</name>
+    <name>CyaSSL</name>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\aes.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\crl.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\asn.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\internal.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\chacha.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\io.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\chacha20_poly1305.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\keys.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\coding.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\ocsp.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\des3.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\sniffer.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\dh.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\ssl.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\dsa.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\tls.c</name>
+    </file>
+  </group>
+  <group>
+    <name>wolfCrypt</name>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\aes.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\ecc.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\arc4.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\hash.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\asm.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\hmac.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\asn.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\md4.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\blake2b.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\md5.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\camellia.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\memory.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\coding.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\misc.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\compress.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\poly1305.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\des3.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\pwdbased.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\dh.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\rabbit.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\dsa.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\random.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\ecc.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\rsa.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\ecc_fp.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\sha.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\error.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\sha256.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\hc128.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\sha512.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\hmac.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\tfm.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\integer.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\wc_encrypt.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\logging.c</name>
    </file>
    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\wc_port.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\md2.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\md4.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\md5.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\memory.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\misc.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\wc_port.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\pwdbased.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\rabbit.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\random.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\ripemd.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\rsa.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\sha.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\sha256.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\sha512.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\tfm.c</name>
    </file>
  </group>
 </project>
--- a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.eww
+++ b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.eww
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<workspace>
+  <project>
+    <path>$WS_DIR$\CyaSSL-Lib.ewp</path>
+  </project>
+  <project>
+    <path>$WS_DIR$\wolfCrypt-benchmark.ewp</path>
+  </project>
+  <project>
+    <path>$WS_DIR$\wolfCrypt-test.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
+
+
--- a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/benchmark-main.c
+++ b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/benchmark-main.c
@@ -1,31 +1,25 @@
 /* benchmark-main.c
 *
- * Copyright (C) 2006-2019 wolfSSL Inc.
+ * Copyright (C) 2006-2013 wolfSSL Inc.
 *
- * This file is part of wolfSSL.
+ * This file is part of CyaSSL.
 *
- * wolfSSL is free software; you can redistribute it and/or modify
+ * CyaSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
- * wolfSSL is distributed in the hope that it will be useful,
+ * CyaSSL is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

-
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfcrypt/benchmark/benchmark.h>
+#include "stdio.h"

 typedef struct func_args {
    int    argc;
@@ -35,9 +29,12 @@ typedef struct func_args {

 func_args args = { 0 } ;

-extern double current_time(int reset) ;
+extern int benchmark_test(void *args) ;

 main(void) {
    benchmark_test(&args) ;
    return 0;
 }
+
+
+
--- a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/test-main.c
+++ b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/test-main.c
@@ -1,26 +1,25 @@
 /* test-main.c
 *
- * Copyright (C) 2006-2019 wolfSSL Inc.
+ * Copyright (C) 2006-2013 wolfSSL Inc.
 *
- * This file is part of wolfSSL.
+ * This file is part of CyaSSL.
 *
- * wolfSSL is free software; you can redistribute it and/or modify
+ * CyaSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
- * wolfSSL is distributed in the hope that it will be useful,
+ * CyaSSL is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */


-
 typedef struct func_args {
    int    argc;
    char** argv;
@@ -29,10 +28,9 @@ typedef struct func_args {

 func_args args = { 0 } ;

-extern int wolfcrypt_test(void *args) ;
+extern int ctaocrypt_test(void *args) ;

 main(void) {
-    wolfcrypt_test(&args) ;
+    ctaocrypt_test(&args) ;
    return 0;
 }
-
--- a/IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_lib_SAMV71_XULT/wolfcrypt_lib.ewd
+++ b/IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_lib_SAMV71_XULT/wolfcrypt_lib.ewd
--- a/IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_benchmark_SAMV71_XULT/wolfcrypt_benchmark.ewp
+++ b/IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_benchmark_SAMV71_XULT/wolfcrypt_benchmark.ewp
@@ -12,7 +12,7 @@
      <name>General</name>
      <archiveVersion>3</archiveVersion>
      <data>
-        <version>24</version>
+        <version>22</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
        <option>
@@ -27,6 +27,11 @@
          <name>ListPath</name>
          <state>Debug\List</state>
        </option>
+        <option>
+          <name>Variant</name>
+          <version>20</version>
+          <state>38</state>
+        </option>
        <option>
          <name>GEndianMode</name>
          <state>0</state>
@@ -34,25 +39,30 @@
        <option>
          <name>Input variant</name>
          <version>3</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>Input description</name>
-          <state>Automatic choice of formatter.</state>
+          <state>Full formatting.</state>
        </option>
        <option>
          <name>Output variant</name>
          <version>2</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>Output description</name>
-          <state>Automatic choice of formatter.</state>
+          <state>Full formatting.</state>
        </option>
        <option>
          <name>GOutputBinary</name>
          <state>0</state>
        </option>
+        <option>
+          <name>FPU</name>
+          <version>2</version>
+          <state>0</state>
+        </option>
        <option>
          <name>OGCoreOrChip</name>
          <state>0</state>
@@ -73,11 +83,11 @@
        </option>
        <option>
          <name>OGProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>5.10.0.159</state>
        </option>
        <option>
          <name>OGLastSavedByProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>6.60.1.5099</state>
        </option>
        <option>
          <name>GeneralEnableMisra</name>
@@ -125,14 +135,19 @@
          <name>RTConfigPath2</name>
          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
        </option>
+        <option>
+          <name>GFPUCoreSlave</name>
+          <version>20</version>
+          <state>38</state>
+        </option>
        <option>
          <name>GBECoreSlave</name>
-          <version>24</version>
-          <state>41</state>
+          <version>20</version>
+          <state>38</state>
        </option>
        <option>
          <name>OGUseCmsis</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>OGUseCmsisDspLib</name>
@@ -140,50 +155,24 @@
        </option>
        <option>
          <name>GRuntimeLibThreads</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>24</version>
-          <state>41</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>Default	None</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>7</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
          <state>0</state>
        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>24</version>
-          <state>41</state>
-        </option>
      </data>
    </settings>
    <settings>
      <name>ICCARM</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>31</version>
+        <version>29</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
        <option>
          <name>CCDefines</name>
-          <state>DEBUG=1</state>
-          <state>__SAMV71Q21__</state>
-          <state>WOLFSSL_USER_SETTINGS</state>
+          <state></state>
        </option>
        <option>
          <name>CCPreprocFile</name>
@@ -223,7 +212,7 @@
        </option>
        <option>
          <name>CCDiagSuppress</name>
-          <state></state>
+          <state>Pa050</state>
        </option>
        <option>
          <name>CCDiagRemark</name>
@@ -244,7 +233,7 @@
        <option>
          <name>CCAllowList</name>
          <version>1</version>
-          <state>00000000</state>
+          <state>0000000</state>
        </option>
        <option>
          <name>CCDebugInfo</name>
@@ -312,11 +301,7 @@
        </option>
        <option>
          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$\..\..\extract_trial_here\Start\Inc</state>
-          <state>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup</state>
-          <state>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\DeviceSupport</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\</state>
-          <state>$PROJ_DIR$\..\embOS_SAMV71_XULT_user_settings</state>
+          <state>$PROJ_DIR$\..\..\..\..</state>
        </option>
        <option>
          <name>CCStdIncCheck</name>
@@ -409,23 +394,10 @@
          <name>IccFloatSemantics</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
        <option>
          <name>CCNoLiteralPool</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -603,7 +575,7 @@
        <debug>1</debug>
        <option>
          <name>OOCOutputFormat</name>
-          <version>3</version>
+          <version>2</version>
          <state>0</state>
        </option>
        <option>
@@ -612,7 +584,7 @@
        </option>
        <option>
          <name>OOCOutputFile</name>
-          <state></state>
+          <state>c.srec</state>
        </option>
        <option>
          <name>OOCCommandLineProducer</name>
@@ -630,7 +602,6 @@
      <data>
        <extensions></extensions>
        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
      </data>
    </settings>
    <settings>
@@ -650,9 +621,13 @@
      <name>ILINK</name>
      <archiveVersion>0</archiveVersion>
      <data>
-        <version>17</version>
+        <version>16</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>benchmark.out</state>
+        </option>
        <option>
          <name>IlinkLibIOConfig</name>
          <state>1</state>
@@ -665,10 +640,6 @@
          <name>IlinkInputFileSlave</name>
          <state>0</state>
        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>wolfcrypt_benchmark.out</state>
-        </option>
        <option>
          <name>IlinkDebugInfoEnable</name>
          <state>1</state>
@@ -703,7 +674,7 @@
        </option>
        <option>
          <name>IlinkMapFile</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>IlinkLogFile</name>
@@ -731,7 +702,7 @@
        </option>
        <option>
          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\..\embOS_SAMV71_XULT_Linker_Script\samv71q21_wolfssl.icf</state>
+          <state>$PROJ_DIR$\wolfCrypt-benchmark.icf</state>
        </option>
        <option>
          <name>IlinkIcfFileSlave</name>
@@ -779,8 +750,7 @@
        </option>
        <option>
          <name>IlinkAdditionalLibs</name>
-          <state>$PROJ_DIR$\..\embOS_wolfcrypt_lib_SAMV71_XULT\Debug\Bin\wolfcrypt_lib.a</state>
-          <state>$PROJ_DIR$\..\..\extract_trial_here\Start\Lib\os7m_tlv_dp.a</state>
+          <state>$PROJ_DIR$\Debug\Exe\CyaSSL-Lib.a</state>
        </option>
        <option>
          <name>IlinkOverrideProgramEntryLabel</name>
@@ -935,10 +905,6 @@
          <name>IlinkThreadsSlave</name>
          <state>1</state>
        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -978,7 +944,7 @@
      <name>General</name>
      <archiveVersion>3</archiveVersion>
      <data>
-        <version>24</version>
+        <version>22</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
        <option>
@@ -993,6 +959,11 @@
          <name>ListPath</name>
          <state>Release\List</state>
        </option>
+        <option>
+          <name>Variant</name>
+          <version>20</version>
+          <state>0</state>
+        </option>
        <option>
          <name>GEndianMode</name>
          <state>0</state>
@@ -1000,25 +971,30 @@
        <option>
          <name>Input variant</name>
          <version>3</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>Input description</name>
-          <state></state>
+          <state>Full formatting.</state>
        </option>
        <option>
          <name>Output variant</name>
          <version>2</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>Output description</name>
-          <state></state>
+          <state>Full formatting.</state>
        </option>
        <option>
          <name>GOutputBinary</name>
          <state>0</state>
        </option>
+        <option>
+          <name>FPU</name>
+          <version>2</version>
+          <state>0</state>
+        </option>
        <option>
          <name>OGCoreOrChip</name>
          <state>0</state>
@@ -1035,15 +1011,15 @@
        </option>
        <option>
          <name>RTDescription</name>
-          <state></state>
+          <state>Use the normal configuration of the C/C++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
        </option>
        <option>
          <name>OGProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>5.10.0.159</state>
        </option>
        <option>
          <name>OGLastSavedByProductVersion</name>
-          <state></state>
+          <state>6.30.1.53141</state>
        </option>
        <option>
          <name>GeneralEnableMisra</name>
@@ -1055,7 +1031,7 @@
        </option>
        <option>
          <name>OGChipSelectEditMenu</name>
-          <state></state>
+          <state>default	None</state>
        </option>
        <option>
          <name>GenLowLevelInterface</name>
@@ -1089,12 +1065,17 @@
        </option>
        <option>
          <name>RTConfigPath2</name>
-          <state></state>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave</name>
+          <version>20</version>
+          <state>0</state>
        </option>
        <option>
          <name>GBECoreSlave</name>
-          <version>24</version>
-          <state>38</state>
+          <version>20</version>
+          <state>0</state>
        </option>
        <option>
          <name>OGUseCmsis</name>
@@ -1108,43 +1089,19 @@
          <name>GRuntimeLibThreads</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>24</version>
-          <state>38</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>-</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>24</version>
-          <state>38</state>
-        </option>
      </data>
    </settings>
    <settings>
      <name>ICCARM</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>31</version>
+        <version>29</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
        <option>
          <name>CCDefines</name>
          <state>NDEBUG</state>
@@ -1208,7 +1165,7 @@
        <option>
          <name>CCAllowList</name>
          <version>1</version>
-          <state>11111110</state>
+          <state>1111111</state>
        </option>
        <option>
          <name>CCDebugInfo</name>
@@ -1260,7 +1217,7 @@
        </option>
        <option>
          <name>OutputFile</name>
-          <state></state>
+          <state>$FILE_BNAME$.o</state>
        </option>
        <option>
          <name>CCLibConfigHeader</name>
@@ -1288,7 +1245,7 @@
        </option>
        <option>
          <name>IInterwork2</name>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>IProcessorMode2</name>
@@ -1305,7 +1262,7 @@
        </option>
        <option>
          <name>CCOptLevelSlave</name>
-          <state>1</state>
+          <state>3</state>
        </option>
        <option>
          <name>CompilerMisraRules98</name>
@@ -1369,23 +1326,10 @@
          <name>IccFloatSemantics</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
        <option>
          <name>CCNoLiteralPool</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -1518,7 +1462,7 @@
        </option>
        <option>
          <name>AOutputFile</name>
-          <state></state>
+          <state>$FILE_BNAME$.o</state>
        </option>
        <option>
          <name>AMultibyteSupport</name>
@@ -1563,7 +1507,7 @@
        <debug>0</debug>
        <option>
          <name>OOCOutputFormat</name>
-          <version>3</version>
+          <version>2</version>
          <state>0</state>
        </option>
        <option>
@@ -1572,7 +1516,7 @@
        </option>
        <option>
          <name>OOCOutputFile</name>
-          <state></state>
+          <state>c.srec</state>
        </option>
        <option>
          <name>OOCCommandLineProducer</name>
@@ -1590,7 +1534,6 @@
      <data>
        <extensions></extensions>
        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
      </data>
    </settings>
    <settings>
@@ -1610,9 +1553,13 @@
      <name>ILINK</name>
      <archiveVersion>0</archiveVersion>
      <data>
-        <version>17</version>
+        <version>16</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>c.out</state>
+        </option>
        <option>
          <name>IlinkLibIOConfig</name>
          <state>1</state>
@@ -1625,10 +1572,6 @@
          <name>IlinkInputFileSlave</name>
          <state>0</state>
        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>###Unitialized###</state>
-        </option>
        <option>
          <name>IlinkDebugInfoEnable</name>
          <state>1</state>
@@ -1663,7 +1606,7 @@
        </option>
        <option>
          <name>IlinkMapFile</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>IlinkLogFile</name>
@@ -1691,7 +1634,7 @@
        </option>
        <option>
          <name>IlinkIcfFile</name>
-          <state>lnk0t.icf</state>
+          <state>$TOOLKIT_DIR$\CONFIG\generic.icf</state>
        </option>
        <option>
          <name>IlinkIcfFileSlave</name>
@@ -1894,10 +1837,6 @@
          <name>IlinkThreadsSlave</name>
          <state>1</state>
        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -1927,69 +1866,12 @@
      <data/>
    </settings>
  </configuration>
-  <group>
-    <name>Application</name>
-    <file>
-      <name>$PROJ_DIR$\Application\runBenchmarks.c</name>
-    </file>
-  </group>
-  <group>
-    <name>benchmark</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\benchmark\benchmark.c</name>
-    </file>
-  </group>
-  <group>
-    <name>Device_Support</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\DeviceSupport\startup_sam.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\DeviceSupport\system_sam.c</name>
-    </file>
-  </group>
-  <group>
-    <name>Setup</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\BSP.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\HardFaultHandler.S</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\JLINKMEM_Process.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\OS_Error.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\RTOSInit_SAMV71_CMSIS.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_HardFaultHandler.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_RTT.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_RTT_printf.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_SYSVIEW.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_SYSVIEW_Config_embOS.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_SYSVIEW_embOS.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\xmtx.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\xmtx2.c</name>
-    </file>
-  </group>
+  <file>
+    <name>$PROJ_DIR$\benchmark-main.c</name>
+  </file>
+  <file>
+    <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\benchmark\benchmark.c</name>
+  </file>
 </project>


--- a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/wolfCrypt-benchmark.icf
+++ b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/wolfCrypt-benchmark.icf
@@ -0,0 +1,32 @@
+/*###ICF### Section handled by ICF editor, don't touch! ****/
+/*-Editor annotation file-*/
+/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
+/*-Specials-*/
+define symbol __ICFEDIT_intvec_start__ = 0x00000000;
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_ROM_start__ = 0x00000000;
+define symbol __ICFEDIT_region_ROM_end__   = 0x0007FFFF;
+define symbol __ICFEDIT_region_RAM_start__ = 0x20000000;
+define symbol __ICFEDIT_region_RAM_end__   = 0x2000FFFF;
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x2000;
+define symbol __ICFEDIT_size_heap__   = 0x2000;
+/**** End of ICF editor section. ###ICF###*/
+
+
+define memory mem with size = 4G;
+define region ROM_region   = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];
+define region RAM_region   = mem:[from __ICFEDIT_region_RAM_start__   to __ICFEDIT_region_RAM_end__];
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+//initialize by copy with packing = none { section __DLIB_PERTHREAD }; // Required in a multi-threaded application
+do not initialize  { section .noinit };
+
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly };
+place in RAM_region   { readwrite,
+                        block CSTACK, block HEAP };
--- a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/wolfCrypt-test.ewd
+++ b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/wolfCrypt-test.ewd
@@ -12,7 +12,7 @@
      <name>C-SPY</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>26</version>
+        <version>25</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
        <option>
@@ -81,7 +81,7 @@
        </option>
        <option>
          <name>OCProductVersion</name>
-          <state>7.20.1.7306</state>
+          <state>6.60.1.5099</state>
        </option>
        <option>
          <name>OCDynDriverList</name>
@@ -89,7 +89,7 @@
        </option>
        <option>
          <name>OCLastSavedByProductVersion</name>
-          <state>7.20.1.7306</state>
+          <state>6.60.1.5099</state>
        </option>
        <option>
          <name>OCDownloadAttachToProgram</name>
@@ -183,30 +183,6 @@
          <name>OCAllMTBOptions</name>
          <state>1</state>
        </option>
-        <option>
-          <name>OCMulticoreNrOfCores</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCMulticoreMaster</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OCMulticorePort</name>
-          <state>53461</state>
-        </option>
-        <option>
-          <name>OCMulticoreWorkspace</name>
-          <state></state>
-        </option>
-        <option>
-          <name>OCMulticoreSlaveProject</name>
-          <state></state>
-        </option>
-        <option>
-          <name>OCMulticoreSlaveConfiguration</name>
-          <state></state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -281,7 +257,7 @@
      <name>CMSISDAP_ID</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>2</version>
+        <version>0</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
        <option>
@@ -356,7 +332,7 @@
        </option>
        <option>
          <name>RDICatchUndef</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>RDICatchSWI</name>
@@ -364,11 +340,11 @@
        </option>
        <option>
          <name>RDICatchData</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>RDICatchPrefetch</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>RDICatchIRQ</name>
@@ -384,31 +360,31 @@
        </option>
        <option>
          <name>CatchMMERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchNOCPERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchCHKERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchSTATERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchBUSERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchINTERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchHARDERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchDummy</name>
@@ -422,30 +398,6 @@
          <name>CMSISDAPMultiCPUNumber</name>
          <state>0</state>
        </option>
-        <option>
-          <name>OCProbeCfgOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OCProbeConfig</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CMSISDAPProbeConfigRadio</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CMSISDAPSelectedCPUBehaviour</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ICpuName</name>
-          <state></state>
-        </option>
-        <option>
-          <name>OCJetEmuParams</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -520,7 +472,7 @@
      <name>IJET_ID</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>3</version>
+        <version>2</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
        <option>
@@ -714,10 +666,6 @@
          <name>ICpuName</name>
          <state></state>
        </option>
-        <option>
-          <name>OCJetEmuParams</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -729,7 +677,7 @@
        <debug>1</debug>
        <option>
          <name>JLinkSpeed</name>
-          <state>1000</state>
+          <state>32</state>
        </option>
        <option>
          <name>CCJLinkDoLogfile</name>
@@ -749,7 +697,7 @@
        </option>
        <option>
          <name>JLinkInitialSpeed</name>
-          <state>1000</state>
+          <state>32</state>
        </option>
        <option>
          <name>CCDoJlinkMultiTarget</name>
@@ -835,7 +783,7 @@
        <option>
          <name>CCJLinkResetList</name>
          <version>6</version>
-          <state>5</state>
+          <state>7</state>
        </option>
        <option>
          <name>CCJLinkInterfaceCmdLine</name>
@@ -1259,7 +1207,7 @@
        </option>
        <option>
          <name>CCXds100InterfaceList</name>
-          <version>2</version>
+          <version>1</version>
          <state>0</state>
        </option>
        <option>
@@ -1305,6 +1253,14 @@
        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
        <loadFlag>0</loadFlag>
      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
      <plugin>
        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
        <loadFlag>0</loadFlag>
@@ -1313,10 +1269,6 @@
        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
        <loadFlag>0</loadFlag>
      </plugin>
-      <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
      <plugin>
        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
        <loadFlag>0</loadFlag>
@@ -1357,7 +1309,7 @@
      <name>C-SPY</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>26</version>
+        <version>25</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
        <option>
@@ -1426,7 +1378,7 @@
        </option>
        <option>
          <name>OCProductVersion</name>
-          <state>7.20.1.7306</state>
+          <state>6.60.1.5099</state>
        </option>
        <option>
          <name>OCDynDriverList</name>
@@ -1528,30 +1480,6 @@
          <name>OCAllMTBOptions</name>
          <state>1</state>
        </option>
-        <option>
-          <name>OCMulticoreNrOfCores</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCMulticoreMaster</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OCMulticorePort</name>
-          <state>53461</state>
-        </option>
-        <option>
-          <name>OCMulticoreWorkspace</name>
-          <state></state>
-        </option>
-        <option>
-          <name>OCMulticoreSlaveProject</name>
-          <state></state>
-        </option>
-        <option>
-          <name>OCMulticoreSlaveConfiguration</name>
-          <state></state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -1626,7 +1554,7 @@
      <name>CMSISDAP_ID</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>2</version>
+        <version>0</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
        <option>
@@ -1701,7 +1629,7 @@
        </option>
        <option>
          <name>RDICatchUndef</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>RDICatchSWI</name>
@@ -1709,11 +1637,11 @@
        </option>
        <option>
          <name>RDICatchData</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>RDICatchPrefetch</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>RDICatchIRQ</name>
@@ -1729,31 +1657,31 @@
        </option>
        <option>
          <name>CatchMMERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchNOCPERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchCHKERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchSTATERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchBUSERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchINTERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchHARDERR</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CatchDummy</name>
@@ -1767,30 +1695,6 @@
          <name>CMSISDAPMultiCPUNumber</name>
          <state>0</state>
        </option>
-        <option>
-          <name>OCProbeCfgOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OCProbeConfig</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CMSISDAPProbeConfigRadio</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CMSISDAPSelectedCPUBehaviour</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ICpuName</name>
-          <state></state>
-        </option>
-        <option>
-          <name>OCJetEmuParams</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -1865,7 +1769,7 @@
      <name>IJET_ID</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>3</version>
+        <version>2</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
        <option>
@@ -2059,10 +1963,6 @@
          <name>ICpuName</name>
          <state></state>
        </option>
-        <option>
-          <name>OCJetEmuParams</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -2074,7 +1974,7 @@
        <debug>0</debug>
        <option>
          <name>JLinkSpeed</name>
-          <state>1000</state>
+          <state>32</state>
        </option>
        <option>
          <name>CCJLinkDoLogfile</name>
@@ -2094,7 +1994,7 @@
        </option>
        <option>
          <name>JLinkInitialSpeed</name>
-          <state>1000</state>
+          <state>32</state>
        </option>
        <option>
          <name>CCDoJlinkMultiTarget</name>
@@ -2604,7 +2504,7 @@
        </option>
        <option>
          <name>CCXds100InterfaceList</name>
-          <version>2</version>
+          <version>1</version>
          <state>0</state>
        </option>
        <option>
@@ -2650,6 +2550,14 @@
        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
        <loadFlag>0</loadFlag>
      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
      <plugin>
        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
        <loadFlag>0</loadFlag>
@@ -2658,10 +2566,6 @@
        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
        <loadFlag>0</loadFlag>
      </plugin>
-      <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
      <plugin>
        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
        <loadFlag>0</loadFlag>
--- a/IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_test_SAMV71_XULT/wolfcrypt_test.ewp
+++ b/IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_test_SAMV71_XULT/wolfcrypt_test.ewp
@@ -12,7 +12,7 @@
      <name>General</name>
      <archiveVersion>3</archiveVersion>
      <data>
-        <version>24</version>
+        <version>22</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
        <option>
@@ -27,6 +27,11 @@
          <name>ListPath</name>
          <state>Debug\List</state>
        </option>
+        <option>
+          <name>Variant</name>
+          <version>20</version>
+          <state>38</state>
+        </option>
        <option>
          <name>GEndianMode</name>
          <state>0</state>
@@ -34,25 +39,30 @@
        <option>
          <name>Input variant</name>
          <version>3</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>Input description</name>
-          <state>Automatic choice of formatter.</state>
+          <state>Full formatting.</state>
        </option>
        <option>
          <name>Output variant</name>
          <version>2</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>Output description</name>
-          <state>Automatic choice of formatter.</state>
+          <state>Full formatting.</state>
        </option>
        <option>
          <name>GOutputBinary</name>
          <state>0</state>
        </option>
+        <option>
+          <name>FPU</name>
+          <version>2</version>
+          <state>0</state>
+        </option>
        <option>
          <name>OGCoreOrChip</name>
          <state>0</state>
@@ -60,24 +70,24 @@
        <option>
          <name>GRuntimeLibSelect</name>
          <version>0</version>
-          <state>1</state>
+          <state>2</state>
        </option>
        <option>
          <name>GRuntimeLibSelectSlave</name>
          <version>0</version>
-          <state>1</state>
+          <state>2</state>
        </option>
        <option>
          <name>RTDescription</name>
-          <state>Use the normal configuration of the C/C++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
        </option>
        <option>
          <name>OGProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>5.10.0.159</state>
        </option>
        <option>
          <name>OGLastSavedByProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>6.60.1.5099</state>
        </option>
        <option>
          <name>GeneralEnableMisra</name>
@@ -123,16 +133,21 @@
        </option>
        <option>
          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave</name>
+          <version>20</version>
+          <state>38</state>
        </option>
        <option>
          <name>GBECoreSlave</name>
-          <version>24</version>
-          <state>41</state>
+          <version>20</version>
+          <state>38</state>
        </option>
        <option>
          <name>OGUseCmsis</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>OGUseCmsisDspLib</name>
@@ -140,50 +155,24 @@
        </option>
        <option>
          <name>GRuntimeLibThreads</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>24</version>
-          <state>41</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>Default	None</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>7</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
          <state>0</state>
        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>24</version>
-          <state>41</state>
-        </option>
      </data>
    </settings>
    <settings>
      <name>ICCARM</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>31</version>
+        <version>29</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
        <option>
          <name>CCDefines</name>
-          <state>DEBUG=1</state>
-          <state>__SAMV71Q21__</state>
-          <state>WOLFSSL_USER_SETTINGS</state>
+          <state></state>
        </option>
        <option>
          <name>CCPreprocFile</name>
@@ -199,11 +188,11 @@
        </option>
        <option>
          <name>CCListCFile</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CCListCMnemonics</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CCListCMessages</name>
@@ -223,7 +212,7 @@
        </option>
        <option>
          <name>CCDiagSuppress</name>
-          <state></state>
+          <state>Pa050</state>
        </option>
        <option>
          <name>CCDiagRemark</name>
@@ -244,7 +233,7 @@
        <option>
          <name>CCAllowList</name>
          <version>1</version>
-          <state>00000000</state>
+          <state>0000000</state>
        </option>
        <option>
          <name>CCDebugInfo</name>
@@ -276,7 +265,7 @@
        </option>
        <option>
          <name>CCRequirePrototypes</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>CCMultibyteSupport</name>
@@ -312,11 +301,7 @@
        </option>
        <option>
          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$\..\..\extract_trial_here\Start\Inc</state>
-          <state>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\DeviceSupport</state>
-          <state>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\</state>
-          <state>$PROJ_DIR$\..\embOS_SAMV71_XULT_user_settings</state>
+          <state>$PROJ_DIR$\..\..\..\..</state>
        </option>
        <option>
          <name>CCStdIncCheck</name>
@@ -409,23 +394,10 @@
          <name>IccFloatSemantics</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
        <option>
          <name>CCNoLiteralPool</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -603,7 +575,7 @@
        <debug>1</debug>
        <option>
          <name>OOCOutputFormat</name>
-          <version>3</version>
+          <version>2</version>
          <state>0</state>
        </option>
        <option>
@@ -612,7 +584,7 @@
        </option>
        <option>
          <name>OOCOutputFile</name>
-          <state>wolfcrypt_test.srec</state>
+          <state>wolfCrypt-test.srec</state>
        </option>
        <option>
          <name>OOCCommandLineProducer</name>
@@ -630,7 +602,6 @@
      <data>
        <extensions></extensions>
        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
      </data>
    </settings>
    <settings>
@@ -650,9 +621,13 @@
      <name>ILINK</name>
      <archiveVersion>0</archiveVersion>
      <data>
-        <version>17</version>
+        <version>16</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>1</debug>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>test.out</state>
+        </option>
        <option>
          <name>IlinkLibIOConfig</name>
          <state>1</state>
@@ -665,10 +640,6 @@
          <name>IlinkInputFileSlave</name>
          <state>0</state>
        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>wolfcrypt_test.out</state>
-        </option>
        <option>
          <name>IlinkDebugInfoEnable</name>
          <state>1</state>
@@ -703,7 +674,7 @@
        </option>
        <option>
          <name>IlinkMapFile</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>IlinkLogFile</name>
@@ -731,7 +702,7 @@
        </option>
        <option>
          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\..\embOS_SAMV71_XULT_Linker_Script\samv71q21_wolfssl.icf</state>
+          <state>$PROJ_DIR$\wolfCrypt-test.icf</state>
        </option>
        <option>
          <name>IlinkIcfFileSlave</name>
@@ -779,8 +750,7 @@
        </option>
        <option>
          <name>IlinkAdditionalLibs</name>
-          <state>$PROJ_DIR$\..\embOS_wolfcrypt_lib_SAMV71_XULT\Debug\Bin\wolfcrypt_lib.a</state>
-          <state>$PROJ_DIR$\..\..\extract_trial_here\Start\Lib\os7m_tlv_dp.a</state>
+          <state>$PROJ_DIR$\Debug\Exe\CyaSSL-Lib.a</state>
        </option>
        <option>
          <name>IlinkOverrideProgramEntryLabel</name>
@@ -935,10 +905,6 @@
          <name>IlinkThreadsSlave</name>
          <state>1</state>
        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -978,7 +944,7 @@
      <name>General</name>
      <archiveVersion>3</archiveVersion>
      <data>
-        <version>24</version>
+        <version>22</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
        <option>
@@ -993,6 +959,11 @@
          <name>ListPath</name>
          <state>Release\List</state>
        </option>
+        <option>
+          <name>Variant</name>
+          <version>20</version>
+          <state>0</state>
+        </option>
        <option>
          <name>GEndianMode</name>
          <state>0</state>
@@ -1000,25 +971,30 @@
        <option>
          <name>Input variant</name>
          <version>3</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>Input description</name>
-          <state></state>
+          <state>Full formatting.</state>
        </option>
        <option>
          <name>Output variant</name>
          <version>2</version>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>Output description</name>
-          <state></state>
+          <state>Full formatting.</state>
        </option>
        <option>
          <name>GOutputBinary</name>
          <state>0</state>
        </option>
+        <option>
+          <name>FPU</name>
+          <version>2</version>
+          <state>0</state>
+        </option>
        <option>
          <name>OGCoreOrChip</name>
          <state>0</state>
@@ -1035,15 +1011,15 @@
        </option>
        <option>
          <name>RTDescription</name>
-          <state></state>
+          <state>Use the normal configuration of the C/C++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
        </option>
        <option>
          <name>OGProductVersion</name>
-          <state>7.60.1.11206</state>
+          <state>5.10.0.159</state>
        </option>
        <option>
          <name>OGLastSavedByProductVersion</name>
-          <state></state>
+          <state>6.30.1.53141</state>
        </option>
        <option>
          <name>GeneralEnableMisra</name>
@@ -1055,7 +1031,7 @@
        </option>
        <option>
          <name>OGChipSelectEditMenu</name>
-          <state></state>
+          <state>default	None</state>
        </option>
        <option>
          <name>GenLowLevelInterface</name>
@@ -1089,12 +1065,17 @@
        </option>
        <option>
          <name>RTConfigPath2</name>
-          <state></state>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave</name>
+          <version>20</version>
+          <state>0</state>
        </option>
        <option>
          <name>GBECoreSlave</name>
-          <version>24</version>
-          <state>38</state>
+          <version>20</version>
+          <state>0</state>
        </option>
        <option>
          <name>OGUseCmsis</name>
@@ -1108,43 +1089,19 @@
          <name>GRuntimeLibThreads</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>24</version>
-          <state>38</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>-</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>24</version>
-          <state>38</state>
-        </option>
      </data>
    </settings>
    <settings>
      <name>ICCARM</name>
      <archiveVersion>2</archiveVersion>
      <data>
-        <version>31</version>
+        <version>29</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
        <option>
          <name>CCDefines</name>
          <state>NDEBUG</state>
@@ -1208,7 +1165,7 @@
        <option>
          <name>CCAllowList</name>
          <version>1</version>
-          <state>11111110</state>
+          <state>1111111</state>
        </option>
        <option>
          <name>CCDebugInfo</name>
@@ -1260,7 +1217,7 @@
        </option>
        <option>
          <name>OutputFile</name>
-          <state></state>
+          <state>$FILE_BNAME$.o</state>
        </option>
        <option>
          <name>CCLibConfigHeader</name>
@@ -1288,7 +1245,7 @@
        </option>
        <option>
          <name>IInterwork2</name>
-          <state>0</state>
+          <state>1</state>
        </option>
        <option>
          <name>IProcessorMode2</name>
@@ -1305,7 +1262,7 @@
        </option>
        <option>
          <name>CCOptLevelSlave</name>
-          <state>1</state>
+          <state>3</state>
        </option>
        <option>
          <name>CompilerMisraRules98</name>
@@ -1369,23 +1326,10 @@
          <name>IccFloatSemantics</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
        <option>
          <name>CCNoLiteralPool</name>
          <state>0</state>
        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -1518,7 +1462,7 @@
        </option>
        <option>
          <name>AOutputFile</name>
-          <state></state>
+          <state>$FILE_BNAME$.o</state>
        </option>
        <option>
          <name>AMultibyteSupport</name>
@@ -1563,7 +1507,7 @@
        <debug>0</debug>
        <option>
          <name>OOCOutputFormat</name>
-          <version>3</version>
+          <version>2</version>
          <state>0</state>
        </option>
        <option>
@@ -1572,7 +1516,7 @@
        </option>
        <option>
          <name>OOCOutputFile</name>
-          <state></state>
+          <state>c.srec</state>
        </option>
        <option>
          <name>OOCCommandLineProducer</name>
@@ -1590,7 +1534,6 @@
      <data>
        <extensions></extensions>
        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
      </data>
    </settings>
    <settings>
@@ -1610,9 +1553,13 @@
      <name>ILINK</name>
      <archiveVersion>0</archiveVersion>
      <data>
-        <version>17</version>
+        <version>16</version>
        <wantNonLocal>1</wantNonLocal>
        <debug>0</debug>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>c.out</state>
+        </option>
        <option>
          <name>IlinkLibIOConfig</name>
          <state>1</state>
@@ -1625,10 +1572,6 @@
          <name>IlinkInputFileSlave</name>
          <state>0</state>
        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>###Unitialized###</state>
-        </option>
        <option>
          <name>IlinkDebugInfoEnable</name>
          <state>1</state>
@@ -1663,7 +1606,7 @@
        </option>
        <option>
          <name>IlinkMapFile</name>
-          <state>1</state>
+          <state>0</state>
        </option>
        <option>
          <name>IlinkLogFile</name>
@@ -1691,7 +1634,7 @@
        </option>
        <option>
          <name>IlinkIcfFile</name>
-          <state>lnk0t.icf</state>
+          <state>$TOOLKIT_DIR$\CONFIG\generic.icf</state>
        </option>
        <option>
          <name>IlinkIcfFileSlave</name>
@@ -1894,10 +1837,6 @@
          <name>IlinkThreadsSlave</name>
          <state>1</state>
        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
      </data>
    </settings>
    <settings>
@@ -1927,69 +1866,12 @@
      <data/>
    </settings>
  </configuration>
-  <group>
-    <name>Application</name>
-    <file>
-      <name>$PROJ_DIR$\Application\runWolfcryptTests.c</name>
-    </file>
-  </group>
-  <group>
-    <name>Device_Support</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\DeviceSupport\startup_sam.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\DeviceSupport\system_sam.c</name>
-    </file>
-  </group>
-  <group>
-    <name>Setup</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\BSP.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\HardFaultHandler.S</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\JLINKMEM_Process.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\OS_Error.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\RTOSInit_SAMV71_CMSIS.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_HardFaultHandler.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_RTT.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_RTT_printf.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_SYSVIEW.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_SYSVIEW_Config_embOS.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\SEGGER_SYSVIEW_embOS.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\xmtx.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\extract_trial_here\Start\BoardSupport\Atmel\SAMV71_XPlainedUltra\Setup\xmtx2.c</name>
-    </file>
-  </group>
-  <group>
-    <name>wolfcrypt_test</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\test\test.c</name>
-    </file>
-  </group>
+  <file>
+    <name>$PROJ_DIR$\test-main.c</name>
+  </file>
+  <file>
+    <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\test\test.c</name>
+  </file>
 </project>


--- a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/wolfCrypt-test.icf
+++ b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/wolfCrypt-test.icf
@@ -0,0 +1,31 @@
+/*###ICF### Section handled by ICF editor, don't touch! ****/
+/*-Editor annotation file-*/
+/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
+/*-Specials-*/
+define symbol __ICFEDIT_intvec_start__ = 0x0;
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_ROM_start__ = 0x0;
+define symbol __ICFEDIT_region_ROM_end__   = 0x000FFFFF;
+define symbol __ICFEDIT_region_RAM_start__ = 0x1FFF0000;
+define symbol __ICFEDIT_region_RAM_end__   = 0x2000FFFF;
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x2000;
+define symbol __ICFEDIT_size_heap__   = 0x3000;
+/**** End of ICF editor section. ###ICF###*/
+
+
+define memory mem with size = 4G;
+define region ROM_region   = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];
+define region RAM_region   = mem:[from __ICFEDIT_region_RAM_start__   to __ICFEDIT_region_RAM_end__];
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly };
+place in RAM_region   { readwrite,
+                        block CSTACK, block HEAP };
--- a/IDE/IAR-EWARM/Projects/benchmark/current_time.c
+++ b/IDE/IAR-EWARM/Projects/benchmark/current_time.c
@@ -1,73 +0,0 @@
-/* current-time.c
- *
- * Copyright (C) 2006-2019 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include <wolfssl/wolfcrypt/settings.h>
-
-#ifdef WOLFSSL_TI_CURRTIME
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "inc/hw_ints.h"
-#include "inc/hw_memmap.h"
-#include "inc/hw_timer.h"
-#include "driverlib/rom.h"
-#include "driverlib/sysctl.h"
-#include "driverlib/timer.h"
-
-void InitTimer(void) {
-    uint32_t ui32SysClock = ROM_SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ |
-                                       SYSCTL_OSC_MAIN |
-                                       SYSCTL_USE_PLL |
-                                       SYSCTL_CFG_VCO_480), 120000000);
-
-    printf("Clock=%dMHz\n", ui32SysClock/1000000) ;
-    ROM_SysCtlPeripheralEnable(SYSCTL_PERIPH_TIMER0);
-    ROM_TimerConfigure(TIMER0_BASE, TIMER_CFG_PERIODIC);
-    ROM_TimerLoadSet(TIMER0_BASE, TIMER_A, -1);
-    ROM_TimerEnable(TIMER0_BASE, TIMER_A);
-}
-
-static int initFlag = false ;
-double current_time(int reset)
-{
-    if(!initFlag)InitTimer() ;
-    initFlag = true ;
-    if(reset)ROM_TimerLoadSet(TIMER0_BASE, TIMER_A, -1);
-    return (double)(-(int)ROM_TimerValueGet(TIMER0_BASE, TIMER_A ))/120000000.0 ;
-}
-
-#else
-
-/* dummy */
-double current_time(int reset) {
-    static double t; 
-    t += 1.0; /* for avoid infinit loop of waiting time */
-    if(reset)t = 0.0;
-    return t ; 
-} 
-
-#endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Safranek	e86c6d8c84	Merge branch 'master' of github.com:cyassl/cyassl	2015-01-08 15:27:23 -08:00
John Safranek	c1546bf20b	In sniffer changed a memcpy to memmove; update for v3.3.2	2015-01-08 15:25:14 -08:00
Chris Conlon	b8c65ec0de	fix NO_INLINE word error in misc.h, change to cyassl_word	2015-01-08 10:31:26 -07:00
John Safranek	3c86c16d85	In hash drbg changed assignment to memcpy to fix strict aliasing warning.	2015-01-06 14:25:57 -08:00
John Safranek	a8803e1e16	1. snifftest.c needs socket.h included for AIX 2. cleaned up whitespace in snifftest.c	2015-01-06 11:08:37 -08:00
John Safranek	06714584f9	fix local variable masking global in SetKeysSide()	2015-01-06 09:27:40 -08:00
John Safranek	46d9037d26	removed some AC_REQUIRE statements for macros that have parameters. causing some trouble under ksh.	2015-01-05 16:20:13 -08:00