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

Merge pull request #303 from ejohnstown/sniffer-check 

When loading a named key, check that the save buffer mallocs.
pull/276/merge
dgarske 2016-02-10 13:19:59 -08:00
parent b0a51a22a1 ccffee1617
commit 49a5ea18e8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sniffer.c
View File

@ -1041,9 +1041,7 @@ static int LoadKeyFile(byte** keyBuf, word32* keyBufSz,
const char* password)
{
byte* loadBuf;
byte* saveBuf;
long fileSz = 0;
int saveBufSz;
XFILE file;
int ret;
@ -1067,10 +1065,21 @@ static int LoadKeyFile(byte** keyBuf, word32* keyBufSz,
XFCLOSE(file);
if (typeKey == SSL_FILETYPE_PEM) {
saveBuf = (byte*)malloc(fileSz);
byte* saveBuf = (byte*)malloc(fileSz);
int saveBufSz = 0;
saveBufSz = wolfSSL_KeyPemToDer(loadBuf, (int)fileSz,
ret = -1;
if (saveBuf != NULL) {
saveBufSz = wolfSSL_KeyPemToDer(loadBuf, (int)fileSz,
saveBuf, (int)fileSz, password);
if (saveBufSz < 0) {
saveBufSz = 0;
free(saveBuf);
}
else
ret = 0;
}
free(loadBuf);
*keyBuf = saveBuf;
@ -1081,7 +1090,6 @@ static int LoadKeyFile(byte** keyBuf, word32* keyBufSz,
*keyBufSz = (word32)fileSz;
}
if (ret < 0) {
return -1;
}