Missing ssl->heap in FreeBuildMsgArgs

This commit is contained in:
Juliusz Sosinowicz
2020-06-09 15:33:17 +02:00
committed by Unknown
parent 3980d6117d
commit 69802ed1a9
2 changed files with 6 additions and 6 deletions

View File

@ -6183,7 +6183,7 @@ void FreeKeyExchange(WOLFSSL* ssl)
ssl->async.freeArgs(ssl, ssl->async.args); ssl->async.freeArgs(ssl, ssl->async.args);
ssl->async.freeArgs = NULL; ssl->async.freeArgs = NULL;
} }
FreeBuildMsgArgs(&ssl->async.buildArgs); FreeBuildMsgArgs(ssl, &ssl->async.buildArgs);
#endif #endif
} }
@ -16072,11 +16072,11 @@ int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes)
} }
#ifndef WOLFSSL_NO_TLS12 #ifndef WOLFSSL_NO_TLS12
void FreeBuildMsgArgs(BuildMsgArgs* args) void FreeBuildMsgArgs(WOLFSSL* ssl, BuildMsgArgs* args)
{ {
if (args) { if (args) {
if (args->iv) if (ssl && args->iv)
XFREE(args->iv, NULL, DYNAMIC_TYPE_SALT); XFREE(args->iv, ssl->heap, DYNAMIC_TYPE_SALT);
XMEMSET(args, 0, sizeof(BuildMsgArgs)); XMEMSET(args, 0, sizeof(BuildMsgArgs));
} }
} }
@ -16516,7 +16516,7 @@ exit_buildmsg:
ret = args->sz; ret = args->sz;
/* Final cleanup */ /* Final cleanup */
FreeBuildMsgArgs(args); FreeBuildMsgArgs(ssl, args);
return ret; return ret;
#endif /* !WOLFSSL_NO_TLS12 */ #endif /* !WOLFSSL_NO_TLS12 */

View File

@ -4616,7 +4616,7 @@ WOLFSSL_LOCAL void FreeHandshakeHashes(WOLFSSL* ssl);
#ifndef WOLFSSL_NO_TLS12 #ifndef WOLFSSL_NO_TLS12
WOLFSSL_LOCAL void FreeBuildMsgArgs(BuildMsgArgs* args); WOLFSSL_LOCAL void FreeBuildMsgArgs(WOLFSSL* ssl, BuildMsgArgs* args);
#endif #endif
WOLFSSL_LOCAL int BuildMessage(WOLFSSL* ssl, byte* output, int outSz, WOLFSSL_LOCAL int BuildMessage(WOLFSSL* ssl, byte* output, int outSz,
const byte* input, int inSz, int type, int hashOutput, const byte* input, int inSz, int type, int hashOutput,