Merge branch 'master' into ti

This commit is contained in:
toddouska 2014-06-25 09:32:27 -06:00
commit 16d64104db
2 changed files with 3 additions and 0 deletions

View File

@ -5742,6 +5742,8 @@ static int SetDatesFromCert(Cert* cert, const byte* der, int derSz)
cert->beforeDateSz = decoded.beforeDateLen;
cert->afterDateSz = decoded.afterDateLen;
FreeDecodedCert(&decoded);
return 0;
}

View File

@ -1075,6 +1075,7 @@ CYASSL_LOCAL int CreateRecipientInfo(const byte* cert, word32 certSz,
if (RsaPublicKeyDecode(decoded->publicKey, &idx, pubKey,
decoded->pubKeySize) < 0) {
CYASSL_MSG("ASN RSA key decode error");
FreeRsaKey(pubKey);
FreeDecodedCert(decoded);
#ifdef CYASSL_SMALL_STACK
XFREE(pubKey, NULL, DYNAMIC_TYPE_TMP_BUFFER);