wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for wolfSSL_i2d_RSAPublicKey leak.

Browse Source
This commit is contained in:
David Garske
2018-10-05 14:09:12 -07:00
parent cec61ac3c9
commit 1ed50a40e7
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ssl.c
View File

@ -23741,7 +23741,7 @@ WOLFSSL_RSA* wolfSSL_RSA_new(void)
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
/* when calling SetIndividualExternal, mpi should be cleared by caller if no /* when calling SetIndividualExternal, mpi should be cleared by caller if no
* longer used. ie mp_clear(mpi). This is to free data when fastmath is * longer used. ie mp_free(mpi). This is to free data when fastmath is
* disabled since a copy of mpi is made by this function and placed into bn. * disabled since a copy of mpi is made by this function and placed into bn.
*/ */
static int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi) static int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi)
@ -23777,6 +23777,10 @@ static int SetIndividualExternal(WOLFSSL_BIGNUM** bn, mp_int* mpi)
#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */ #endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */
#ifdef OPENSSL_EXTRA /* only without X509_SMALL */ #ifdef OPENSSL_EXTRA /* only without X509_SMALL */
/* when calling SetIndividualInternal, mpi should be cleared by caller if no
* longer used. ie mp_free(mpi). This is to free data when fastmath is
* disabled since a copy of mpi is made by this function and placed into bn.
*/
static int SetIndividualInternal(WOLFSSL_BIGNUM* bn, mp_int* mpi) static int SetIndividualInternal(WOLFSSL_BIGNUM* bn, mp_int* mpi)
{ {
WOLFSSL_MSG("Entering SetIndividualInternal"); WOLFSSL_MSG("Entering SetIndividualInternal");
@ -28536,9 +28540,12 @@ int wolfSSL_i2d_RSAPublicKey(WOLFSSL_RSA *rsa, const unsigned char **pp)
WOLFSSL_ENTER("i2d_RSAPublicKey"); WOLFSSL_ENTER("i2d_RSAPublicKey");
if (rsa == NULL) if (rsa == NULL)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
if ((ret = SetRsaInternal(rsa)) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("SetRsaInternal Failed"); if (rsa->inSet == 0) {
return ret; if ((ret = SetRsaInternal(rsa)) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("SetRsaInternal Failed");
return ret;
}
} }
if ((derLen = RsaPublicKeyDerSize((RsaKey *)rsa->internal, 1)) < 0) if ((derLen = RsaPublicKeyDerSize((RsaKey *)rsa->internal, 1)) < 0)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;