wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 11:44:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Marging cyassl/master and STM.LPC

Browse Source
This commit is contained in:
kojo
2013-05-26 09:47:51 +09:00
parent 4b9c3d3512
commit 9382f74f2e
3 changed files with 0 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -490,11 +490,7 @@
<Group> <Group>
<GroupName>CyaSSL Apps</GroupName> <GroupName>CyaSSL Apps</GroupName>
<<<<<<< HEAD
<tvExp>0</tvExp> <tvExp>0</tvExp>
=======
<tvExp>1</tvExp>
>>>>>>> cyassl/master
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -618,13 +614,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<<<<<<< HEAD
<TopLine>135</TopLine> <TopLine>135</TopLine>
<CurrentLine>149</CurrentLine> <CurrentLine>149</CurrentLine>
=======
<TopLine>209</TopLine>
<CurrentLine>220</CurrentLine>
>>>>>>> cyassl/master
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\MDK-ARM\CyaSSL\main.c</PathWithFileName> <PathWithFileName>..\MDK-ARM\CyaSSL\main.c</PathWithFileName>
<FilenameWithoutPath>main.c</FilenameWithoutPath> <FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -771,11 +762,7 @@
<Group> <Group>
<GroupName>MDK-ARM</GroupName> <GroupName>MDK-ARM</GroupName>
<<<<<<< HEAD
<tvExp>0</tvExp> <tvExp>0</tvExp>
=======
<tvExp>1</tvExp>
>>>>>>> cyassl/master
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -787,13 +774,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<<<<<<< HEAD
<TopLine>39</TopLine> <TopLine>39</TopLine>
<CurrentLine>73</CurrentLine> <CurrentLine>73</CurrentLine>
=======
<TopLine>42</TopLine>
<CurrentLine>66</CurrentLine>
>>>>>>> cyassl/master
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>c:\Keil\ARM\Boards\Keil\MCBSTM32F200\RL\FlashFS\SD_File\Serial.c</PathWithFileName> <PathWithFileName>c:\Keil\ARM\Boards\Keil\MCBSTM32F200\RL\FlashFS\SD_File\Serial.c</PathWithFileName>
<FilenameWithoutPath>Serial.c</FilenameWithoutPath> <FilenameWithoutPath>Serial.c</FilenameWithoutPath>
@@ -916,11 +898,7 @@
<Group> <Group>
<GroupName>CyaSSL Library</GroupName> <GroupName>CyaSSL Library</GroupName>
<<<<<<< HEAD
<tvExp>0</tvExp> <tvExp>0</tvExp>
=======
<tvExp>1</tvExp>
>>>>>>> cyassl/master
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -1072,11 +1050,7 @@
<Group> <Group>
<GroupName>Crypt/Cipher Library</GroupName> <GroupName>Crypt/Cipher Library</GroupName>
<<<<<<< HEAD
<tvExp>0</tvExp> <tvExp>0</tvExp>
=======
<tvExp>1</tvExp>
>>>>>>> cyassl/master
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -1454,17 +1428,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<<<<<<< HEAD
<ColumnNumber>30</ColumnNumber> <ColumnNumber>30</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>560</TopLine> <TopLine>560</TopLine>
<CurrentLine>570</CurrentLine> <CurrentLine>570</CurrentLine>
=======
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
>>>>>>> cyassl/master
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\ctaocrypt\src\random.c</PathWithFileName> <PathWithFileName>..\..\..\ctaocrypt\src\random.c</PathWithFileName>
<FilenameWithoutPath>random.c</FilenameWithoutPath> <FilenameWithoutPath>random.c</FilenameWithoutPath>
@@ -1479,13 +1446,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<<<<<<< HEAD
<TopLine>1</TopLine> <TopLine>1</TopLine>
<CurrentLine>1</CurrentLine> <CurrentLine>1</CurrentLine>
=======
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
>>>>>>> cyassl/master
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\ctaocrypt\src\ripemd.c</PathWithFileName> <PathWithFileName>..\..\..\ctaocrypt\src\ripemd.c</PathWithFileName>
<FilenameWithoutPath>ripemd.c</FilenameWithoutPath> <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
@@ -1720,11 +1682,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<<<<<<< HEAD
<TopLine>163</TopLine> <TopLine>163</TopLine>
=======
<TopLine>165</TopLine>
>>>>>>> cyassl/master
<CurrentLine>169</CurrentLine> <CurrentLine>169</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\MDK-ARM\config\startup_stm32f2xx.s</PathWithFileName> <PathWithFileName>..\MDK-ARM\config\startup_stm32f2xx.s</PathWithFileName>
@@ -1744,11 +1702,7 @@
<GroupNumber>7</GroupNumber> <GroupNumber>7</GroupNumber>
<FileNumber>73</FileNumber> <FileNumber>73</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<<<<<<< HEAD
<tvExp>0</tvExp> <tvExp>0</tvExp>
=======
<tvExp>1</tvExp>
>>>>>>> cyassl/master
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@@ -1764,46 +1718,18 @@
<GroupNumber>7</GroupNumber> <GroupNumber>7</GroupNumber>
<FileNumber>74</FileNumber> <FileNumber>74</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<<<<<<< HEAD
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>51</TopLine> <TopLine>51</TopLine>
<CurrentLine>57</CurrentLine> <CurrentLine>57</CurrentLine>
=======
<tvExp>1</tvExp>
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>52</TopLine>
<CurrentLine>56</CurrentLine>
>>>>>>> cyassl/master
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\MDK-ARM\CyaSSL\Retarget.c</PathWithFileName> <PathWithFileName>..\MDK-ARM\CyaSSL\Retarget.c</PathWithFileName>
<FilenameWithoutPath>Retarget.c</FilenameWithoutPath> <FilenameWithoutPath>Retarget.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<<<<<<< HEAD
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</PathWithFileName>
<FilenameWithoutPath>time-STM32F2xx.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
=======
>>>>>>> cyassl/master
</Group> </Group>
</ProjectOpt> </ProjectOpt>

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

@@ -44,11 +44,7 @@
<InvalidFlash>1</InvalidFlash> <InvalidFlash>1</InvalidFlash>
</TargetStatus> </TargetStatus>
<OutputDirectory>.\MDK-RTX-TCP-FS\</OutputDirectory> <OutputDirectory>.\MDK-RTX-TCP-FS\</OutputDirectory>
<<<<<<< HEAD
<OutputName>STM32F2xx-MDK-RTX-TCP-FS</OutputName> <OutputName>STM32F2xx-MDK-RTX-TCP-FS</OutputName>
=======
<OutputName>MDK-RTX-TCP-FS</OutputName>
>>>>>>> cyassl/master
<CreateExecutable>1</CreateExecutable> <CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib> <CreateLib>0</CreateLib>
<CreateHexFile>0</CreateHexFile> <CreateHexFile>0</CreateHexFile>
@@ -353,11 +349,7 @@
<uSurpInc>0</uSurpInc> <uSurpInc>0</uSurpInc>
<VariousControls> <VariousControls>
<MiscControls></MiscControls> <MiscControls></MiscControls>
<<<<<<< HEAD
<Define>HAVE_CONFIG_H CYASSL_STM32F2xx __DBG_ITM __RTX USE_STDPERIPH_DRIVER MDK_CONF_RTX_TCP_FS</Define> <Define>HAVE_CONFIG_H CYASSL_STM32F2xx __DBG_ITM __RTX USE_STDPERIPH_DRIVER MDK_CONF_RTX_TCP_FS</Define>
=======
<Define>HAVE_CONFIG_H __DBG_ITM __RTX USE_STDPERIPH_DRIVER MDK_CONF_RTX_TCP_FS</Define>
>>>>>>> cyassl/master
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>..\MDK-ARM\CyaSSL;C:..\STM32F2xx_StdPeriph_Lib\inc;..\..\..\</IncludePath> <IncludePath>..\MDK-ARM\CyaSSL;C:..\STM32F2xx_StdPeriph_Lib\inc;..\..\..\</IncludePath>
</VariousControls> </VariousControls>
@@ -938,14 +930,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath> <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
</File> </File>
<<<<<<< HEAD
<File> <File>
<FileName>time-STM32F2xx.c</FileName> <FileName>time-STM32F2xx.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath> <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
</File> </File>
=======
>>>>>>> cyassl/master
</Files> </Files>
</Group> </Group>
</Groups> </Groups>
@@ -988,11 +977,7 @@
<InvalidFlash>1</InvalidFlash> <InvalidFlash>1</InvalidFlash>
</TargetStatus> </TargetStatus>
<OutputDirectory>.\MDK-FS\</OutputDirectory> <OutputDirectory>.\MDK-FS\</OutputDirectory>
<<<<<<< HEAD
<OutputName>STM32F2xx-MDK-FS</OutputName> <OutputName>STM32F2xx-MDK-FS</OutputName>
=======
<OutputName>MDK-FS</OutputName>
>>>>>>> cyassl/master
<CreateExecutable>1</CreateExecutable> <CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib> <CreateLib>0</CreateLib>
<CreateHexFile>0</CreateHexFile> <CreateHexFile>0</CreateHexFile>
@@ -1297,11 +1282,7 @@
<uSurpInc>0</uSurpInc> <uSurpInc>0</uSurpInc>
<VariousControls> <VariousControls>
<MiscControls></MiscControls> <MiscControls></MiscControls>
<<<<<<< HEAD
<Define>HAVE_CONFIG_H CYASSL_STM32F2xx __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_FS</Define> <Define>HAVE_CONFIG_H CYASSL_STM32F2xx __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_FS</Define>
=======
<Define>HAVE_CONFIG_H __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_FS</Define>
>>>>>>> cyassl/master
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>..\MDK-ARM\CyaSSL;..\MDK-ARM\inc;..\STM32F2xx_StdPeriph_Lib\inc;..\POSIX\..\..\..\</IncludePath> <IncludePath>..\MDK-ARM\CyaSSL;..\MDK-ARM\inc;..\STM32F2xx_StdPeriph_Lib\inc;..\POSIX\..\..\..\</IncludePath>
</VariousControls> </VariousControls>
@@ -2158,14 +2139,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath> <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
</File> </File>
<<<<<<< HEAD
<File> <File>
<FileName>time-STM32F2xx.c</FileName> <FileName>time-STM32F2xx.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath> <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
</File> </File>
=======
>>>>>>> cyassl/master
</Files> </Files>
</Group> </Group>
</Groups> </Groups>
@@ -2208,11 +2186,7 @@
<InvalidFlash>1</InvalidFlash> <InvalidFlash>1</InvalidFlash>
</TargetStatus> </TargetStatus>
<OutputDirectory>.\MDK-BARE-METAL\</OutputDirectory> <OutputDirectory>.\MDK-BARE-METAL\</OutputDirectory>
<<<<<<< HEAD
<OutputName>STM32F2xx-MDK-BARE-METAL</OutputName> <OutputName>STM32F2xx-MDK-BARE-METAL</OutputName>
=======
<OutputName>MDK-BARE-METAL</OutputName>
>>>>>>> cyassl/master
<CreateExecutable>1</CreateExecutable> <CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib> <CreateLib>0</CreateLib>
<CreateHexFile>0</CreateHexFile> <CreateHexFile>0</CreateHexFile>
@@ -2517,11 +2491,7 @@
<uSurpInc>0</uSurpInc> <uSurpInc>0</uSurpInc>
<VariousControls> <VariousControls>
<MiscControls></MiscControls> <MiscControls></MiscControls>
<<<<<<< HEAD
<Define>HAVE_CONFIG_H CYASSL_STM32F2xx __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_BARE_METAL</Define> <Define>HAVE_CONFIG_H CYASSL_STM32F2xx __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_BARE_METAL</Define>
=======
<Define>HAVE_CONFIG_H __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_BARE_METAL</Define>
>>>>>>> cyassl/master
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>..\MDK-ARM\CyaSSL;..\MDK-ARM\inc;..\STM32F2xx_StdPeriph_Lib\inc;..\POSIX;..\..\..\</IncludePath> <IncludePath>..\MDK-ARM\CyaSSL;..\MDK-ARM\inc;..\STM32F2xx_StdPeriph_Lib\inc;..\POSIX;..\..\..\</IncludePath>
</VariousControls> </VariousControls>
@@ -3596,14 +3566,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath> <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
</File> </File>
<<<<<<< HEAD
<File> <File>
<FileName>time-STM32F2xx.c</FileName> <FileName>time-STM32F2xx.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath> <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
</File> </File>
=======
>>>>>>> cyassl/master
</Files> </Files>
</Group> </Group>
</Groups> </Groups>

4
src/internal.c
View File

@@ -9509,12 +9509,8 @@ int SetCipherList(Suites* s, const char* list)
ssl->options.haveSessionId = 1; ssl->options.haveSessionId = 1;
/* ProcessOld uses same resume code */ /* ProcessOld uses same resume code */
<<<<<<< HEAD
if (ssl->options.resuming) { /* let's try */
=======
if (ssl->options.resuming && (!ssl->options.dtls || if (ssl->options.resuming && (!ssl->options.dtls ||
ssl->options.acceptState == HELLO_VERIFY_SENT)) { /* let's try */ ssl->options.acceptState == HELLO_VERIFY_SENT)) { /* let's try */
>>>>>>> cyassl/master
int ret = -1; int ret = -1;
CYASSL_SESSION* session = GetSession(ssl,ssl->arrays->masterSecret); CYASSL_SESSION* session = GetSession(ssl,ssl->arrays->masterSecret);
if (!session) { if (!session) {