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

free WOLFSSL_BN in SetIndividualExternal error case and simplify mpi_clear call

Browse Source
This commit is contained in:
Jacob Barthelmeh
2017-01-11 14:53:32 -07:00
parent 1afb7e20db
commit 36d34ce069
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ssl.c
View File

@@ -16508,6 +16508,8 @@ void wolfSSL_RSA_free(WOLFSSL_RSA* rsa)
*/ */
static int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi) static int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi)
{ {
byte dynamic = 0;
WOLFSSL_MSG("Entering SetIndividualExternal"); WOLFSSL_MSG("Entering SetIndividualExternal");
if (mpi == NULL || bn == NULL) { if (mpi == NULL || bn == NULL) {
@@ -16521,10 +16523,14 @@ static int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi)
WOLFSSL_MSG("SetIndividualExternal alloc failed"); WOLFSSL_MSG("SetIndividualExternal alloc failed");
return SSL_FATAL_ERROR; return SSL_FATAL_ERROR;
} }
dynamic = 1;
} }
if (mp_copy(mpi, (mp_int*)((*bn)->internal)) != MP_OKAY) { if (mp_copy(mpi, (mp_int*)((*bn)->internal)) != MP_OKAY) {
WOLFSSL_MSG("mp_copy error"); WOLFSSL_MSG("mp_copy error");
if (dynamic == 1) {
wolfSSL_BN_free(*bn);
}
return SSL_FATAL_ERROR; return SSL_FATAL_ERROR;
} }
@@ -16574,24 +16580,14 @@ WOLFSSL_BIGNUM *wolfSSL_ASN1_INTEGER_to_BN(const WOLFSSL_ASN1_INTEGER *ai,
return NULL; return NULL;
} }
/* SetIndividualExternal mallocs bn in the case that bn is NULL /* mp_clear needs called because mpi is copied and causes memory leak with
* mp_clear needs called because mpi is copied and causes memory leak with
* --disable-fastmath */ * --disable-fastmath */
if (bn == NULL) { ret = SetIndividualExternal(&bn, &mpi);
if (SetIndividualExternal(&bn, &mpi) != SSL_SUCCESS) {
wolfSSL_BN_free(bn);
mp_clear(&mpi);
return NULL;
}
}
else {
if (SetIndividualExternal(&bn, &mpi) != SSL_SUCCESS) {
mp_clear(&mpi);
return NULL;
}
}
mp_clear(&mpi); mp_clear(&mpi);
if (ret != SSL_SUCCESS) {
return NULL;
}
return bn; return bn;
} }
#endif /* !NO_ASN */ #endif /* !NO_ASN */