WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into ti

pull/1/head
toddouska 2014-05-28 13:06:51 -07:00
parent 21ebf9485d fe88e925cd
commit 8a0fbcb83e
36 changed files with 68 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp
View File

@ -1965,7 +1965,7 @@
<name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\misc.c</name> <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\misc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\port.c</name> <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\wc_port.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\pwdbased.c</name> <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\pwdbased.c</name>

4
IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt
View File

@ -1539,8 +1539,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>..\..\..\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

12
IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj
View File

@ -726,9 +726,9 @@
<FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\ctaocrypt\src\port.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>
@ -1970,9 +1970,9 @@
</FileOption> </FileOption>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\ctaocrypt\src\port.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>
@ -3267,9 +3267,9 @@
</FileOption> </FileOption>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\ctaocrypt\src\port.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>

4
IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
View File

@ -1294,8 +1294,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>..\..\..\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

12
IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
View File

@ -704,9 +704,9 @@
<FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\ctaocrypt\src\port.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>
@ -2121,9 +2121,9 @@
<FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\ctaocrypt\src\port.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>
@ -3636,9 +3636,9 @@
<FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\ctaocrypt\src\port.c</FilePath> <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>

4
IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx
View File

@ -1015,8 +1015,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>1</RteFlg> <RteFlg>1</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

4
IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx
View File

@ -670,9 +670,9 @@
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>

4
IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx
View File

@ -977,8 +977,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>1</RteFlg> <RteFlg>1</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

4
IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx
View File

@ -660,9 +660,9 @@
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>

4
IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx
View File

@ -1339,8 +1339,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>1</RteFlg> <RteFlg>1</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

4
IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx
View File

@ -770,9 +770,9 @@
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>

4
IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx
View File

@ -1151,8 +1151,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>1</RteFlg> <RteFlg>1</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

4
IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx
View File

@ -715,9 +715,9 @@
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>

4
IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx
View File

@ -1151,8 +1151,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>1</RteFlg> <RteFlg>1</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

4
IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx
View File

@ -715,9 +715,9 @@
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>

4
IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx
View File

@ -1215,8 +1215,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>1</RteFlg> <RteFlg>1</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

4
IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx
View File

@ -735,9 +735,9 @@
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>

4
IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx
View File

@ -1199,8 +1199,8 @@
<TopLine>0</TopLine> <TopLine>0</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName> <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
<RteFlg>1</RteFlg> <RteFlg>1</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

4
IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx
View File

@ -730,9 +730,9 @@
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
</File> </File>
<File> <File>
<FileName>port.c</FileName> <FileName>wc_port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath> <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
</File> </File>
<File> <File>
<FileName>pwdbased.c</FileName> <FileName>pwdbased.c</FileName>

2
ctaocrypt/ctaocrypt.vcproj
View File

@ -297,7 +297,7 @@
> >
</File> </File>
<File <File
RelativePath=".\src\port.c" RelativePath=".\src\wc_port.c"
> >
</File> </File>
<File <File

0
ctaocrypt/src/port.c → ctaocrypt/src/wc_port.c
View File

2
cyassl-ntru.vcproj
View File

@ -251,7 +251,7 @@
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\port.c" RelativePath=".\ctaocrypt\src\wc_port.c"
> >
</File> </File>
<File <File

2
cyassl.vcproj
View File

@ -244,7 +244,7 @@
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\port.c" RelativePath=".\ctaocrypt\src\wc_port.c"
> >
</File> </File>
<File <File

2
cyassl.vcxproj
View File

@ -154,7 +154,7 @@
<ClCompile Include="ctaocrypt\src\md5.c" /> <ClCompile Include="ctaocrypt\src\md5.c" />
<ClCompile Include="ctaocrypt\src\memory.c" /> <ClCompile Include="ctaocrypt\src\memory.c" />
<ClCompile Include="src\ocsp.c" /> <ClCompile Include="src\ocsp.c" />
<ClCompile Include="ctaocrypt\src\port.c" /> <ClCompile Include="ctaocrypt\src\wc_port.c" />
<ClCompile Include="ctaocrypt\src\pwdbased.c" /> <ClCompile Include="ctaocrypt\src\pwdbased.c" />
<ClCompile Include="ctaocrypt\src\rabbit.c" /> <ClCompile Include="ctaocrypt\src\rabbit.c" />
<ClCompile Include="ctaocrypt\src\random.c" /> <ClCompile Include="ctaocrypt\src\random.c" />

2
cyassl/ctaocrypt/include.am
View File

@ -23,7 +23,7 @@ nobase_include_HEADERS+= \
cyassl/ctaocrypt/md5.h \ cyassl/ctaocrypt/md5.h \
cyassl/ctaocrypt/misc.h \ cyassl/ctaocrypt/misc.h \
cyassl/ctaocrypt/pkcs7.h \ cyassl/ctaocrypt/pkcs7.h \
cyassl/ctaocrypt/port.h \ cyassl/ctaocrypt/wc_port.h \
cyassl/ctaocrypt/pwdbased.h \ cyassl/ctaocrypt/pwdbased.h \
cyassl/ctaocrypt/rabbit.h \ cyassl/ctaocrypt/rabbit.h \
cyassl/ctaocrypt/random.h \ cyassl/ctaocrypt/random.h \

2
cyassl/ctaocrypt/types.h
View File

@ -24,7 +24,7 @@
#define CTAO_CRYPT_TYPES_H #define CTAO_CRYPT_TYPES_H
#include <cyassl/ctaocrypt/settings.h> #include <cyassl/ctaocrypt/settings.h>
#include <cyassl/ctaocrypt/port.h> #include <cyassl/ctaocrypt/wc_port.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

0
cyassl/ctaocrypt/port.h → cyassl/ctaocrypt/wc_port.h
View File

2
mcapi/cyassl.X/nbproject/configurations.xml
View File

@ -52,7 +52,7 @@
<itemPath>../../mcapi/crypto.c</itemPath> <itemPath>../../mcapi/crypto.c</itemPath>
<itemPath>../../ctaocrypt/src/compress.c</itemPath> <itemPath>../../ctaocrypt/src/compress.c</itemPath>
<itemPath>../../ctaocrypt/src/camellia.c</itemPath> <itemPath>../../ctaocrypt/src/camellia.c</itemPath>
<itemPath>../../ctaocrypt/src/port.c</itemPath> <itemPath>../../ctaocrypt/src/wc_port.c</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="ExternalFiles" <logicalFolder name="ExternalFiles"
displayName="Important Files" displayName="Important Files"

2
mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml
View File

@ -34,7 +34,7 @@
<targetPluginBoard></targetPluginBoard> <targetPluginBoard></targetPluginBoard>
<platformTool>PKOBSKDEPlatformTool</platformTool> <platformTool>PKOBSKDEPlatformTool</platformTool>
<languageToolchain>XC32</languageToolchain> <languageToolchain>XC32</languageToolchain>
<languageToolchainVersion>1.30</languageToolchainVersion> <languageToolchainVersion>1.10</languageToolchainVersion>
<platform>3</platform> <platform>3</platform>
</toolsSet> </toolsSet>
<compileType> <compileType>

4
mplabx/ctaocrypt_benchmark.X/nbproject/project.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1"> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>com.microchip.mplab.nbide.embedded.makeproject</type> <type>com.microchip.mplab.nbide.embedded.makeproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1"> <data xmlns="http://www.netbeans.org/ns/make-project/1">
@ -9,6 +10,7 @@
<cpp-extensions/> <cpp-extensions/>
<header-extensions/> <header-extensions/>
<sourceEncoding>ISO-8859-1</sourceEncoding> <sourceEncoding>ISO-8859-1</sourceEncoding>
<asminc-extensions/>
<make-dep-projects> <make-dep-projects>
<make-dep-project>../cyassl.X</make-dep-project> <make-dep-project>../cyassl.X</make-dep-project>
</make-dep-projects> </make-dep-projects>

2
mplabx/ctaocrypt_test.X/nbproject/configurations.xml
View File

@ -35,7 +35,7 @@
<targetPluginBoard></targetPluginBoard> <targetPluginBoard></targetPluginBoard>
<platformTool>PKOBSKDEPlatformTool</platformTool> <platformTool>PKOBSKDEPlatformTool</platformTool>
<languageToolchain>XC32</languageToolchain> <languageToolchain>XC32</languageToolchain>
<languageToolchainVersion>1.30</languageToolchainVersion> <languageToolchainVersion>1.10</languageToolchainVersion>
<platform>3</platform> <platform>3</platform>
</toolsSet> </toolsSet>
<compileType> <compileType>

4
mplabx/ctaocrypt_test.X/nbproject/project.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1"> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>com.microchip.mplab.nbide.embedded.makeproject</type> <type>com.microchip.mplab.nbide.embedded.makeproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1"> <data xmlns="http://www.netbeans.org/ns/make-project/1">
@ -9,6 +10,7 @@
<cpp-extensions/> <cpp-extensions/>
<header-extensions>h</header-extensions> <header-extensions>h</header-extensions>
<sourceEncoding>ISO-8859-1</sourceEncoding> <sourceEncoding>ISO-8859-1</sourceEncoding>
<asminc-extensions/>
<make-dep-projects> <make-dep-projects>
<make-dep-project>../cyassl.X</make-dep-project> <make-dep-project>../cyassl.X</make-dep-project>
</make-dep-projects> </make-dep-projects>

4
mplabx/cyassl.X/nbproject/configurations.xml
View File

@ -49,7 +49,7 @@
<itemPath>../../ctaocrypt/src/sha256.c</itemPath> <itemPath>../../ctaocrypt/src/sha256.c</itemPath>
<itemPath>../../ctaocrypt/src/sha512.c</itemPath> <itemPath>../../ctaocrypt/src/sha512.c</itemPath>
<itemPath>../../ctaocrypt/src/tfm.c</itemPath> <itemPath>../../ctaocrypt/src/tfm.c</itemPath>
<itemPath>../../ctaocrypt/src/port.c</itemPath> <itemPath>../../ctaocrypt/src/wc_port.c</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="ExternalFiles" <logicalFolder name="ExternalFiles"
displayName="Important Files" displayName="Important Files"
@ -72,7 +72,7 @@
<targetPluginBoard></targetPluginBoard> <targetPluginBoard></targetPluginBoard>
<platformTool>PKOBSKDEPlatformTool</platformTool> <platformTool>PKOBSKDEPlatformTool</platformTool>
<languageToolchain>XC32</languageToolchain> <languageToolchain>XC32</languageToolchain>
<languageToolchainVersion>1.30</languageToolchainVersion> <languageToolchainVersion>1.10</languageToolchainVersion>
<platform>3</platform> <platform>3</platform>
</toolsSet> </toolsSet>
<compileType> <compileType>

4
mplabx/cyassl.X/nbproject/project.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1"> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>com.microchip.mplab.nbide.embedded.makeproject</type> <type>com.microchip.mplab.nbide.embedded.makeproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1"> <data xmlns="http://www.netbeans.org/ns/make-project/1">
@ -9,6 +10,7 @@
<cpp-extensions/> <cpp-extensions/>
<header-extensions/> <header-extensions/>
<sourceEncoding>ISO-8859-1</sourceEncoding> <sourceEncoding>ISO-8859-1</sourceEncoding>
<asminc-extensions/>
<make-dep-projects/> <make-dep-projects/>
</data> </data>
</configuration> </configuration>

2
rpm/spec.in
View File

@ -106,7 +106,7 @@ mkdir -p $RPM_BUILD_ROOT/
%{_includedir}/cyassl/ctaocrypt/mpi_class.h %{_includedir}/cyassl/ctaocrypt/mpi_class.h
%{_includedir}/cyassl/ctaocrypt/mpi_superclass.h %{_includedir}/cyassl/ctaocrypt/mpi_superclass.h
%{_includedir}/cyassl/ctaocrypt/pkcs7.h %{_includedir}/cyassl/ctaocrypt/pkcs7.h
%{_includedir}/cyassl/ctaocrypt/port.h %{_includedir}/cyassl/ctaocrypt/wc_port.h
%{_includedir}/cyassl/ctaocrypt/pwdbased.h %{_includedir}/cyassl/ctaocrypt/pwdbased.h
%{_includedir}/cyassl/ctaocrypt/rabbit.h %{_includedir}/cyassl/ctaocrypt/rabbit.h
%{_includedir}/cyassl/ctaocrypt/random.h %{_includedir}/cyassl/ctaocrypt/random.h

2
src/include.am
View File

@ -19,7 +19,7 @@ src_libcyassl_la_SOURCES += \
ctaocrypt/src/random.c \ ctaocrypt/src/random.c \
ctaocrypt/src/sha256.c \ ctaocrypt/src/sha256.c \
ctaocrypt/src/logging.c \ ctaocrypt/src/logging.c \
ctaocrypt/src/port.c \ ctaocrypt/src/wc_port.c \
ctaocrypt/src/error.c ctaocrypt/src/error.c
src_libcyassl_la_LDFLAGS = ${AM_LDFLAGS} -no-undefined -version-info ${CYASSL_LIBRARY_VERSION} src_libcyassl_la_LDFLAGS = ${AM_LDFLAGS} -no-undefined -version-info ${CYASSL_LIBRARY_VERSION}
src_libcyassl_la_LIBADD = $(LIBM) src_libcyassl_la_LIBADD = $(LIBM)