feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge branch 'master' of https://github.com/wolfSSL/wolfssl into IntelAVX

Browse Source
This commit is contained in:
Takashi Kojo
2015-03-23 18:43:01 +09:00
parent 16f0b603c3 9f2454fc78
commit 2a2bf81c15
92 changed files with 10905 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

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

31
configure.ac
View File

@@ -6,7 +6,7 @@
#
#
AC_INIT([wolfssl],[3.4.2],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
AC_INIT([wolfssl],[3.4.3],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
AC_CONFIG_AUX_DIR([build-aux])
@@ -643,6 +643,7 @@ AC_ARG_ENABLE([ecc25519],
if test "$ENABLED_ECC25519" = "yes"
then
ENABLED_FEMATH=yes
AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC25519"
fi
@@ -650,7 +651,31 @@ fi
AM_CONDITIONAL([BUILD_ECC25519], [test "x$ENABLED_ECC25519" = "xyes"])
# FP ECC, Fixed Point cache ECC
# ED25519
AC_ARG_ENABLE([ed25519],
[AS_HELP_STRING([--enable-ed25519],[Enable ED25519 (default: disabled)])],
[ ENABLED_ED25519=$enableval ],
[ ENABLED_ED25519=no ]
)
if test "$ENABLED_ED25519" = "yes"
then
if test "$ENABLED_SHA512" = "no"
then
AC_MSG_ERROR([cannot enable ed25519 without enabling sha512.])
fi
ENABLED_FEMATH=yes
ENABLED_GEMATH=yes
AM_CFLAGS="$AM_CFLAGS -DHAVE_ED25519"
fi
AM_CONDITIONAL([BUILD_ED25519], [test "x$ENABLED_ED25519" = "xyes"])
AM_CONDITIONAL([BUILD_FEMATH], [test "x$ENABLED_FEMATH" = "xyes"])
AM_CONDITIONAL([BUILD_GEMATH], [test "x$ENABLED_GEMATH" = "xyes"])
# FP ECC, Fixed Point cache ECC
AC_ARG_ENABLE([fpecc],
[ --enable-fpecc Enable Fixed Point cache ECC (default: disabled)],
[ ENABLED_FPECC=$enableval ],
@@ -1934,6 +1959,8 @@ echo " * RSA: $ENABLED_RSA"
echo " * DSA: $ENABLED_DSA"
echo " * DH: $ENABLED_DH"
echo " * ECC: $ENABLED_ECC"
echo " * CURVE25519: $ENABLED_ECC25519"
echo " * ED25519: $ENABLED_ED25519"
echo " * FPECC: $ENABLED_FPECC"
echo " * ECC_ENCRYPT: $ENABLED_ECC_ENCRYPT"
echo " * ASN: $ENABLED_ASN"

2
cyassl/ctaocrypt/random.h
View File

@@ -28,9 +28,9 @@
#define InitRng wc_InitRng
#define RNG_GenerateBlock wc_RNG_GenerateBlock
#define RNG_GenerateByte wc_RNG_GenerateByte
#define FreeRng wc_FreeRng
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
#define FreeRng wc_FreeRng
#define RNG_HealthTest wc_RNG_HealthTest
#endif /* HAVE_HASHDRBG || NO_RC4 */

2
examples/client/client.vcxproj
View File

@@ -98,6 +98,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -137,6 +138,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

4
examples/echoclient/echoclient-ntru.vcproj
View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
PreprocessorDefinitions="WIN32;NO_PSK;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -118,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
PreprocessorDefinitions="WIN32;NDEBUG;NO_PSK;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"

4
examples/echoclient/echoclient.vcxproj
View File

@@ -98,6 +98,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -137,6 +139,8 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

4
examples/echoserver/echoserver-ntru.vcproj
View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../"
PreprocessorDefinitions="USE_ANY_ADDR"
PreprocessorDefinitions="USE_ANY_ADDR;NO_PSK"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -118,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../"
PreprocessorDefinitions="USE_ANY_ADDR"
PreprocessorDefinitions="USE_ANY_ADDR;NO_PSK"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"

3
examples/echoserver/echoserver.vcxproj
View File

@@ -98,6 +98,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -137,6 +139,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

4
examples/server/server.vcxproj
View File

@@ -98,6 +98,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -137,6 +139,8 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

2
m4/ax_am_jobserver.m4
View File

@@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 7
#serial 7.1
AC_DEFUN([AX_AM_JOBSERVER], [
AC_REQUIRE([AX_COUNT_CPUS])

5
m4/ax_harden_compiler_flags.m4
View File

@@ -62,10 +62,9 @@
# AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all],,[$ax_append_compile_cflags_extra]) -- causes RSA verify problem on x64
# AX_APPEND_COMPILE_FLAGS([-Wunreachable-code],,[$ax_append_compile_cflags_extra]) -- older clang and when gcc had it are buggy
#serial 4
#serial 4.1
AC_DEFUN([AX_HARDEN_LINKER_FLAGS], [
AC_REQUIRE([AX_CHECK_LINK_FLAG])
AC_REQUIRE([AX_VCS_CHECKOUT])
AC_REQUIRE([AX_DEBUG])
@@ -94,7 +93,6 @@
])
AC_DEFUN([AX_HARDEN_CC_COMPILER_FLAGS], [
AC_REQUIRE([AX_APPEND_COMPILE_FLAGS])
AC_REQUIRE([AX_HARDEN_LINKER_FLAGS])
AC_LANG_PUSH([C])
@@ -229,7 +227,6 @@
])
AC_DEFUN([AX_CC_OTHER_FLAGS], [
AC_REQUIRE([AX_APPEND_COMPILE_FLAGS])
AC_REQUIRE([AX_HARDEN_CC_COMPILER_FLAGS])
AC_LANG_PUSH([C])

20
mqx/README
View File

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

22
mqx/cyassl_client/Sources/include.am
View File

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

18
mqx/wolfcrypt_benchmark/.cproject
View File

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

6
mqx/wolfcrypt_benchmark/.project
View File

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

26
mqx/wolfcrypt_benchmark/ReferencedRSESystems.xml
View File

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

28
mqx/wolfcrypt_benchmark/Sources/include.am
View File

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

2
mqx/wolfcrypt_benchmark/Sources/main.c
View File

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

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

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

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

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

18
mqx/wolfcrypt_test/.cproject
View File

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

6
mqx/wolfcrypt_test/.project
View File

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

26
mqx/wolfcrypt_test/ReferencedRSESystems.xml
View File

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

8
mqx/wolfcrypt_test/Sources/include.am
View File

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

4
mqx/wolfcrypt_test/Sources/main.c
View File

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

2
mqx/wolfcrypt_test/Sources/main.h
View File

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

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

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

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

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

20
mqx/cyassl/.cproject → mqx/wolfssl/.cproject
View File

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

10
mqx/cyassl/.project → mqx/wolfssl/.project
View File

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

4
mqx/cyassl/include.am → mqx/wolfssl/include.am
View File

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

42
mqx/cyassl_client/.cproject → mqx/wolfssl_client/.cproject
View File

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

6
mqx/cyassl_client/.project → mqx/wolfssl_client/.project
View File

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

0
mqx/cyassl_client/Debugger/K70FN1M0.mem → mqx/wolfssl_client/Debugger/K70FN1M0.mem
View File

0
mqx/cyassl_client/Debugger/init_kinetis.tcl → mqx/wolfssl_client/Debugger/init_kinetis.tcl
View File

0
mqx/cyassl_client/Debugger/mass_erase_kinetis.tcl → mqx/wolfssl_client/Debugger/mass_erase_kinetis.tcl
View File

28
mqx/cyassl_client/ReferencedRSESystems.xml → mqx/wolfssl_client/ReferencedRSESystems.xml
View File

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

22
mqx/wolfssl_client/Sources/include.am Normal file
View File

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

68
mqx/cyassl_client/Sources/main.c → mqx/wolfssl_client/Sources/main.c
View File

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

4
mqx/cyassl_client/Sources/main.h → mqx/wolfssl_client/Sources/main.h
View File

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

6
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE U-MultiLink.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_DDRData_Debug_PnE_U-MultiLink.launch
View File

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

6
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE U-MultiLink.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_DDRData_Release_PnE_U-MultiLink.launch
View File

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

0
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.jlink
View File

6
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_JTrace.launch
View File

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

6
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE U-MultiLink.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Debug_PnE_U-MultiLink.launch
View File

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

6
mqx/cyassl_client/cyassl_client_twrk70f120m_Int_Flash_SramData_Release_PnE U-MultiLink.launch → mqx/wolfssl_client/wolfssl_client_twrk70f120m_Int_Flash_SramData_Release_PnE_U-MultiLink.launch
View File

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

13
src/include.am
View File

@@ -169,7 +169,18 @@ endif
if BUILD_ECC25519
src_libwolfssl_la_SOURCES += wolfcrypt/src/ecc25519.c
src_libwolfssl_la_SOURCES += wolfcrypt/src/ecc25519_fe.c
endif
if BUILD_ED25519
src_libwolfssl_la_SOURCES += wolfcrypt/src/ed25519.c
endif
if BUILD_FEMATH
src_libwolfssl_la_SOURCES += wolfcrypt/src/fe_operations.c
endif
if BUILD_GEMATH
src_libwolfssl_la_SOURCES += wolfcrypt/src/ge_operations.c
endif
if BUILD_LIBZ

87
src/internal.c
View File

@@ -62,6 +62,10 @@
#define FALSE 0
#endif
#ifdef _MSC_VER
/* disable for while(0) cases at the .c level for now */
#pragma warning(disable:4127)
#endif
#if defined(WOLFSSL_CALLBACKS) && !defined(LARGE_STATIC_BUFFERS)
#error \
@@ -1715,9 +1719,7 @@ void SSL_ResourceFree(WOLFSSL* ssl)
FreeCiphers(ssl);
FreeArrays(ssl, 0);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(ssl->rng);
#endif
XFREE(ssl->rng, ssl->heap, DYNAMIC_TYPE_RNG);
XFREE(ssl->suites, ssl->heap, DYNAMIC_TYPE_SUITES);
XFREE(ssl->hsHashes, ssl->heap, DYNAMIC_TYPE_HASHES);
@@ -1832,9 +1834,7 @@ void FreeHandshakeResources(WOLFSSL* ssl)
/* RNG */
if (ssl->specs.cipher_type == stream || ssl->options.tls1_1 == 0) {
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(ssl->rng);
#endif
XFREE(ssl->rng, ssl->heap, DYNAMIC_TYPE_RNG);
ssl->rng = NULL;
}
@@ -6532,7 +6532,7 @@ int ProcessReply(WOLFSSL* ssl)
if (ssl->keys.encryptionOn && ssl->options.handShakeDone) {
ssl->buffers.inputBuffer.idx += ssl->keys.padSz;
ssl->curSize -= ssl->buffers.inputBuffer.idx;
ssl->curSize -= (word16) ssl->buffers.inputBuffer.idx;
}
if (ssl->curSize != 1) {
@@ -9562,6 +9562,42 @@ static void PickHashSigAlgo(WOLFSSL* ssl,
#endif /* !NO_CERTS */
#ifdef HAVE_ECC
static int CheckCurveId(int oid)
{
int ret = 0;
switch (oid) {
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC160)
case WOLFSSL_ECC_SECP160R1:
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC192)
case WOLFSSL_ECC_SECP192R1:
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC224)
case WOLFSSL_ECC_SECP224R1:
#endif
#if defined(HAVE_ALL_CURVES) || !defined(NO_ECC256)
case WOLFSSL_ECC_SECP256R1:
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC384)
case WOLFSSL_ECC_SECP384R1:
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC521)
case WOLFSSL_ECC_SECP521R1:
#endif
break;
default:
ret = -1;
}
return ret;
}
#endif /* HAVE_ECC */
static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
word32* inOutIdx, word32 size)
{
@@ -9689,9 +9725,9 @@ static void PickHashSigAlgo(WOLFSSL* ssl,
*inOutIdx += 1; /* curve type, eat leading 0 */
b = input[(*inOutIdx)++];
if (b != secp256r1 && b != secp384r1 && b != secp521r1 && b !=
secp160r1 && b != secp192r1 && b != secp224r1)
if (CheckCurveId(b) != 0) {
return ECC_CURVE_ERROR;
}
length = input[(*inOutIdx)++];
@@ -10845,10 +10881,15 @@ static void PickHashSigAlgo(WOLFSSL* ssl,
#endif /*HAVE_PK_CALLBACKS */
if (IsAtLeastTLSv1_2(ssl)) {
byte* digest;
int digestSz;
int typeH;
int didSet = 0;
/*
* MSVC Compiler complains because it can not
* guarantee any of the conditionals will succeed in
* assigning a value before wc_EncodeSignature executes.
*/
byte* digest = NULL;
int digestSz = 0;
int typeH = 0;
int didSet = 0;
if (ssl->suites->hashAlgo == sha_mac) {
#ifndef NO_SHA
@@ -11180,18 +11221,30 @@ int DoSessionTicket(WOLFSSL* ssl,
static byte SetCurveId(int size)
{
switch(size) {
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC160)
case 20:
return secp160r1;
return WOLFSSL_ECC_SECP160R1;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC192)
case 24:
return secp192r1;
return WOLFSSL_ECC_SECP192R1;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC224)
case 28:
return secp224r1;
return WOLFSSL_ECC_SECP224R1;
#endif
#if defined(HAVE_ALL_CURVES) || !defined(NO_ECC256)
case 32:
return secp256r1;
return WOLFSSL_ECC_SECP256R1;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC384)
case 48:
return secp384r1;
return WOLFSSL_ECC_SECP384R1;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC521)
case 66:
return secp521r1;
return WOLFSSL_ECC_SECP521R1;
#endif
default:
return 0;
}

85
src/ssl.c
View File

@@ -2464,6 +2464,7 @@ static int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
(byte*)password, passwordSz, 1, key, iv)) <= 0) {
/* empty */
}
#ifndef NO_DES3
else if (XSTRNCMP(info->name, "DES-CBC", 7) == 0) {
ret = wc_Des_CbcDecryptWithKey(der.buffer, der.buffer, der.length,
key, info->iv);
@@ -2472,6 +2473,8 @@ static int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
ret = wc_Des3_CbcDecryptWithKey(der.buffer, der.buffer, der.length,
key, info->iv);
}
#endif
#ifndef NO_AES
else if (XSTRNCMP(info->name, "AES-128-CBC", 13) == 0) {
ret = wc_AesCbcDecryptWithKey(der.buffer, der.buffer, der.length,
key, AES_128_KEY_SIZE, info->iv);
@@ -2484,6 +2487,7 @@ static int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
ret = wc_AesCbcDecryptWithKey(der.buffer, der.buffer, der.length,
key, AES_256_KEY_SIZE, info->iv);
}
#endif
else {
ret = SSL_BAD_FILE;
}
@@ -7479,7 +7483,12 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
const WOLFSSL_EVP_CIPHER* type, byte* key,
byte* iv, int enc)
{
#if defined(NO_AES) && defined(NO_DES3)
(void)iv;
(void)enc;
#else
int ret = 0;
#endif
WOLFSSL_ENTER("wolfSSL_EVP_CipherInit");
if (ctx == NULL) {
@@ -7492,6 +7501,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
return 0; /* failure */
}
#ifndef NO_AES
if (ctx->cipherType == AES_128_CBC_TYPE || (type &&
XSTRNCMP(type, "AES128-CBC", 10) == 0)) {
WOLFSSL_MSG("AES-128-CBC");
@@ -7608,6 +7618,9 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
}
}
#endif /* WOLFSSL_AES_CTR */
#endif /* NO_AES */
#ifndef NO_DES3
else if (ctx->cipherType == DES_CBC_TYPE || (type &&
XSTRNCMP(type, "DES-CBC", 7) == 0)) {
WOLFSSL_MSG("DES-CBC");
@@ -7645,6 +7658,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
return ret;
}
}
#endif /* NO_DES3 */
else if (ctx->cipherType == ARC4_TYPE || (type &&
XSTRNCMP(type, "ARC4", 4) == 0)) {
WOLFSSL_MSG("ARC4");
@@ -7712,6 +7726,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
switch (ctx->cipherType) {
#ifndef NO_AES
case AES_128_CBC_TYPE :
case AES_192_CBC_TYPE :
case AES_256_CBC_TYPE :
@@ -7730,7 +7745,9 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
wc_AesCtrEncrypt(&ctx->cipher.aes, dst, src, len);
break;
#endif
#endif /* NO_AES */
#ifndef NO_DES3
case DES_CBC_TYPE :
if (ctx->enc)
wc_Des_CbcEncrypt(&ctx->cipher.des, dst, src, len);
@@ -7744,6 +7761,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
else
ret = wc_Des3_CbcDecrypt(&ctx->cipher.des3, dst, src, len);
break;
#endif
case ARC4_TYPE :
wc_Arc4Process(&ctx->cipher.arc4, dst, src, len);
@@ -7781,6 +7799,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
switch (ctx->cipherType) {
#ifndef NO_AES
case AES_128_CBC_TYPE :
case AES_192_CBC_TYPE :
case AES_256_CBC_TYPE :
@@ -7795,8 +7814,11 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
WOLFSSL_MSG("AES CTR");
memcpy(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
break;
#endif
#endif /* WOLFSSL_AES_COUNTER */
#endif /* NO_AES */
#ifndef NO_DES3
case DES_CBC_TYPE :
WOLFSSL_MSG("DES CBC");
memcpy(ctx->iv, &ctx->cipher.des.reg, DES_BLOCK_SIZE);
@@ -7806,6 +7828,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
WOLFSSL_MSG("DES EDE3 CBC");
memcpy(ctx->iv, &ctx->cipher.des.reg, DES_BLOCK_SIZE);
break;
#endif
case ARC4_TYPE :
WOLFSSL_MSG("ARC4");
@@ -7837,6 +7860,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
switch (ctx->cipherType) {
#ifndef NO_AES
case AES_128_CBC_TYPE :
case AES_192_CBC_TYPE :
case AES_256_CBC_TYPE :
@@ -7853,6 +7877,9 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
break;
#endif
#endif /* NO_AES */
#ifndef NO_DES3
case DES_CBC_TYPE :
WOLFSSL_MSG("DES CBC");
memcpy(&ctx->cipher.des.reg, ctx->iv, DES_BLOCK_SIZE);
@@ -7862,6 +7889,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
WOLFSSL_MSG("DES EDE3 CBC");
memcpy(&ctx->cipher.des.reg, ctx->iv, DES_BLOCK_SIZE);
break;
#endif
case ARC4_TYPE :
WOLFSSL_MSG("ARC4");
@@ -8059,6 +8087,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
}
#ifndef NO_DES3
/* SSL_SUCCESS on ok */
int wolfSSL_DES_key_sched(WOLFSSL_const_DES_cblock* key,
WOLFSSL_DES_key_schedule* schedule)
@@ -8109,6 +8138,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
XMEMCPY(ivec, output + length - sizeof(DES_cblock), sizeof(DES_cblock));
}
#endif /* NO_DES3 */
void wolfSSL_ERR_free_strings(void)
{
@@ -10122,6 +10153,7 @@ long wolfSSL_CTX_sess_number(WOLFSSL_CTX* ctx)
return 0;
}
#ifndef NO_DES3
void wolfSSL_DES_set_key_unchecked(WOLFSSL_const_DES_cblock* myDes,
WOLFSSL_DES_key_schedule* key)
@@ -10146,6 +10178,8 @@ void wolfSSL_DES_ecb_encrypt(WOLFSSL_DES_cblock* desa,
(void)len;
}
#endif /* NO_DES3 */
int wolfSSL_BIO_printf(WOLFSSL_BIO* bio, const char* format, ...)
{
(void)bio;
@@ -10417,11 +10451,8 @@ int wolfSSL_RAND_bytes(unsigned char* buf, int num)
ret = SSL_SUCCESS;
}
if (initTmpRng) {
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(tmpRNG);
#endif
}
if (initTmpRng)
wc_FreeRng(tmpRNG);
#ifdef WOLFSSL_SMALL_STACK
XFREE(tmpRNG, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -10696,6 +10727,7 @@ int wolfSSL_BN_rand(WOLFSSL_BIGNUM* bn, int bits, int top, int bottom)
{
int ret = 0;
int len = bits / 8;
int initTmpRng = 0;
RNG* rng = NULL;
#ifdef WOLFSSL_SMALL_STACK
RNG* tmpRNG = NULL;
@@ -10724,8 +10756,10 @@ int wolfSSL_BN_rand(WOLFSSL_BIGNUM* bn, int bits, int top, int bottom)
if (bn == NULL || bn->internal == NULL)
WOLFSSL_MSG("Bad function arguments");
else if (wc_InitRng(tmpRNG) == 0)
else if (wc_InitRng(tmpRNG) == 0) {
rng = tmpRNG;
initTmpRng = 1;
}
else if (initGlobalRNG)
rng = &globalRNG;
@@ -10743,6 +10777,9 @@ int wolfSSL_BN_rand(WOLFSSL_BIGNUM* bn, int bits, int top, int bottom)
}
}
if (initTmpRng)
wc_FreeRng(tmpRNG);
#ifdef WOLFSSL_SMALL_STACK
XFREE(buff, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(tmpRNG, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -11017,6 +11054,7 @@ int wolfSSL_DH_generate_key(WOLFSSL_DH* dh)
int ret = 0;
word32 pubSz = 768;
word32 privSz = 768;
int initTmpRng = 0;
RNG* rng = NULL;
#ifdef WOLFSSL_SMALL_STACK
unsigned char* pub = NULL;
@@ -11047,8 +11085,10 @@ int wolfSSL_DH_generate_key(WOLFSSL_DH* dh)
WOLFSSL_MSG("Bad function arguments");
else if (dh->inSet == 0 && SetDhInternal(dh) < 0)
WOLFSSL_MSG("Bad DH set internal");
else if (wc_InitRng(tmpRNG) == 0)
else if (wc_InitRng(tmpRNG) == 0) {
rng = tmpRNG;
initTmpRng = 1;
}
else {
WOLFSSL_MSG("Bad RNG Init, trying global");
if (initGlobalRNG == 0)
@@ -11089,6 +11129,9 @@ int wolfSSL_DH_generate_key(WOLFSSL_DH* dh)
}
}
if (initTmpRng)
wc_FreeRng(tmpRNG);
#ifdef WOLFSSL_SMALL_STACK
XFREE(tmpRNG, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(pub, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -11504,6 +11547,7 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* bn,
ret = SSL_SUCCESS;
}
wc_FreeRng(rng);
#ifdef WOLFSSL_SMALL_STACK
XFREE(rng, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
@@ -11575,6 +11619,7 @@ int wolfSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet,
WOLFSSL_DSA* dsa)
{
int ret = SSL_FATAL_ERROR;
int initTmpRng = 0;
RNG* rng = NULL;
#ifdef WOLFSSL_SMALL_STACK
RNG* tmpRNG = NULL;
@@ -11595,8 +11640,10 @@ int wolfSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet,
return SSL_FATAL_ERROR;
#endif
if (wc_InitRng(tmpRNG) == 0)
if (wc_InitRng(tmpRNG) == 0) {
rng = tmpRNG;
initTmpRng = 1;
}
else {
WOLFSSL_MSG("Bad RNG Init, trying global");
if (initGlobalRNG == 0)
@@ -11612,8 +11659,10 @@ int wolfSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet,
ret = SSL_SUCCESS;
}
if (initTmpRng)
wc_FreeRng(tmpRNG);
#ifdef WOLFSSL_SMALL_STACK
XFREE(RNG, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(tmpRNG, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
}
@@ -11630,6 +11679,7 @@ int wolfSSL_RSA_sign(int type, const unsigned char* m,
{
word32 outLen;
word32 signSz;
int initTmpRng = 0;
RNG* rng = NULL;
int ret = 0;
#ifdef WOLFSSL_SMALL_STACK
@@ -11666,8 +11716,10 @@ int wolfSSL_RSA_sign(int type, const unsigned char* m,
if (outLen == 0)
WOLFSSL_MSG("Bad RSA size");
else if (wc_InitRng(tmpRNG) == 0)
else if (wc_InitRng(tmpRNG) == 0) {
rng = tmpRNG;
initTmpRng = 1;
}
else {
WOLFSSL_MSG("Bad RNG Init, trying global");
@@ -11696,6 +11748,9 @@ int wolfSSL_RSA_sign(int type, const unsigned char* m,
}
if (initTmpRng)
wc_FreeRng(tmpRNG);
#ifdef WOLFSSL_SMALL_STACK
XFREE(tmpRNG, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(encodedSig, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -11941,6 +11996,8 @@ int wolfSSL_EVP_X_STATE_LEN(const WOLFSSL_EVP_CIPHER_CTX* ctx)
}
#ifndef NO_DES3
void wolfSSL_3des_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
unsigned char* iv, int len)
{
@@ -11959,6 +12016,10 @@ void wolfSSL_3des_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
memcpy(iv, &ctx->cipher.des3.reg, DES_BLOCK_SIZE);
}
#endif /* NO_DES3 */
#ifndef NO_AES
void wolfSSL_aes_ctr_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
unsigned char* iv, int len)
@@ -11978,6 +12039,8 @@ void wolfSSL_aes_ctr_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
memcpy(iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
}
#endif /* NO_AES */
const WOLFSSL_EVP_MD* wolfSSL_EVP_ripemd160(void)
{

12
src/tls.c
View File

@@ -1502,12 +1502,24 @@ int TLSX_ValidateEllipticCurves(WOLFSSL* ssl, byte first, byte second) {
for (curve = extension->data; curve && !(sig && key); curve = curve->next) {
switch (curve->name) {
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC160)
case WOLFSSL_ECC_SECP160R1: oid = ECC_160R1; octets = 20; break;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC192)
case WOLFSSL_ECC_SECP192R1: oid = ECC_192R1; octets = 24; break;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC224)
case WOLFSSL_ECC_SECP224R1: oid = ECC_224R1; octets = 28; break;
#endif
#if defined(HAVE_ALL_CURVES) || !defined(NO_ECC256)
case WOLFSSL_ECC_SECP256R1: oid = ECC_256R1; octets = 32; break;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC384)
case WOLFSSL_ECC_SECP384R1: oid = ECC_384R1; octets = 48; break;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC521)
case WOLFSSL_ECC_SECP521R1: oid = ECC_521R1; octets = 66; break;
#endif
default: continue; /* unsupported curve */
}

2
sslSniffer/sslSniffer.vcxproj
View File

@@ -98,6 +98,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -137,6 +138,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

1
sslSniffer/sslSnifferTest/snifftest.c
View File

@@ -53,6 +53,7 @@ int main(void)
#include <stdlib.h> /* EXIT_SUCCESS */
#include <string.h> /* strcmp */
#include <signal.h> /* signal */
#include <sys/socket.h> /* AF_INET */
#include <cyassl/sniffer.h>

2
support/wolfssl.pc
View File

@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: wolfssl
Description: wolfssl C library.
Version: 3.4.2
Version: 3.4.3
Libs: -L${libdir} -lwolfssl
Cflags: -I${includedir}

8
tests/api.c
View File

@@ -1126,18 +1126,18 @@ static void test_wolfSSL_UseSupportedCurve(void)
#ifndef NO_WOLFSSL_CLIENT
/* error cases */
AssertIntNE(SSL_SUCCESS,
wolfSSL_CTX_UseSupportedCurve(NULL, WOLFSSL_ECC_SECP160R1));
wolfSSL_CTX_UseSupportedCurve(NULL, WOLFSSL_ECC_SECP256R1));
AssertIntNE(SSL_SUCCESS, wolfSSL_CTX_UseSupportedCurve(ctx, 0));
AssertIntNE(SSL_SUCCESS,
wolfSSL_UseSupportedCurve(NULL, WOLFSSL_ECC_SECP160R1));
wolfSSL_UseSupportedCurve(NULL, WOLFSSL_ECC_SECP256R1));
AssertIntNE(SSL_SUCCESS, wolfSSL_UseSupportedCurve(ssl, 0));
/* success case */
AssertIntEQ(SSL_SUCCESS,
wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP160R1));
wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP256R1));
AssertIntEQ(SSL_SUCCESS,
wolfSSL_UseSupportedCurve(ssl, WOLFSSL_ECC_SECP160R1));
wolfSSL_UseSupportedCurve(ssl, WOLFSSL_ECC_SECP256R1));
#endif
wolfSSL_free(ssl);

4
testsuite/testsuite.vcxproj
View File

@@ -98,6 +98,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -137,6 +138,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -177,4 +179,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

99
wolfcrypt/benchmark/benchmark.c
View File

@@ -60,6 +60,9 @@
#ifdef HAVE_ECC25519
#include <wolfssl/wolfcrypt/ecc25519.h>
#endif
#ifdef HAVE_ED25519
#include <wolfssl/wolfcrypt/ed25519.h>
#endif
#include <wolfssl/wolfcrypt/dh.h>
#ifdef HAVE_CAVIUM
@@ -143,6 +146,10 @@ void bench_eccKeyAgree(void);
void bench_ecc25519KeyGen(void);
void bench_ecc25519KeyAgree(void);
#endif
#ifdef HAVE_ED25519
void bench_ed25519KeyGen(void);
void bench_ed25519KeySign(void);
#endif
#ifdef HAVE_NTRU
void bench_ntru(void);
void bench_ntruKeyGen(void);
@@ -354,7 +361,12 @@ int benchmark_test(void *args)
bench_ecc25519KeyAgree();
#endif
#if defined(HAVE_LOCAL_RNG) && (defined(HAVE_HASHDRBG) || defined(NO_RC4))
#ifdef HAVE_ED25519
bench_ed25519KeyGen();
bench_ed25519KeySign();
#endif
#if defined(HAVE_LOCAL_RNG)
wc_FreeRng(&rng);
#endif
@@ -1704,6 +1716,91 @@ void bench_ecc25519KeyAgree(void)
}
#endif /* HAVE_ECC25519 */
#ifdef HAVE_ED25519
void bench_ed25519KeyGen(void)
{
ed25519_key genKey;
double start, total, each, milliEach;
int i;
/* 256 bit */
start = current_time(1);
for(i = 0; i < genTimes; i++) {
wc_ed25519_init(&genKey);
wc_ed25519_make_key(&rng, 32, &genKey);
wc_ed25519_free(&genKey);
}
total = current_time(0) - start;
each = total / genTimes; /* per second */
milliEach = each * 1000; /* millisconds */
printf("\n");
printf("ED25519 key generation %6.3f milliseconds, avg over %d"
" iterations\n", milliEach, genTimes);
}
void bench_ed25519KeySign(void)
{
ed25519_key genKey;
double start, total, each, milliEach;
int i, ret;
byte sig[ED25519_SIG_SIZE];
byte msg[512];
word32 x = 0;
wc_ed25519_init(&genKey);
ret = wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &genKey);
if (ret != 0) {
printf("ed25519_make_key failed\n");
return;
}
/* make dummy msg */
for (i = 0; i < (int)sizeof(msg); i++)
msg[i] = (byte)i;
start = current_time(1);
for(i = 0; i < agreeTimes; i++) {
x = sizeof(sig);
ret = wc_ed25519_sign_msg(msg, sizeof(msg), sig, &x, &genKey);
if (ret != 0) {
printf("ed25519_sign_msg failed\n");
return;
}
}
total = current_time(0) - start;
each = total / agreeTimes; /* per second */
milliEach = each * 1000; /* millisconds */
printf("ED25519 sign time %6.3f milliseconds, avg over %d"
" iterations\n", milliEach, agreeTimes);
start = current_time(1);
for(i = 0; i < agreeTimes; i++) {
int verify = 0;
ret = wc_ed25519_verify_msg(sig, x, msg, sizeof(msg), &verify,
&genKey);
if (ret != 0 || verify != 1) {
printf("ed25519_verify_msg failed\n");
return;
}
}
total = current_time(0) - start;
each = total / agreeTimes; /* per second */
milliEach = each * 1000; /* millisconds */
printf("ED25519 verify time %6.3f milliseconds, avg over %d"
" iterations\n", milliEach, agreeTimes);
wc_ed25519_free(&genKey);
}
#endif /* HAVE_ED25519 */
#ifdef _WIN32

125
wolfcrypt/src/asn.c
View File

@@ -89,7 +89,7 @@
#ifdef HAVE_RTP_SYS
/* uses parital <time.h> structures */
#define XTIME(tl) (0)
#define XGMTIME(c) my_gmtime((c))
#define XGMTIME(c, t) my_gmtime((c))
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
#elif defined(MICRIUM)
#if (NET_SECURE_MGR_CFG_EN == DEF_ENABLED)
@@ -102,11 +102,11 @@
#elif defined(MICROCHIP_TCPIP_V5) || defined(MICROCHIP_TCPIP)
#include <time.h>
#define XTIME(t1) pic32_time((t1))
#define XGMTIME(c) gmtime((c))
#define XGMTIME(c, t) gmtime((c))
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
#elif defined(FREESCALE_MQX)
#define XTIME(t1) mqx_time((t1))
#define XGMTIME(c) mqx_gmtime((c))
#define XGMTIME(c, t) mqx_gmtime((c), (t))
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
#elif defined(WOLFSSL_MDK_ARM)
#if defined(WOLFSSL_MDK5)
@@ -119,7 +119,7 @@
#undef RNG
#define RNG wolfSSL_RNG /*for avoiding name conflict in "stm32f2xx.h" */
#define XTIME(tl) (0)
#define XGMTIME(c) wolfssl_MDK_gmtime((c))
#define XGMTIME(c, t) wolfssl_MDK_gmtime((c))
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
#elif defined(USER_TIME)
/* user time, and gmtime compatible functions, there is a gmtime
@@ -146,7 +146,7 @@
struct tm* gmtime(const time_t* timer);
extern time_t XTIME(time_t * timer);
#define XGMTIME(c) gmtime((c))
#define XGMTIME(c, t) gmtime((c))
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
#ifdef STACK_TRAP
@@ -179,7 +179,7 @@
char *tm_zone; /* timezone abbreviation */
};
#endif
extern struct tm* XGMTIME(const time_t* timer);
extern struct tm* XGMTIME(const time_t* timer, struct tm* tmp);
#ifndef HAVE_VALIDATE_DATE
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
@@ -188,8 +188,8 @@
/* default */
/* uses complete <time.h> facility */
#include <time.h>
#define XTIME(tl) time((tl))
#define XGMTIME(c) gmtime((c))
#define XTIME(tl) time((tl))
#define XGMTIME(c, t) gmtime((c))
#define XVALIDATE_DATE(d, f, t) ValidateDate((d), (f), (t))
#endif
@@ -350,11 +350,9 @@ time_t mqx_time(time_t* timer)
}
/* CodeWarrior GCC toolchain only has gmtime_r(), no gmtime() */
struct tm* mqx_gmtime(const time_t* clock)
struct tm* mqx_gmtime(const time_t* clock, struct tm* tmpTime)
{
struct tm tmpTime;
return gmtime_r(clock, &tmpTime);
return gmtime_r(clock, tmpTime);
}
#endif /* FREESCALE_MQX */
@@ -1272,8 +1270,9 @@ int wc_RsaPublicKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
return 0;
}
int wc_RsaPublicKeyDecodeRaw(const byte* n, word32 nSz, const byte* e, word32 eSz,
RsaKey* key)
/* import RSA public key elements (n, e) into RsaKey structure (key) */
int wc_RsaPublicKeyDecodeRaw(const byte* n, word32 nSz, const byte* e,
word32 eSz, RsaKey* key)
{
if (n == NULL || e == NULL || key == NULL)
return BAD_FUNC_ARG;
@@ -1704,11 +1703,34 @@ static int StoreRsaKey(DecodedCert* cert)
/* return 0 on sucess if the ECC curve oid sum is supported */
static int CheckCurve(word32 oid)
{
if (oid != ECC_256R1 && oid != ECC_384R1 && oid != ECC_521R1 && oid !=
ECC_160R1 && oid != ECC_192R1 && oid != ECC_224R1)
return ALGO_ID_E;
int ret = 0;
return 0;
switch (oid) {
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC160)
case ECC_160R1:
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC192)
case ECC_192R1:
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC224)
case ECC_224R1:
#endif
#if defined(HAVE_ALL_CURVES) || !defined(NO_ECC256)
case ECC_256R1:
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC384)
case ECC_384R1:
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC521)
case ECC_521R1:
#endif
break;
default:
ret = ALGO_ID_E;
}
return ret;
}
#endif /* HAVE_ECC */
@@ -2375,8 +2397,16 @@ int ValidateDate(const byte* date, byte format, int dateType)
time_t ltime;
struct tm certTime;
struct tm* localTime;
struct tm* tmpTime;
int i = 0;
#ifdef FREESCALE_MQX
struct tm mqxTime;
tmpTime = &mqxTime;
#else
(void)tmpTime;
#endif
ltime = XTIME(0);
XMEMSET(&certTime, 0, sizeof(certTime));
@@ -2404,7 +2434,7 @@ int ValidateDate(const byte* date, byte format, int dateType)
return 0;
}
localTime = XGMTIME(&ltime);
localTime = XGMTIME(&ltime, tmpTime);
if (dateType == BEFORE) {
if (DateLessThan(localTime, &certTime))
@@ -2627,18 +2657,30 @@ static word32 SetCurve(ecc_key* key, byte* output)
{
/* curve types */
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC192)
static const byte ECC_192v1_AlgoID[] = { 0x2a, 0x86, 0x48, 0xCE, 0x3d,
0x03, 0x01, 0x01};
#endif
#if defined(HAVE_ALL_CURVES) || !defined(NO_ECC256)
static const byte ECC_256v1_AlgoID[] = { 0x2a, 0x86, 0x48, 0xCE, 0x3d,
0x03, 0x01, 0x07};
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC160)
static const byte ECC_160r1_AlgoID[] = { 0x2b, 0x81, 0x04, 0x00,
0x02};
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC224)
static const byte ECC_224r1_AlgoID[] = { 0x2b, 0x81, 0x04, 0x00,
0x21};
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC384)
static const byte ECC_384r1_AlgoID[] = { 0x2b, 0x81, 0x04, 0x00,
0x22};
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC521)
static const byte ECC_521r1_AlgoID[] = { 0x2b, 0x81, 0x04, 0x00,
0x23};
#endif
int oidSz = 0;
int idx = 0;
@@ -2649,35 +2691,47 @@ static word32 SetCurve(ecc_key* key, byte* output)
idx++;
switch (key->dp->size) {
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC160)
case 20:
oidSz = sizeof(ECC_160r1_AlgoID);
oid = ECC_160r1_AlgoID;
break;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC192)
case 24:
oidSz = sizeof(ECC_192v1_AlgoID);
oid = ECC_192v1_AlgoID;
break;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC224)
case 28:
oidSz = sizeof(ECC_224r1_AlgoID);
oid = ECC_224r1_AlgoID;
break;
#endif
#if defined(HAVE_ALL_CURVES) || !defined(NO_ECC256)
case 32:
oidSz = sizeof(ECC_256v1_AlgoID);
oid = ECC_256v1_AlgoID;
break;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC384)
case 48:
oidSz = sizeof(ECC_384r1_AlgoID);
oid = ECC_384r1_AlgoID;
break;
#endif
#if defined(HAVE_ALL_CURVES) || defined(HAVE_ECC521)
case 66:
oidSz = sizeof(ECC_521r1_AlgoID);
oid = ECC_521r1_AlgoID;
break;
#endif
default:
return ASN_UNKNOWN_OID_E;
@@ -5172,6 +5226,18 @@ static int CopyValidity(byte* output, Cert* cert)
#endif
/* for systems where mktime() doesn't normalize fully */
static void RebuildTime(time_t* in, struct tm* out)
{
#ifdef FREESCALE_MQX
out = localtime_r(in, out);
#else
(void)in;
(void)out;
#endif
}
/* Set Date validity from now until now + daysValid */
static int SetValidity(byte* output, int daysValid)
{
@@ -5183,11 +5249,21 @@ static int SetValidity(byte* output, int daysValid)
int seqSz;
time_t ticks;
time_t normalTime;
struct tm* now;
struct tm* tmpTime;
struct tm local;
#ifdef FREESCALE_MQX
/* for use with MQX gmtime_r */
struct tm mqxTime;
tmpTime = &mqxTime;
#else
(void)tmpTime;
#endif
ticks = XTIME(0);
now = XGMTIME(&ticks);
now = XGMTIME(&ticks, tmpTime);
/* before now */
local = *now;
@@ -5196,7 +5272,8 @@ static int SetValidity(byte* output, int daysValid)
/* subtract 1 day for more compliance */
local.tm_mday -= 1;
mktime(&local);
normalTime = mktime(&local);
RebuildTime(&normalTime, &local);
/* adjust */
local.tm_year += 1900;
@@ -5204,7 +5281,7 @@ static int SetValidity(byte* output, int daysValid)
SetTime(&local, before + beforeSz);
beforeSz += ASN_GEN_TIME_SZ;
/* after now + daysValid */
local = *now;
after[0] = ASN_GENERALIZED_TIME;
@@ -5212,7 +5289,8 @@ static int SetValidity(byte* output, int daysValid)
/* add daysValid */
local.tm_mday += daysValid;
mktime(&local);
normalTime = mktime(&local);
RebuildTime(&normalTime, &local);
/* adjust */
local.tm_year += 1900;
@@ -7319,6 +7397,7 @@ int EncodeOcspRequest(OcspRequest* req)
extSz = SetOcspReqExtensions(MAX_OCSP_EXT_SZ, extArray,
req->nonce, req->nonceSz);
}
wc_FreeRng(&rng);
}
}

4
wolfcrypt/src/coding.c
View File

@@ -133,7 +133,7 @@ int Base64_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
}
#if defined(OPENSSL_EXTRA) || defined (SESSION_CERTS) || defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) || defined(HAVE_WEBSERVER)
#if defined(WOLFSSL_BASE64_ENCODE)
static
const byte base64Encode[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
@@ -324,7 +324,7 @@ int Base64_EncodeEsc(const byte* in, word32 inLen, byte* out, word32* outLen)
}
#endif /* defined(OPENSSL_EXTRA) || defined (SESSION_CERTS) || defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) || defined(HAVE_WEBSERVER) */
#endif /* defined(WOLFSSL_BASE64_ENCODE) */
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(HAVE_FIPS)

38
wolfcrypt/src/ecc.c
View File

@@ -50,14 +50,32 @@
*/
#define ECC112
#define ECC128
#define ECC160
#define ECC192
#define ECC224
#define ECC256
#define ECC384
#define ECC521
/* p256 curve on by default whether user curves or not */
#if defined(HAVE_ECC112) || defined(HAVE_ALL_CURVES)
#define ECC112
#endif
#if defined(HAVE_ECC128) || defined(HAVE_ALL_CURVES)
#define ECC128
#endif
#if defined(HAVE_ECC160) || defined(HAVE_ALL_CURVES)
#define ECC160
#endif
#if defined(HAVE_ECC192) || defined(HAVE_ALL_CURVES)
#define ECC192
#endif
#if defined(HAVE_ECC224) || defined(HAVE_ALL_CURVES)
#define ECC224
#endif
#if !defined(NO_ECC256) || defined(HAVE_ALL_CURVES)
#define ECC256
#endif
#if defined(HAVE_ECC384) || defined(HAVE_ALL_CURVES)
#define ECC384
#endif
#if defined(HAVE_ECC521) || defined(HAVE_ALL_CURVES)
#define ECC521
#endif
@@ -2088,7 +2106,9 @@ int wc_ecc_verify_hash(const byte* sig, word32 siglen, const byte* hash,
* If either of those don't allocate correctly, none of
* the rest of this function will execute, and everything
* gets cleaned up at the end. */
if (err == MP_OKAY)
XMEMSET(&r, 0, sizeof(r));
XMEMSET(&s, 0, sizeof(s));
if (err == MP_OKAY)
err = DecodeECC_DSA_Sig(sig, siglen, &r, &s);
/* get the order */

21
wolfcrypt/src/ecc25519.c
View File

@@ -81,7 +81,26 @@ static int curve25519(unsigned char* q, unsigned char* n, unsigned char* p)
fe_cswap(x2,x3,swap);
fe_cswap(z2,z3,swap);
swap = b;
#include <wolfssl/wolfcrypt/ecc25519_montgomery.h>
/* montgomery */
fe_sub(tmp0,x3,z3);
fe_sub(tmp1,x2,z2);
fe_add(x2,x2,z2);
fe_add(z2,x3,z3);
fe_mul(z3,tmp0,x2);
fe_mul(z2,z2,tmp1);
fe_sq(tmp0,tmp1);
fe_sq(tmp1,x2);
fe_add(x3,z3,z2);
fe_sub(z2,z3,z2);
fe_mul(x2,tmp1,tmp0);
fe_sub(tmp1,tmp1,tmp0);
fe_sq(z2,z2);
fe_mul121666(z3,tmp1);
fe_sq(x3,x3);
fe_add(tmp0,tmp0,z3);
fe_mul(z3,x1,z2);
fe_mul(z2,tmp1,tmp0);
}
fe_cswap(x2,x3,swap);
fe_cswap(z2,z3,swap);

1015
wolfcrypt/src/ed25519.c Normal file
View File

File diff suppressed because it is too large Load Diff

1037
wolfcrypt/src/ecc25519_fe.c → wolfcrypt/src/fe_operations.c
View File

File diff suppressed because it is too large Load Diff

1939
wolfcrypt/src/ge_operations.c Normal file
View File

File diff suppressed because it is too large Load Diff

13
wolfcrypt/src/pkcs7.c
View File

@@ -1238,9 +1238,11 @@ int wc_PKCS7_EncodeEnvelopedData(PKCS7* pkcs7, byte* output, word32 outputSz)
return ret;
ret = wc_RNG_GenerateBlock(&rng, contentKeyPlain, blockKeySz);
if (ret != 0)
if (ret != 0) {
wc_FreeRng(&rng);
return ret;
}
#ifdef WOLFSSL_SMALL_STACK
recip = (byte*)XMALLOC(MAX_RECIP_SZ, NULL, DYNAMIC_TYPE_TMP_BUFFER);
contentKeyEnc = (byte*)XMALLOC(MAX_ENCRYPTED_KEY_SZ, NULL,
@@ -1248,6 +1250,7 @@ int wc_PKCS7_EncodeEnvelopedData(PKCS7* pkcs7, byte* output, word32 outputSz)
if (contentKeyEnc == NULL || recip == NULL) {
if (recip) XFREE(recip, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (contentKeyEnc) XFREE(contentKeyEnc, NULL, DYNAMIC_TYPE_TMP_BUFFER);
wc_FreeRng(&rng);
return MEMORY_E;
}
@@ -1267,6 +1270,7 @@ int wc_PKCS7_EncodeEnvelopedData(PKCS7* pkcs7, byte* output, word32 outputSz)
if (recipSz < 0) {
WOLFSSL_MSG("Failed to create RecipientInfo");
wc_FreeRng(&rng);
#ifdef WOLFSSL_SMALL_STACK
XFREE(recip, NULL, DYNAMMIC_TYPE_TMP_BUFFER);
#endif
@@ -1276,6 +1280,7 @@ int wc_PKCS7_EncodeEnvelopedData(PKCS7* pkcs7, byte* output, word32 outputSz)
/* generate IV for block cipher */
ret = wc_RNG_GenerateBlock(&rng, tmpIv, DES_BLOCK_SIZE);
wc_FreeRng(&rng);
if (ret != 0) {
#ifdef WOLFSSL_SMALL_STACK
XFREE(recip, NULL, DYNAMMIC_TYPE_TMP_BUFFER);
@@ -1447,10 +1452,6 @@ int wc_PKCS7_EncodeEnvelopedData(PKCS7* pkcs7, byte* output, word32 outputSz)
XMEMCPY(output + idx, encryptedContent, desOutSz);
idx += desOutSz;
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(&rng);
#endif
ForceZero(contentKeyPlain, MAX_CONTENT_KEY_LEN);
if (dynamicFlag)

14
wolfcrypt/src/random.c Executable file → Normal file
View File

@@ -648,6 +648,13 @@ int wc_RNG_GenerateByte(RNG* rng, byte* b)
return wc_GenerateSeed(NULL, b, 1) ;
}
int wc_FreeRng(RNG* rng)
{
(void)rng;
return 0;
}
#else /* HAVE_HASHDRBG || NO_RC4 */
/* Get seed and key cipher */
@@ -719,6 +726,13 @@ int wc_RNG_GenerateByte(RNG* rng, byte* b)
}
int wc_FreeRng(RNG* rng)
{
(void)rng;
return 0;
}
#ifdef HAVE_CAVIUM
#include <wolfssl/ctaocrypt/logging.h>

15
wolfcrypt/src/rsa.c
View File

@@ -302,8 +302,8 @@ static int RsaUnPad(const byte *pkcsBlock, unsigned int pkcsBlockLen,
}
static int wc_RsaFunction(const byte* in, word32 inLen, byte* out, word32* outLen,
int type, RsaKey* key)
static int wc_RsaFunction(const byte* in, word32 inLen, byte* out,
word32* outLen, int type, RsaKey* key)
{
#define ERROR_OUT(x) { ret = (x); goto done;}
@@ -416,7 +416,8 @@ int wc_RsaPublicEncrypt(const byte* in, word32 inLen, byte* out, word32 outLen,
if (ret != 0)
return ret;
if ((ret = wc_RsaFunction(out, sz, out, &outLen, RSA_PUBLIC_ENCRYPT, key)) < 0)
if ((ret = wc_RsaFunction(out, sz, out, &outLen,
RSA_PUBLIC_ENCRYPT, key)) < 0)
sz = ret;
return sz;
@@ -561,7 +562,8 @@ int wc_RsaSSL_Sign(const byte* in, word32 inLen, byte* out, word32 outLen,
if (ret != 0)
return ret;
if ((ret = wc_RsaFunction(out, sz, out, &outLen, RSA_PRIVATE_ENCRYPT,key)) < 0)
if ((ret = wc_RsaFunction(out, sz, out, &outLen,
RSA_PRIVATE_ENCRYPT,key)) < 0)
sz = ret;
return sz;
@@ -577,8 +579,9 @@ int wc_RsaEncryptSize(RsaKey* key)
return mp_unsigned_bin_size(&key->n);
}
int wc_RsaFlattenPublicKey(RsaKey* key, byte* e, word32* eSz, byte* n, word32* nSz)
/* flatten RsaKey structure into individual elements (e, n) */
int wc_RsaFlattenPublicKey(RsaKey* key, byte* e, word32* eSz, byte* n,
word32* nSz)
{
int sz, ret;

5731
wolfcrypt/test/test-save.c Normal file
View File

File diff suppressed because it is too large Load Diff

502
wolfcrypt/test/test.c
View File

@@ -66,6 +66,9 @@
#ifdef HAVE_ECC25519
#include <wolfssl/wolfcrypt/ecc25519.h>
#endif
#ifdef HAVE_ED25519
#include <wolfssl/wolfcrypt/ed25519.h>
#endif
#ifdef HAVE_BLAKE2
#include <wolfssl/wolfcrypt/blake2.h>
#endif
@@ -191,6 +194,9 @@ int pbkdf2_test(void);
#ifdef HAVE_ECC25519
int ecc25519_test(void);
#endif
#ifdef HAVE_ED25519
int ed25519_test(void);
#endif
#ifdef HAVE_BLAKE2
int blake2b_test(void);
#endif
@@ -524,6 +530,13 @@ int wolfcrypt_test(void* args)
printf( "ECC25519 test passed!\n");
#endif
#ifdef HAVE_ED25519
if ( (ret = ed25519_test()) != 0)
return err_sys("ED25519 test failed!\n", ret);
else
printf( "ED25519 test passed!\n");
#endif
#ifdef HAVE_LIBZ
if ( (ret = compress_test()) != 0)
return err_sys("COMPRESS test failed!\n", ret);
@@ -3207,6 +3220,10 @@ int random_test(void)
ret = wc_RNG_GenerateBlock(&rng, block, sizeof(block));
if (ret != 0) return -40;
#include "stdio.h"
printf("%016lx,%016lx,%016lx,%016lx,\n", ((word64 *)block)[0],((word64 *)block)[1],((word64 *)block)[2],((word64 *)block)[3]) ;
return 0;
wc_FreeRng(&rng);
return 0;
}
@@ -3454,7 +3471,11 @@ int rsa_test(void)
return -302;
}
#ifdef FREESCALE_MQX
keyFile = fopen("a:\\certs\\key.der", "wb");
#else
keyFile = fopen("./key.der", "wb");
#endif
if (!keyFile) {
free(der);
free(pem);
@@ -3478,7 +3499,11 @@ int rsa_test(void)
return -304;
}
#ifdef FREESCALE_MQX
pemFile = fopen("a:\\certs\\key.pem", "wb");
#else
pemFile = fopen("./key.pem", "wb");
#endif
if (!pemFile) {
free(der);
free(pem);
@@ -3571,7 +3596,12 @@ int rsa_test(void)
}
FreeDecodedCert(&decode);
#endif
#ifdef FREESCALE_MQX
derFile = fopen("a:\\certs\\cert.der", "wb");
#else
derFile = fopen("./cert.der", "wb");
#endif
if (!derFile) {
free(derCert);
free(pem);
@@ -3592,7 +3622,11 @@ int rsa_test(void)
return -404;
}
#ifdef FREESCALE_MQX
pemFile = fopen("a:\\certs\\cert.pem", "wb");
#else
pemFile = fopen("./cert.pem", "wb");
#endif
if (!pemFile) {
free(derCert);
free(pem);
@@ -3707,7 +3741,11 @@ int rsa_test(void)
FreeDecodedCert(&decode);
#endif
#ifdef FREESCALE_MQX
derFile = fopen("a:\\certs\\othercert.der", "wb");
#else
derFile = fopen("./othercert.der", "wb");
#endif
if (!derFile) {
free(derCert);
free(pem);
@@ -3731,7 +3769,11 @@ int rsa_test(void)
return -411;
}
#ifdef FREESCALE_MQX
pemFile = fopen("a:\\certs\\othercert.pem", "wb");
#else
pemFile = fopen("./othercert.pem", "wb");
#endif
if (!pemFile) {
free(derCert);
free(pem);
@@ -3844,7 +3886,11 @@ int rsa_test(void)
FreeDecodedCert(&decode);
#endif
#ifdef FREESCALE_MQX
derFile = fopen("a:\\certs\\certecc.der", "wb");
#else
derFile = fopen("./certecc.der", "wb");
#endif
if (!derFile) {
free(pem);
free(derCert);
@@ -3868,7 +3914,11 @@ int rsa_test(void)
return -5411;
}
#ifdef FREESCALE_MQX
pemFile = fopen("a:\\certs\\certecc.pem", "wb");
#else
pemFile = fopen("./certecc.pem", "wb");
#endif
if (!pemFile) {
free(pem);
free(derCert);
@@ -4132,7 +4182,11 @@ int rsa_test(void)
return -467;
}
#ifdef FREESCALE_MQX
reqFile = fopen("a:\\certs\\certreq.der", "wb");
#else
reqFile = fopen("./certreq.der", "wb");
#endif
if (!reqFile) {
free(pem);
free(der);
@@ -4147,7 +4201,11 @@ int rsa_test(void)
return -471;
}
#ifdef FREESCALE_MQX
reqFile = fopen("a:\\certs\\certreq.pem", "wb");
#else
reqFile = fopen("./certreq.pem", "wb");
#endif
if (!reqFile) {
free(pem);
free(der);
@@ -4172,10 +4230,7 @@ int rsa_test(void)
wc_RsaFreeCavium(&key);
#endif
free(tmp);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(&rng);
#endif
return 0;
}
@@ -4256,10 +4311,7 @@ int dh_test(void)
wc_FreeDhKey(&key);
wc_FreeDhKey(&key2);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(&rng);
#endif
return 0;
}
@@ -4327,6 +4379,7 @@ int dsa_test(void)
if (answer != 1) return -65;
wc_FreeDsaKey(&key);
wc_FreeRng(&rng);
return 0;
}
@@ -4456,6 +4509,7 @@ int openssl_test(void)
if (memcmp(hash, c.output, MD5_DIGEST_SIZE) != 0)
return -74;
#ifndef NO_DES3
{ /* des test */
const byte vector[] = { /* "now is the time for all " w/o trailing 0 */
0x6e,0x6f,0x77,0x20,0x69,0x73,0x20,0x74,
@@ -4505,6 +4559,10 @@ int openssl_test(void)
} /* end des test */
#endif /* NO_DES3 */
#ifndef NO_AES
{ /* evp_cipher test */
EVP_CIPHER_CTX ctx;
@@ -4550,6 +4608,8 @@ int openssl_test(void)
} /* end evp_cipher test */
#endif /* NO_AES */
return 0;
}
@@ -4882,6 +4942,7 @@ int ecc_test(void)
if (ret != 0)
return -1017;
#if (defined(HAVE_ECC192) && defined(HAVE_ECC224)) || defined(HAVE_ALL_CURVES)
{
/* test raw ECC key import */
Sha sha;
@@ -4964,6 +5025,7 @@ int ecc_test(void)
return -1023 - i;
}
}
#endif /* defined(HAVE_ECC192) && defined(HAVE_ECC256) */
#ifdef WOLFSSL_KEY_GEN
@@ -5009,10 +5071,7 @@ int ecc_test(void)
wc_ecc_free(&pubKey);
wc_ecc_free(&userB);
wc_ecc_free(&userA);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(&rng);
#endif
return 0;
}
@@ -5143,6 +5202,7 @@ int ecc_encrypt_test(void)
/* cleanup */
wc_ecc_free(&userB);
wc_ecc_free(&userA);
wc_FreeRng(&rng);
return 0;
}
@@ -5231,7 +5291,7 @@ int ecc25519_test(void)
if (y != x)
return -1006;
if (memcmp(sharedA, sharedB, x))
if (XMEMCMP(sharedA, sharedB, x))
return -1007;
/* export a public key and import it for another user */
@@ -5246,7 +5306,7 @@ int ecc25519_test(void)
if (wc_ecc25519_shared_secret(&userB, &pubKey, sharedB, &y) != 0)
return -1010;
if (memcmp(sharedA, sharedB, y))
if (XMEMCMP(sharedA, sharedB, y))
return -1011;
/* import RFC test vectors and compare shared key */
@@ -5263,7 +5323,7 @@ int ecc25519_test(void)
if (wc_ecc25519_shared_secret(&userA, &userB, sharedB, &y) != 0)
return -1014;
if (memcmp(ss, sharedB, y))
if (XMEMCMP(ss, sharedB, y))
return -1015;
/* test swaping roles of keys and generating same shared key */
@@ -5271,7 +5331,7 @@ int ecc25519_test(void)
if (wc_ecc25519_shared_secret(&userB, &userA, sharedB, &y) != 0)
return -1016;
if (memcmp(ss, sharedB, y))
if (XMEMCMP(ss, sharedB, y))
return -1017;
/* clean up keys when done */
@@ -5279,15 +5339,425 @@ int ecc25519_test(void)
wc_ecc25519_free(&userB);
wc_ecc25519_free(&userA);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(&rng);
#endif
return 0;
}
#endif /* HAVE_ECC25519 */
#ifdef HAVE_ED25519
int ed25519_test(void)
{
RNG rng;
byte out[ED25519_SIG_SIZE];
byte exportPKey[ED25519_KEY_SIZE];
byte exportSKey[ED25519_KEY_SIZE];
word32 outlen;
word32 exportPSz;
word32 exportSSz;
word32 keySz, sigSz;
int i, verify;
ed25519_key key;
ed25519_key key2;
/* test vectors from
https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-02
*/
const byte sKey1[] = {
0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60,
0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4,
0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19,
0x70,0x3b,0xac,0x03,0x1c,0xae,0x7f,0x60
};
const byte sKey2[] = {
0x4c,0xcd,0x08,0x9b,0x28,0xff,0x96,0xda,
0x9d,0xb6,0xc3,0x46,0xec,0x11,0x4e,0x0f,
0x5b,0x8a,0x31,0x9f,0x35,0xab,0xa6,0x24,
0xda,0x8c,0xf6,0xed,0x4f,0xb8,0xa6,0xfb
};
const byte sKey3[] = {
0xc5,0xaa,0x8d,0xf4,0x3f,0x9f,0x83,0x7b,
0xed,0xb7,0x44,0x2f,0x31,0xdc,0xb7,0xb1,
0x66,0xd3,0x85,0x35,0x07,0x6f,0x09,0x4b,
0x85,0xce,0x3a,0x2e,0x0b,0x44,0x58,0xf7
};
/* uncompressed test */
const byte sKey4[] = {
0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60,
0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4,
0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19,
0x70,0x3b,0xac,0x03,0x1c,0xae,0x7f,0x60
};
/* compressed prefix test */
const byte sKey5[] = {
0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60,
0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4,
0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19,
0x70,0x3b,0xac,0x03,0x1c,0xae,0x7f,0x60
};
const byte sKey6[] = {
0xf5,0xe5,0x76,0x7c,0xf1,0x53,0x31,0x95,
0x17,0x63,0x0f,0x22,0x68,0x76,0xb8,0x6c,
0x81,0x60,0xcc,0x58,0x3b,0xc0,0x13,0x74,
0x4c,0x6b,0xf2,0x55,0xf5,0xcc,0x0e,0xe5
};
const byte* sKeys[] = {sKey1, sKey2, sKey3, sKey4, sKey5, sKey6};
const byte pKey1[] = {
0xd7,0x5a,0x98,0x01,0x82,0xb1,0x0a,0xb7,
0xd5,0x4b,0xfe,0xd3,0xc9,0x64,0x07,0x3a,
0x0e,0xe1,0x72,0xf3,0xda,0xa6,0x23,0x25,
0xaf,0x02,0x1a,0x68,0xf7,0x07,0x51,0x1a
};
const byte pKey2[] = {
0x3d,0x40,0x17,0xc3,0xe8,0x43,0x89,0x5a,
0x92,0xb7,0x0a,0xa7,0x4d,0x1b,0x7e,0xbc,
0x9c,0x98,0x2c,0xcf,0x2e,0xc4,0x96,0x8c,
0xc0,0xcd,0x55,0xf1,0x2a,0xf4,0x66,0x0c
};
const byte pKey3[] = {
0xfc,0x51,0xcd,0x8e,0x62,0x18,0xa1,0xa3,
0x8d,0xa4,0x7e,0xd0,0x02,0x30,0xf0,0x58,
0x08,0x16,0xed,0x13,0xba,0x33,0x03,0xac,
0x5d,0xeb,0x91,0x15,0x48,0x90,0x80,0x25
};
/* uncompressed test */
const byte pKey4[] = {
0x04,0x55,0xd0,0xe0,0x9a,0x2b,0x9d,0x34,
0x29,0x22,0x97,0xe0,0x8d,0x60,0xd0,0xf6,
0x20,0xc5,0x13,0xd4,0x72,0x53,0x18,0x7c,
0x24,0xb1,0x27,0x86,0xbd,0x77,0x76,0x45,
0xce,0x1a,0x51,0x07,0xf7,0x68,0x1a,0x02,
0xaf,0x25,0x23,0xa6,0xda,0xf3,0x72,0xe1,
0x0e,0x3a,0x07,0x64,0xc9,0xd3,0xfe,0x4b,
0xd5,0xb7,0x0a,0xb1,0x82,0x01,0x98,0x5a,
0xd7
};
/* compressed prefix */
const byte pKey5[] = {
0x40,0xd7,0x5a,0x98,0x01,0x82,0xb1,0x0a,0xb7,
0xd5,0x4b,0xfe,0xd3,0xc9,0x64,0x07,0x3a,
0x0e,0xe1,0x72,0xf3,0xda,0xa6,0x23,0x25,
0xaf,0x02,0x1a,0x68,0xf7,0x07,0x51,0x1a
};
const byte pKey6[] = {
0x27,0x81,0x17,0xfc,0x14,0x4c,0x72,0x34,
0x0f,0x67,0xd0,0xf2,0x31,0x6e,0x83,0x86,
0xce,0xff,0xbf,0x2b,0x24,0x28,0xc9,0xc5,
0x1f,0xef,0x7c,0x59,0x7f,0x1d,0x42,0x6e
};
const byte* pKeys[] = {pKey1, pKey2, pKey3, pKey4, pKey5, pKey6};
const byte pKeySz[] = {sizeof(pKey1), sizeof(pKey2), sizeof(pKey3),
sizeof(pKey4), sizeof(pKey5), sizeof(pKey6)};
const byte sig1[] = {
0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72,
0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a,
0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74,
0xd8,0x73,0xe0,0x65,0x22,0x49,0x01,0x55,
0x5f,0xb8,0x82,0x15,0x90,0xa3,0x3b,0xac,
0xc6,0x1e,0x39,0x70,0x1c,0xf9,0xb4,0x6b,
0xd2,0x5b,0xf5,0xf0,0x59,0x5b,0xbe,0x24,
0x65,0x51,0x41,0x43,0x8e,0x7a,0x10,0x0b
};
const byte sig2[] = {
0x92,0xa0,0x09,0xa9,0xf0,0xd4,0xca,0xb8,
0x72,0x0e,0x82,0x0b,0x5f,0x64,0x25,0x40,
0xa2,0xb2,0x7b,0x54,0x16,0x50,0x3f,0x8f,
0xb3,0x76,0x22,0x23,0xeb,0xdb,0x69,0xda,
0x08,0x5a,0xc1,0xe4,0x3e,0x15,0x99,0x6e,
0x45,0x8f,0x36,0x13,0xd0,0xf1,0x1d,0x8c,
0x38,0x7b,0x2e,0xae,0xb4,0x30,0x2a,0xee,
0xb0,0x0d,0x29,0x16,0x12,0xbb,0x0c,0x00
};
const byte sig3[] = {
0x62,0x91,0xd6,0x57,0xde,0xec,0x24,0x02,
0x48,0x27,0xe6,0x9c,0x3a,0xbe,0x01,0xa3,
0x0c,0xe5,0x48,0xa2,0x84,0x74,0x3a,0x44,
0x5e,0x36,0x80,0xd7,0xdb,0x5a,0xc3,0xac,
0x18,0xff,0x9b,0x53,0x8d,0x16,0xf2,0x90,
0xae,0x67,0xf7,0x60,0x98,0x4d,0xc6,0x59,
0x4a,0x7c,0x15,0xe9,0x71,0x6e,0xd2,0x8d,
0xc0,0x27,0xbe,0xce,0xea,0x1e,0xc4,0x0a
};
/* uncompressed test */
const byte sig4[] = {
0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72,
0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a,
0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74,
0xd8,0x73,0xe0,0x65,0x22,0x49,0x01,0x55,
0x5f,0xb8,0x82,0x15,0x90,0xa3,0x3b,0xac,
0xc6,0x1e,0x39,0x70,0x1c,0xf9,0xb4,0x6b,
0xd2,0x5b,0xf5,0xf0,0x59,0x5b,0xbe,0x24,
0x65,0x51,0x41,0x43,0x8e,0x7a,0x10,0x0b
};
/* compressed prefix */
const byte sig5[] = {
0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72,
0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a,
0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74,
0xd8,0x73,0xe0,0x65,0x22,0x49,0x01,0x55,
0x5f,0xb8,0x82,0x15,0x90,0xa3,0x3b,0xac,
0xc6,0x1e,0x39,0x70,0x1c,0xf9,0xb4,0x6b,
0xd2,0x5b,0xf5,0xf0,0x59,0x5b,0xbe,0x24,
0x65,0x51,0x41,0x43,0x8e,0x7a,0x10,0x0b
};
const byte sig6[] = {
0x0a,0xab,0x4c,0x90,0x05,0x01,0xb3,0xe2,
0x4d,0x7c,0xdf,0x46,0x63,0x32,0x6a,0x3a,
0x87,0xdf,0x5e,0x48,0x43,0xb2,0xcb,0xdb,
0x67,0xcb,0xf6,0xe4,0x60,0xfe,0xc3,0x50,
0xaa,0x53,0x71,0xb1,0x50,0x8f,0x9f,0x45,
0x28,0xec,0xea,0x23,0xc4,0x36,0xd9,0x4b,
0x5e,0x8f,0xcd,0x4f,0x68,0x1e,0x30,0xa6,
0xac,0x00,0xa9,0x70,0x4a,0x18,0x8a,0x03
};
const byte* sigs[] = {sig1, sig2, sig3, sig4, sig5, sig6};
const byte msg1[] = {};
const byte msg2[] = {0x72};
const byte msg3[] = {0xAF,0x82};
/* test of a 1024 byte long message */
const byte msg4[] = {
0x08,0xb8,0xb2,0xb7,0x33,0x42,0x42,0x43,
0x76,0x0f,0xe4,0x26,0xa4,0xb5,0x49,0x08,
0x63,0x21,0x10,0xa6,0x6c,0x2f,0x65,0x91,
0xea,0xbd,0x33,0x45,0xe3,0xe4,0xeb,0x98,
0xfa,0x6e,0x26,0x4b,0xf0,0x9e,0xfe,0x12,
0xee,0x50,0xf8,0xf5,0x4e,0x9f,0x77,0xb1,
0xe3,0x55,0xf6,0xc5,0x05,0x44,0xe2,0x3f,
0xb1,0x43,0x3d,0xdf,0x73,0xbe,0x84,0xd8,
0x79,0xde,0x7c,0x00,0x46,0xdc,0x49,0x96,
0xd9,0xe7,0x73,0xf4,0xbc,0x9e,0xfe,0x57,
0x38,0x82,0x9a,0xdb,0x26,0xc8,0x1b,0x37,
0xc9,0x3a,0x1b,0x27,0x0b,0x20,0x32,0x9d,
0x65,0x86,0x75,0xfc,0x6e,0xa5,0x34,0xe0,
0x81,0x0a,0x44,0x32,0x82,0x6b,0xf5,0x8c,
0x94,0x1e,0xfb,0x65,0xd5,0x7a,0x33,0x8b,
0xbd,0x2e,0x26,0x64,0x0f,0x89,0xff,0xbc,
0x1a,0x85,0x8e,0xfc,0xb8,0x55,0x0e,0xe3,
0xa5,0xe1,0x99,0x8b,0xd1,0x77,0xe9,0x3a,
0x73,0x63,0xc3,0x44,0xfe,0x6b,0x19,0x9e,
0xe5,0xd0,0x2e,0x82,0xd5,0x22,0xc4,0xfe,
0xba,0x15,0x45,0x2f,0x80,0x28,0x8a,0x82,
0x1a,0x57,0x91,0x16,0xec,0x6d,0xad,0x2b,
0x3b,0x31,0x0d,0xa9,0x03,0x40,0x1a,0xa6,
0x21,0x00,0xab,0x5d,0x1a,0x36,0x55,0x3e,
0x06,0x20,0x3b,0x33,0x89,0x0c,0xc9,0xb8,
0x32,0xf7,0x9e,0xf8,0x05,0x60,0xcc,0xb9,
0xa3,0x9c,0xe7,0x67,0x96,0x7e,0xd6,0x28,
0xc6,0xad,0x57,0x3c,0xb1,0x16,0xdb,0xef,
0xef,0xd7,0x54,0x99,0xda,0x96,0xbd,0x68,
0xa8,0xa9,0x7b,0x92,0x8a,0x8b,0xbc,0x10,
0x3b,0x66,0x21,0xfc,0xde,0x2b,0xec,0xa1,
0x23,0x1d,0x20,0x6b,0xe6,0xcd,0x9e,0xc7,
0xaf,0xf6,0xf6,0xc9,0x4f,0xcd,0x72,0x04,
0xed,0x34,0x55,0xc6,0x8c,0x83,0xf4,0xa4,
0x1d,0xa4,0xaf,0x2b,0x74,0xef,0x5c,0x53,
0xf1,0xd8,0xac,0x70,0xbd,0xcb,0x7e,0xd1,
0x85,0xce,0x81,0xbd,0x84,0x35,0x9d,0x44,
0x25,0x4d,0x95,0x62,0x9e,0x98,0x55,0xa9,
0x4a,0x7c,0x19,0x58,0xd1,0xf8,0xad,0xa5,
0xd0,0x53,0x2e,0xd8,0xa5,0xaa,0x3f,0xb2,
0xd1,0x7b,0xa7,0x0e,0xb6,0x24,0x8e,0x59,
0x4e,0x1a,0x22,0x97,0xac,0xbb,0xb3,0x9d,
0x50,0x2f,0x1a,0x8c,0x6e,0xb6,0xf1,0xce,
0x22,0xb3,0xde,0x1a,0x1f,0x40,0xcc,0x24,
0x55,0x41,0x19,0xa8,0x31,0xa9,0xaa,0xd6,
0x07,0x9c,0xad,0x88,0x42,0x5d,0xe6,0xbd,
0xe1,0xa9,0x18,0x7e,0xbb,0x60,0x92,0xcf,
0x67,0xbf,0x2b,0x13,0xfd,0x65,0xf2,0x70,
0x88,0xd7,0x8b,0x7e,0x88,0x3c,0x87,0x59,
0xd2,0xc4,0xf5,0xc6,0x5a,0xdb,0x75,0x53,
0x87,0x8a,0xd5,0x75,0xf9,0xfa,0xd8,0x78,
0xe8,0x0a,0x0c,0x9b,0xa6,0x3b,0xcb,0xcc,
0x27,0x32,0xe6,0x94,0x85,0xbb,0xc9,0xc9,
0x0b,0xfb,0xd6,0x24,0x81,0xd9,0x08,0x9b,
0xec,0xcf,0x80,0xcf,0xe2,0xdf,0x16,0xa2,
0xcf,0x65,0xbd,0x92,0xdd,0x59,0x7b,0x07,
0x07,0xe0,0x91,0x7a,0xf4,0x8b,0xbb,0x75,
0xfe,0xd4,0x13,0xd2,0x38,0xf5,0x55,0x5a,
0x7a,0x56,0x9d,0x80,0xc3,0x41,0x4a,0x8d,
0x08,0x59,0xdc,0x65,0xa4,0x61,0x28,0xba,
0xb2,0x7a,0xf8,0x7a,0x71,0x31,0x4f,0x31,
0x8c,0x78,0x2b,0x23,0xeb,0xfe,0x80,0x8b,
0x82,0xb0,0xce,0x26,0x40,0x1d,0x2e,0x22,
0xf0,0x4d,0x83,0xd1,0x25,0x5d,0xc5,0x1a,
0xdd,0xd3,0xb7,0x5a,0x2b,0x1a,0xe0,0x78,
0x45,0x04,0xdf,0x54,0x3a,0xf8,0x96,0x9b,
0xe3,0xea,0x70,0x82,0xff,0x7f,0xc9,0x88,
0x8c,0x14,0x4d,0xa2,0xaf,0x58,0x42,0x9e,
0xc9,0x60,0x31,0xdb,0xca,0xd3,0xda,0xd9,
0xaf,0x0d,0xcb,0xaa,0xaf,0x26,0x8c,0xb8,
0xfc,0xff,0xea,0xd9,0x4f,0x3c,0x7c,0xa4,
0x95,0xe0,0x56,0xa9,0xb4,0x7a,0xcd,0xb7,
0x51,0xfb,0x73,0xe6,0x66,0xc6,0xc6,0x55,
0xad,0xe8,0x29,0x72,0x97,0xd0,0x7a,0xd1,
0xba,0x5e,0x43,0xf1,0xbc,0xa3,0x23,0x01,
0x65,0x13,0x39,0xe2,0x29,0x04,0xcc,0x8c,
0x42,0xf5,0x8c,0x30,0xc0,0x4a,0xaf,0xdb,
0x03,0x8d,0xda,0x08,0x47,0xdd,0x98,0x8d,
0xcd,0xa6,0xf3,0xbf,0xd1,0x5c,0x4b,0x4c,
0x45,0x25,0x00,0x4a,0xa0,0x6e,0xef,0xf8,
0xca,0x61,0x78,0x3a,0xac,0xec,0x57,0xfb,
0x3d,0x1f,0x92,0xb0,0xfe,0x2f,0xd1,0xa8,
0x5f,0x67,0x24,0x51,0x7b,0x65,0xe6,0x14,
0xad,0x68,0x08,0xd6,0xf6,0xee,0x34,0xdf,
0xf7,0x31,0x0f,0xdc,0x82,0xae,0xbf,0xd9,
0x04,0xb0,0x1e,0x1d,0xc5,0x4b,0x29,0x27,
0x09,0x4b,0x2d,0xb6,0x8d,0x6f,0x90,0x3b,
0x68,0x40,0x1a,0xde,0xbf,0x5a,0x7e,0x08,
0xd7,0x8f,0xf4,0xef,0x5d,0x63,0x65,0x3a,
0x65,0x04,0x0c,0xf9,0xbf,0xd4,0xac,0xa7,
0x98,0x4a,0x74,0xd3,0x71,0x45,0x98,0x67,
0x80,0xfc,0x0b,0x16,0xac,0x45,0x16,0x49,
0xde,0x61,0x88,0xa7,0xdb,0xdf,0x19,0x1f,
0x64,0xb5,0xfc,0x5e,0x2a,0xb4,0x7b,0x57,
0xf7,0xf7,0x27,0x6c,0xd4,0x19,0xc1,0x7a,
0x3c,0xa8,0xe1,0xb9,0x39,0xae,0x49,0xe4,
0x88,0xac,0xba,0x6b,0x96,0x56,0x10,0xb5,
0x48,0x01,0x09,0xc8,0xb1,0x7b,0x80,0xe1,
0xb7,0xb7,0x50,0xdf,0xc7,0x59,0x8d,0x5d,
0x50,0x11,0xfd,0x2d,0xcc,0x56,0x00,0xa3,
0x2e,0xf5,0xb5,0x2a,0x1e,0xcc,0x82,0x0e,
0x30,0x8a,0xa3,0x42,0x72,0x1a,0xac,0x09,
0x43,0xbf,0x66,0x86,0xb6,0x4b,0x25,0x79,
0x37,0x65,0x04,0xcc,0xc4,0x93,0xd9,0x7e,
0x6a,0xed,0x3f,0xb0,0xf9,0xcd,0x71,0xa4,
0x3d,0xd4,0x97,0xf0,0x1f,0x17,0xc0,0xe2,
0xcb,0x37,0x97,0xaa,0x2a,0x2f,0x25,0x66,
0x56,0x16,0x8e,0x6c,0x49,0x6a,0xfc,0x5f,
0xb9,0x32,0x46,0xf6,0xb1,0x11,0x63,0x98,
0xa3,0x46,0xf1,0xa6,0x41,0xf3,0xb0,0x41,
0xe9,0x89,0xf7,0x91,0x4f,0x90,0xcc,0x2c,
0x7f,0xff,0x35,0x78,0x76,0xe5,0x06,0xb5,
0x0d,0x33,0x4b,0xa7,0x7c,0x22,0x5b,0xc3,
0x07,0xba,0x53,0x71,0x52,0xf3,0xf1,0x61,
0x0e,0x4e,0xaf,0xe5,0x95,0xf6,0xd9,0xd9,
0x0d,0x11,0xfa,0xa9,0x33,0xa1,0x5e,0xf1,
0x36,0x95,0x46,0x86,0x8a,0x7f,0x3a,0x45,
0xa9,0x67,0x68,0xd4,0x0f,0xd9,0xd0,0x34,
0x12,0xc0,0x91,0xc6,0x31,0x5c,0xf4,0xfd,
0xe7,0xcb,0x68,0x60,0x69,0x37,0x38,0x0d,
0xb2,0xea,0xaa,0x70,0x7b,0x4c,0x41,0x85,
0xc3,0x2e,0xdd,0xcd,0xd3,0x06,0x70,0x5e,
0x4d,0xc1,0xff,0xc8,0x72,0xee,0xee,0x47,
0x5a,0x64,0xdf,0xac,0x86,0xab,0xa4,0x1c,
0x06,0x18,0x98,0x3f,0x87,0x41,0xc5,0xef,
0x68,0xd3,0xa1,0x01,0xe8,0xa3,0xb8,0xca,
0xc6,0x0c,0x90,0x5c,0x15,0xfc,0x91,0x08,
0x40,0xb9,0x4c,0x00,0xa0,0xb9,0xd0
};
const byte* msgs[] = {msg1, msg2, msg3, msg1, msg1, msg4};
const word16 msgSz[] = {sizeof(msg1), sizeof(msg2), sizeof(msg3),
sizeof(msg1), sizeof(msg1), sizeof(msg4)};
/* create ed25519 keys */
wc_InitRng(&rng);
wc_ed25519_init(&key);
wc_ed25519_init(&key2);
wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &key);
wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &key2);
/* helper functions for signature and key size */
keySz = wc_ed25519_size(&key);
sigSz = wc_ed25519_sig_size(&key);
for (i = 0; i < 6; i++) {
outlen = sizeof(out);
XMEMSET(out, 0, sizeof(out));
if (wc_ed25519_import_private_key(sKeys[i], ED25519_KEY_SIZE, pKeys[i],
pKeySz[i], &key) != 0)
return -1021;
if (wc_ed25519_sign_msg(msgs[i], msgSz[i], out, &outlen, &key)
!= 0)
return -1022;
if (XMEMCMP(out, sigs[i], 64))
return -1023;
/* test verify on good msg */
if (wc_ed25519_verify_msg(out, outlen, msgs[i], msgSz[i], &verify,
&key) != 0 || verify != 1)
return -1024;
/* test verify on bad msg */
out[outlen-1] = out[outlen-1] + 1;
if (wc_ed25519_verify_msg(out, outlen, msgs[i], msgSz[i], &verify,
&key) == 0 || verify == 1)
return -1025;
/* test api for import/exporting keys */
exportPSz = sizeof(exportPKey);
exportSSz = sizeof(exportSKey);
if (wc_ed25519_export_public(&key, exportPKey, &exportPSz) != 0)
return -1026;
if (wc_ed25519_import_public(exportPKey, exportPSz, &key2) != 0)
return -1027;
if (wc_ed25519_export_private_only(&key, exportSKey, &exportSSz) != 0)
return -1028;
if (wc_ed25519_import_private_key(exportSKey, exportSSz,
exportPKey, exportPSz, &key2) != 0)
return -1029;
/* clear "out" buffer and test sign with imported keys */
outlen = sizeof(out);
XMEMSET(out, 0, sizeof(out));
if (wc_ed25519_sign_msg(msgs[i], msgSz[i], out, &outlen, &key2) != 0)
return -1030;
if (wc_ed25519_verify_msg(out, outlen, msgs[i], msgSz[i], &verify,
&key2) != 0 || verify != 1)
return -1031;
if (XMEMCMP(out, sigs[i], 64))
return -1032;
}
/* clean up keys when done */
wc_ed25519_free(&key);
wc_ed25519_free(&key2);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(&rng);
#endif
/* hush warrnings of unused keySz and sigSz */
(void)keySz;
(void)sigSz;
return 0;
}
#endif /* HAVE_ED25519 */
#ifdef HAVE_LIBZ
const byte sample_text[] =
@@ -5715,9 +6185,7 @@ int pkcs7signed_test(void)
free(out);
wc_PKCS7_Free(&msg);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
wc_FreeRng(&rng);
#endif
if (ret > 0)
return 0;

2
wolfssl.vcproj
View File

@@ -49,7 +49,7 @@
UsePrecompiledHeader="0"
WarningLevel="4"
DebugInformationFormat="4"
DisableSpecificWarnings="4206"
DisableSpecificWarnings="4206,4214,4706"
/>
<Tool
Name="VCManagedResourceCompilerTool"

4
wolfssl.vcxproj
View File

@@ -86,7 +86,7 @@
<PrecompiledHeader />
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DisableSpecificWarnings>4206;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4206;4214;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -100,7 +100,7 @@
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4206;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4206;4214;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

12
wolfssl/internal.h
View File

@@ -1576,18 +1576,6 @@ enum EccCurves {
};
/* Supprted ECC Named Curves */
enum EccNamedCurves {
secp256r1 = 0x17, /* default, OpenSSL also calls it prime256v1 */
secp384r1 = 0x18,
secp521r1 = 0x19,
secp160r1 = 0x10,
secp192r1 = 0x13, /* Openssl also call it prime192v1 */
secp224r1 = 0x15
};
/* Valid client certificate request types from page 27 */
enum ClientCertificateType {
rsa_sign = 1,

3
wolfssl/openssl/des.h
View File

@@ -30,6 +30,8 @@
#include <wolfssl/wolfcrypt/settings.h>
#ifndef NO_DES3
#ifdef WOLFSSL_PREFIX
#include "prefix_des.h"
#endif
@@ -99,5 +101,6 @@ do { \
} /* extern "C" */
#endif
#endif /* NO_DES3 */
#endif /* WOLFSSL_DES_H_ */

6
wolfssl/openssl/evp.h
View File

@@ -94,7 +94,9 @@ typedef struct WOLFSSL_EVP_MD_CTX {
typedef union {
#ifndef NO_AES
Aes aes;
#endif
#ifndef NO_DES3
Des des;
Des3 des3;
@@ -125,7 +127,11 @@ typedef struct WOLFSSL_EVP_CIPHER_CTX {
int keyLen; /* user may set for variable */
unsigned char enc; /* if encrypt side, then true */
unsigned char cipherType;
#ifndef NO_AES
unsigned char iv[AES_BLOCK_SIZE]; /* working iv pointer into cipher */
#elif !defined(NO_DES3)
unsigned char iv[DES_BLOCK_SIZE]; /* working iv pointer into cipher */
#endif
WOLFSSL_Cipher cipher;
} WOLFSSL_EVP_CIPHER_CTX;

3
wolfssl/ssl.h
View File

@@ -1324,8 +1324,6 @@ WOLFSSL_API int wolfSSL_CTX_UseTruncatedHMAC(WOLFSSL_CTX* ctx);
#endif
/* Elliptic Curves */
#ifdef HAVE_SUPPORTED_CURVES
enum {
WOLFSSL_ECC_SECP160R1 = 0x10,
WOLFSSL_ECC_SECP192R1 = 0x13,
@@ -1335,6 +1333,7 @@ enum {
WOLFSSL_ECC_SECP521R1 = 0x19
};
#ifdef HAVE_SUPPORTED_CURVES
#ifndef NO_WOLFSSL_CLIENT
WOLFSSL_API int wolfSSL_UseSupportedCurve(WOLFSSL* ssl, unsigned short name);

5
wolfssl/test.h
View File

@@ -1606,6 +1606,7 @@ static INLINE int myEccSign(WOLFSSL* ssl, const byte* in, word32 inSz,
if (ret == 0)
ret = wc_ecc_sign_hash(in, inSz, out, outSz, &rng, &myKey);
wc_ecc_free(&myKey);
wc_FreeRng(&rng);
return ret;
}
@@ -1660,6 +1661,7 @@ static INLINE int myRsaSign(WOLFSSL* ssl, const byte* in, word32 inSz,
ret = 0;
}
wc_FreeRsaKey(&myKey);
wc_FreeRng(&rng);
return ret;
}
@@ -1715,6 +1717,7 @@ static INLINE int myRsaEnc(WOLFSSL* ssl, const byte* in, word32 inSz,
}
}
wc_FreeRsaKey(&myKey);
wc_FreeRng(&rng);
return ret;
}
@@ -1822,9 +1825,7 @@ static INLINE const char* mymktemp(char *tempfn, int len, int num)
}
tempfn[len] = '\0';
#if defined(HAVE_HASHDRBG)
wc_FreeRng(&rng);
#endif
return tempfn;
}

4
wolfssl/version.h
View File

@@ -26,8 +26,8 @@
extern "C" {
#endif
#define LIBWOLFSSL_VERSION_STRING "3.4.2"
#define LIBWOLFSSL_VERSION_HEX 0x03004002
#define LIBWOLFSSL_VERSION_STRING "3.4.3"
#define LIBWOLFSSL_VERSION_HEX 0x03004003
#ifdef __cplusplus
}

12
wolfssl/wolfcrypt/coding.h
View File

@@ -30,11 +30,17 @@
#endif
/* decode needed by wolfSSL */
WOLFSSL_LOCAL int Base64_Decode(const byte* in, word32 inLen, byte* out,
WOLFSSL_API int Base64_Decode(const byte* in, word32 inLen, byte* out,
word32* outLen);
#if defined(OPENSSL_EXTRA) || defined(SESSION_CERTS) || defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) || defined(HAVE_WEBSERVER)
#if defined(OPENSSL_EXTRA) || defined(SESSION_CERTS) || defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) || defined(HAVE_WEBSERVER)
#ifndef WOLFSSL_BASE64_ENCODE
#define WOLFSSL_BASE64_ENCODE
#endif
#endif
#ifdef WOLFSSL_BASE64_ENCODE
/* encode isn't */
WOLFSSL_API
int Base64_Encode(const byte* in, word32 inLen, byte* out,

2
wolfssl/wolfcrypt/ecc25519.h
View File

@@ -26,7 +26,7 @@
#ifdef HAVE_ECC25519
#include <wolfssl/wolfcrypt/ecc25519_fe.h>
#include <wolfssl/wolfcrypt/fe_operations.h>
#include <wolfssl/wolfcrypt/random.h>
#ifdef __cplusplus

61
wolfssl/wolfcrypt/ecc25519_fe.h
View File

@@ -1,61 +0,0 @@
/* ecc25519_fe.h
*
* Copyright (C) 2006-2015 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* 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-1301, USA
*/
/* Based On Daniel J Bernstein's curve25519 Public Domain ref10 work. */
#ifndef WOLF_CRYPT_ECC25519_FE_H
#define WOLF_CRYPT_ECC25519_FE_H
#include <wolfssl/wolfcrypt/settings.h>
#ifdef HAVE_ECC25519
#include <stdint.h>
typedef int32_t fe[10];
/*
fe means field element.
Here the field is \Z/(2^255-19).
An element t, entries t[0]...t[9], represents the integer
t[0]+2^26 t[1]+2^51 t[2]+2^77 t[3]+2^102 t[4]+...+2^230 t[9].
Bounds on each t[i] vary depending on context.
*/
void fe_frombytes(fe,const unsigned char *);
void fe_tobytes(unsigned char *,fe);
void fe_copy(fe,fe);
void fe_0(fe);
void fe_1(fe);
void fe_cswap(fe,fe,unsigned int);
void fe_add(fe,fe,fe);
void fe_sub(fe,fe,fe);
void fe_mul(fe,fe,fe);
void fe_sq(fe,fe);
void fe_mul121666(fe,fe);
void fe_invert(fe,fe);
#endif /* HAVE_ECC25519 */
#endif /* include guard */

42
wolfssl/wolfcrypt/ecc25519_montgomery.h
View File

@@ -1,42 +0,0 @@
/* ecc25519_montgomery.h
*
* Copyright (C) 2006-2015 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* 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-1301, USA
*/
/* Based On Daniel J Bernstein's curve25519 Public Domain ref10 work. */
fe_sub(tmp0,x3,z3);
fe_sub(tmp1,x2,z2);
fe_add(x2,x2,z2);
fe_add(z2,x3,z3);
fe_mul(z3,tmp0,x2);
fe_mul(z2,z2,tmp1);
fe_sq(tmp0,tmp1);
fe_sq(tmp1,x2);
fe_add(x3,z3,z2);
fe_sub(z2,z3,z2);
fe_mul(x2,tmp1,tmp0);
fe_sub(tmp1,tmp1,tmp0);
fe_sq(z2,z2);
fe_mul121666(z3,tmp1);
fe_sq(x3,x3);
fe_add(tmp0,tmp0,z3);
fe_mul(z3,x1,z2);
fe_mul(z2,tmp1,tmp0);

46
wolfssl/wolfcrypt/ecc25519_pow225521.h
View File

@@ -1,46 +0,0 @@
/* ecc25519_pow225521.h
*
* Copyright (C) 2006-2015 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* 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-1301, USA
*/
/* Based On Daniel J Bernstein's curve25519 Public Domain ref10 work. */
fe_sq(t0,z); for (i = 1;i < 1;++i) fe_sq(t0,t0);
fe_sq(t1,t0); for (i = 1;i < 2;++i) fe_sq(t1,t1);
fe_mul(t1,z,t1);
fe_mul(t0,t0,t1);
fe_sq(t2,t0); for (i = 1;i < 1;++i) fe_sq(t2,t2);
fe_mul(t1,t1,t2);
fe_sq(t2,t1); for (i = 1;i < 5;++i) fe_sq(t2,t2);
fe_mul(t1,t2,t1);
fe_sq(t2,t1); for (i = 1;i < 10;++i) fe_sq(t2,t2);
fe_mul(t2,t2,t1);
fe_sq(t3,t2); for (i = 1;i < 20;++i) fe_sq(t3,t3);
fe_mul(t2,t3,t2);
fe_sq(t2,t2); for (i = 1;i < 10;++i) fe_sq(t2,t2);
fe_mul(t1,t2,t1);
fe_sq(t2,t1); for (i = 1;i < 50;++i) fe_sq(t2,t2);
fe_mul(t2,t2,t1);
fe_sq(t3,t2); for (i = 1;i < 100;++i) fe_sq(t3,t3);
fe_mul(t2,t3,t2);
fe_sq(t2,t2); for (i = 1;i < 50;++i) fe_sq(t2,t2);
fe_mul(t1,t2,t1);
fe_sq(t1,t1); for (i = 1;i < 5;++i) fe_sq(t1,t1);
fe_mul(out,t1,t0);

94
wolfssl/wolfcrypt/ed25519.h Normal file
View File

@@ -0,0 +1,94 @@
/* ed25519.h
*
* Copyright (C) 2006-2015 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* 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-1301, USA
*/
#ifndef WOLF_CRYPT_ED25519_H
#define WOLF_CRYPT_ED25519_H
#include <wolfssl/wolfcrypt/types.h>
#ifdef HAVE_ED25519
#include <wolfssl/wolfcrypt/fe_operations.h>
#include <wolfssl/wolfcrypt/ge_operations.h>
#include <wolfssl/wolfcrypt/random.h>
#include <wolfssl/wolfcrypt/sha512.h>
#ifdef __cplusplus
extern "C" {
#endif
/* info about EdDSA curve specifically ed25519, defined as an elliptic curve
over GF(p) */
/*
32, key size
"ED25519", curve name
"2^255-19", prime number
"SHA512", hash function
"-121665/121666", value of d
*/
#define ED25519_KEY_SIZE 32
#define ED25519_SIG_SIZE 64
/* An ED25519 Key */
typedef struct {
byte p[32]; /* compressed public key */
byte k[64]; /* private key : 32 secret -- 32 public */
} ed25519_key;
WOLFSSL_API
int wc_ed25519_make_key(RNG* rng, int keysize, ed25519_key* key);
WOLFSSL_API
int wc_ed25519_sign_msg(const byte* in, word32 inlen, byte* out,
word32 *outlen, ed25519_key* key);
WOLFSSL_API
int wc_ed25519_verify_msg(byte* sig, word32 siglen, const byte* msg,
word32 msglen, int* stat, ed25519_key* key);
WOLFSSL_API
int wc_ed25519_init(ed25519_key* key);
WOLFSSL_API
void wc_ed25519_free(ed25519_key* key);
WOLFSSL_API
int wc_ed25519_import_public(const byte* in, word32 inLen, ed25519_key* key);
WOLFSSL_API
int wc_ed25519_import_private_key(const byte* priv, word32 privSz,
const byte* pub, word32 pubSz, ed25519_key* key);
WOLFSSL_API
int wc_ed25519_export_public(ed25519_key*, byte* out, word32* outLen);
WOLFSSL_API
int wc_ed25519_export_private_only(ed25519_key* key, byte* out, word32* outLen);
/* size helper */
WOLFSSL_API
int wc_ed25519_size(ed25519_key* key);
WOLFSSL_API
int wc_ed25519_sig_size(ed25519_key* key);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* HAVE_ED25519 */
#endif /* WOLF_CRYPT_ED25519_H */

67
wolfssl/wolfcrypt/fe_operations.h Normal file
View File

@@ -0,0 +1,67 @@
/* fe_operations.h
*
* Copyright (C) 2006-2015 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* 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-1301, USA
*/
/* Based On Daniel J Bernstein's curve25519 and ed25519 Public Domain ref10
work. */
#ifndef WOLF_CRYPT_FE_OPERATIONS_H
#define WOLF_CRYPT_FE_OPERATIONS_H
#include <wolfssl/wolfcrypt/settings.h>
#if defined(HAVE_ECC25519) || defined(HAVE_ED25519)
#include <stdint.h>
/*
fe means field element.
Here the field is \Z/(2^255-19).
An element t, entries t[0]...t[9], represents the integer
t[0]+2^26 t[1]+2^51 t[2]+2^77 t[3]+2^102 t[4]+...+2^230 t[9].
Bounds on each t[i] vary depending on context.
*/
typedef int32_t fe[10];
WOLFSSL_LOCAL void fe_0(fe);
WOLFSSL_LOCAL void fe_1(fe);
WOLFSSL_LOCAL void fe_add(fe, const fe, const fe);
WOLFSSL_LOCAL void fe_tobytes(unsigned char *, const fe);
WOLFSSL_LOCAL void fe_sub(fe, const fe, const fe);
WOLFSSL_LOCAL void fe_invert(fe, const fe);
WOLFSSL_LOCAL void fe_sq(fe, const fe);
WOLFSSL_LOCAL void fe_sq2(fe,const fe);
WOLFSSL_LOCAL void fe_frombytes(fe,const unsigned char *);
WOLFSSL_LOCAL void fe_mul(fe,const fe,const fe);
WOLFSSL_LOCAL void fe_copy(fe, const fe);
WOLFSSL_LOCAL void fe_cswap(fe,fe,unsigned int);
WOLFSSL_LOCAL void fe_mul121666(fe,fe);
WOLFSSL_LOCAL int fe_isnonzero(const fe);
WOLFSSL_LOCAL int fe_isnegative(const fe);
WOLFSSL_LOCAL void fe_cmov(fe,const fe,unsigned int);
WOLFSSL_LOCAL void fe_neg(fe,const fe);
WOLFSSL_LOCAL void fe_pow22523(fe,const fe);
WOLFSSL_LOCAL uint64_t load_3(const unsigned char *in);
WOLFSSL_LOCAL uint64_t load_4(const unsigned char *in);
#endif /* HAVE_ECC25519 or HAVE_ED25519 */
#endif /* WOLF_CRYPT_FE_OPERATIONS_H */

106
wolfssl/wolfcrypt/ge_operations.h Normal file
View File

@@ -0,0 +1,106 @@
/* ge_operations.h
*
* Copyright (C) 2006-2015 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* 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-1301, USA
*/
/* Based On Daniel J Bernstein's ed25519 Public Domain ref10 work. */
#ifndef WOLF_CRYPT_GE_OPERATIONS_H
#define WOLF_CRYPT_GE_OPERATIONS_H
#include <wolfssl/wolfcrypt/settings.h>
#ifdef HAVE_ED25519
#include <stdint.h>
#include <wolfssl/wolfcrypt/fe_operations.h>
/*
ge means group element.
Here the group is the set of pairs (x,y) of field elements (see fe.h)
satisfying -x^2 + y^2 = 1 + d x^2y^2
where d = -121665/121666.
Representations:
ge_p2 (projective): (X:Y:Z) satisfying x=X/Z, y=Y/Z
ge_p3 (extended): (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT
ge_p1p1 (completed): ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T
ge_precomp (Duif): (y+x,y-x,2dxy)
*/
typedef struct {
fe X;
fe Y;
fe Z;
} ge_p2;
typedef struct {
fe X;
fe Y;
fe Z;
fe T;
} ge_p3;
typedef struct {
fe X;
fe Y;
fe Z;
fe T;
} ge_p1p1;
typedef struct {
fe yplusx;
fe yminusx;
fe xy2d;
} ge_precomp;
typedef struct {
fe YplusX;
fe YminusX;
fe Z;
fe T2d;
} ge_cached;
WOLFSSL_LOCAL void ge_tobytes(unsigned char *,const ge_p2 *);
WOLFSSL_LOCAL void ge_p3_tobytes(unsigned char *,const ge_p3 *);
WOLFSSL_LOCAL int ge_frombytes_negate_vartime(ge_p3 *,const unsigned char *);
WOLFSSL_LOCAL void ge_p2_0(ge_p2 *);
WOLFSSL_LOCAL void ge_p3_0(ge_p3 *);
WOLFSSL_LOCAL void ge_precomp_0(ge_precomp *);
WOLFSSL_LOCAL void ge_p3_to_p2(ge_p2 *,const ge_p3 *);
WOLFSSL_LOCAL void ge_p3_to_cached(ge_cached *,const ge_p3 *);
WOLFSSL_LOCAL void ge_p1p1_to_p2(ge_p2 *,const ge_p1p1 *);
WOLFSSL_LOCAL void ge_p1p1_to_p3(ge_p3 *,const ge_p1p1 *);
WOLFSSL_LOCAL void ge_p2_dbl(ge_p1p1 *,const ge_p2 *);
WOLFSSL_LOCAL void ge_p3_dbl(ge_p1p1 *,const ge_p3 *);
WOLFSSL_LOCAL void ge_madd(ge_p1p1 *,const ge_p3 *,const ge_precomp *);
WOLFSSL_LOCAL void ge_msub(ge_p1p1 *,const ge_p3 *,const ge_precomp *);
WOLFSSL_LOCAL void ge_add(ge_p1p1 *,const ge_p3 *,const ge_cached *);
WOLFSSL_LOCAL void ge_sub(ge_p1p1 *,const ge_p3 *,const ge_cached *);
WOLFSSL_LOCAL void ge_scalarmult_base(ge_p3 *,const unsigned char *);
WOLFSSL_LOCAL void ge_double_scalarmult_vartime(ge_p2 *,const unsigned char *,
const ge_p3 *,const unsigned char *);
#endif /* HAVE_ED25519 */
#endif /* WOLF_CRYPT_GE_OPERATIONS_H */

6
wolfssl/wolfcrypt/include.am
View File

@@ -15,9 +15,9 @@ nobase_include_HEADERS+= \
wolfssl/wolfcrypt/dsa.h \
wolfssl/wolfcrypt/ecc.h \
wolfssl/wolfcrypt/ecc25519.h \
wolfssl/wolfcrypt/ecc25519_fe.h \
wolfssl/wolfcrypt/ecc25519_pow225521.h \
wolfssl/wolfcrypt/ecc25519_montgomery.h \
wolfssl/wolfcrypt/ed25519.h \
wolfssl/wolfcrypt/fe_operations.h \
wolfssl/wolfcrypt/ge_operations.h \
wolfssl/wolfcrypt/error-crypt.h \
wolfssl/wolfcrypt/fips_test.h \
wolfssl/wolfcrypt/hc128.h \

2
wolfssl/wolfcrypt/random.h
View File

@@ -125,10 +125,10 @@ int wc_GenerateSeed(OS_Seed* os, byte* seed, word32 sz);
WOLFSSL_API int wc_InitRng(RNG*);
WOLFSSL_API int wc_RNG_GenerateBlock(RNG*, byte*, word32 sz);
WOLFSSL_API int wc_RNG_GenerateByte(RNG*, byte*);
WOLFSSL_API int wc_FreeRng(RNG*);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
WOLFSSL_API int wc_FreeRng(RNG*);
WOLFSSL_API int wc_RNG_HealthTest(int reseed,
const byte* entropyA, word32 entropyASz,
const byte* entropyB, word32 entropyBSz,

8
wolfssl/wolfcrypt/settings.h
View File

@@ -740,6 +740,14 @@
#pragma warning(disable:2259) /* explicit casts to smaller sizes, disable */
#endif
/* user can specify what curves they want with ECC_USER_CURVES otherwise
* all curves are on by default for now */
#ifndef ECC_USER_CURVES
#ifndef HAVE_ALL_CURVES
#define HAVE_ALL_CURVES
#endif
#endif
/* Place any other flags or defines here */

2
wolfssl/wolfcrypt/sha512.h
View File

@@ -66,7 +66,7 @@ WOLFSSL_API int wc_Sha512Update(Sha512*, const byte*, word32);
WOLFSSL_API int wc_Sha512Final(Sha512*, byte*);
WOLFSSL_API int wc_Sha512Hash(const byte*, word32, byte*);
#if defined(WOLFSSL_SHA384) || defined(HAVE_AESGCM)
#if defined(WOLFSSL_SHA384)
#ifndef HAVE_FIPS /* avoid redefinition of structs */
/* in bytes */