mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacob Barthelmeh 2014-12-22 09:20:57 -07:00
commit db383fbbac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@ -12284,7 +12284,7 @@ int DoSessionTicket(WOLFSSL* ssl,
ERROR_OUT(MEMORY_E, done_b);
#endif
if ((ret = InitSha(sha) != 0))
if ((ret = InitSha(sha)) != 0)
goto done_b;
ShaUpdate(sha, ssl->arrays->clientRandom, RAN_LEN);

2
src/ssl.c
View File

@ -2029,7 +2029,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
header = BEGIN_ENC_PRIV_KEY; footer = END_ENC_PRIV_KEY;
} else if (header == BEGIN_ENC_PRIV_KEY) {
header = BEGIN_EC_PRIV; footer = END_EC_PRIV;
} else if (header == BEGIN_ENC_PRIV_KEY) {
} else if (header == BEGIN_EC_PRIV) {
header = BEGIN_DSA_PRIV; footer = END_DSA_PRIV;
} else
break;