wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

warning from windows build with ECDHE-PSK and fix potential memory leak

Browse Source
This commit is contained in:
Jacob Barthelmeh
2016-02-04 16:36:56 -07:00
parent 3ce64da44c
commit 3dc2e01180
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/internal.c
View File

@@ -13008,19 +13008,27 @@ static word32 QSH_KeyExchangeWrite(WOLFSSL* ssl, byte isServer)
/* Place ECC key in output buffer, leaving room for size */ /* Place ECC key in output buffer, leaving room for size */
ret = wc_ecc_export_x963(&myKey, es + 1, &size); ret = wc_ecc_export_x963(&myKey, es + 1, &size);
*es = size; /* place size of key in output buffer */ *es = (byte)size; /* place size of key in output buffer */
encSz += size + 1; encSz += size + 1;
if (ret != 0) if (ret != 0) {
#ifdef WOLFSSL_SMALL_STACK
XFREE(encSecret, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
ret = ECC_EXPORT_ERROR; ret = ECC_EXPORT_ERROR;
}
else { else {
size = sizeof(ssl->arrays->preMasterSecret); size = sizeof(ssl->arrays->preMasterSecret);
/* Create shared ECC key leaveing room at the begining /* Create shared ECC key leaveing room at the begining
of buffer for size of shared key */ of buffer for size of shared key */
ret = wc_ecc_shared_secret(&myKey, peerKey, ret = wc_ecc_shared_secret(&myKey, peerKey,
ssl->arrays->preMasterSecret + OPAQUE16_LEN, &size); ssl->arrays->preMasterSecret + OPAQUE16_LEN, &size);
if (ret != 0) if (ret != 0) {
#ifdef WOLFSSL_SMALL_STACK
XFREE(encSecret, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
ret = ECC_SHARED_ERROR; ret = ECC_SHARED_ERROR;
}
} }
wc_ecc_free(&myKey); wc_ecc_free(&myKey);
@@ -17492,14 +17500,14 @@ int DoSessionTicket(WOLFSSL* ssl,
length = sizeof(ssl->arrays->preMasterSecret); length = sizeof(ssl->arrays->preMasterSecret);
if (ssl->eccTempKeyPresent == 0) { if (ssl->eccTempKeyPresent == 0) {
WOLFSSL_MSG("Ecc ephemeral key not made correctly"); WOLFSSL_MSG("Ecc ephemeral key not made correctly");
ret = ECC_MAKEKEY_ERROR; ret = ECC_MAKEKEY_ERROR;
} else { } else {
ret = wc_ecc_shared_secret(ssl->eccTempKey, ret = wc_ecc_shared_secret(ssl->eccTempKey,
ssl->peerEccKey, ssl->arrays->preMasterSecret + ssl->peerEccKey, ssl->arrays->preMasterSecret +
OPAQUE16_LEN, &length); OPAQUE16_LEN, &length);
} }
if (ret != 0) { if (ret != 0) {
return ECC_SHARED_ERROR; return ECC_SHARED_ERROR;