oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Try to not leak memory.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18799 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-21 23:07:32 +00:00
parent 35e6948538
commit 51f86669ef
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/des/rsa.c
View File

@@ -302,7 +302,8 @@ heim_int2BN(const heim_integer *i)
BIGNUM *bn; BIGNUM *bn;
bn = BN_bin2bn(i->data, i->length, NULL); bn = BN_bin2bn(i->data, i->length, NULL);
BN_set_negative(bn, i->negative); if (bn)
BN_set_negative(bn, i->negative);
return bn; return bn;
} }
@@ -350,8 +351,15 @@ d2i_RSAPrivateKey(RSA *rsa, const unsigned char **pp, size_t len)
k->q = heim_int2BN(&data.prime2); k->q = heim_int2BN(&data.prime2);
k->dmp1 = heim_int2BN(&data.exponent1); k->dmp1 = heim_int2BN(&data.exponent1);
k->dmq1 = heim_int2BN(&data.exponent2); k->dmq1 = heim_int2BN(&data.exponent2);
free_RSAPrivateKey(&data); free_RSAPrivateKey(&data);
if (k->n == NULL || k->e == NULL || k->d == NULL || k->p == NULL ||
k->q == NULL || k->dmp1 == NULL || k->dmq1 == NULL)
{
RSA_free(k);
return NULL;
}
return k; return k;
} }
@@ -362,11 +370,18 @@ i2d_RSAPublicKey(RSA *rsa, unsigned char **pp)
size_t size; size_t size;
int ret; int ret;
ret = bn2heim_int(rsa->n, &data.modulus); memset(&data, 0, sizeof(data));
ret = bn2heim_int(rsa->e, &data.publicExponent);
if (bn2heim_int(rsa->n, &data.modulus) ||
bn2heim_int(rsa->e, &data.publicExponent))
{
free_RSAPublicKey(&data);
return -1;
}
if (pp == NULL) { if (pp == NULL) {
size = length_RSAPublicKey(&data); size = length_RSAPublicKey(&data);
free_RSAPublicKey(&data);
} else { } else {
void *p; void *p;
size_t len; size_t len;
@@ -379,6 +394,7 @@ i2d_RSAPublicKey(RSA *rsa, unsigned char **pp)
abort(); abort();
memcpy(*pp, p, size); memcpy(*pp, p, size);
free(p);
*pp += size; *pp += size;
} }