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

Merge pull request #637 from JacobBarthelmeh/master 

PKCS12 : return on memory error
pull/639/head
toddouska 2016-11-18 11:03:57 -08:00 committed by GitHub
parent 1289e66641 ac5436b462
commit b380eef3e2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/pkcs12.c
View File

@ -920,11 +920,12 @@ int wc_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw,
if (k == NULL) {
freeBuffers(*pkey, buf, pkcs12->heap);
freeCertList(certList, pkcs12->heap);
return MEMORY_E;
}
}
size = ret;
if (*pkey == NULL) {
if (*pkey == NULL) {
*pkey = k;
*pkeySz = size;
}