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

If RAND_bytes fails, then we will attempt to double-free crypt->key.data.

Browse Source 
From Andrew Bartlett.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17518 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-08 16:46:31 +00:00
parent 2bddc22c0e
commit 3de0915340
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hx509/crypto.c
View File

@@ -1443,6 +1443,7 @@ hx509_crypto_set_key_data(hx509_crypto crypto, const void *data, size_t length)
if (crypto->key.data) { if (crypto->key.data) {
free(crypto->key.data); free(crypto->key.data);
crypto->key.data = NULL;
crypto->key.length = 0; crypto->key.length = 0;
} }
crypto->key.data = malloc(length); crypto->key.data = malloc(length);
@@ -1470,6 +1471,7 @@ hx509_crypto_set_random_key(hx509_crypto crypto, heim_octet_string *key)
} }
if (RAND_bytes(crypto->key.data, crypto->key.length) <= 0) { if (RAND_bytes(crypto->key.data, crypto->key.length) <= 0) {
free(crypto->key.data); free(crypto->key.data);
crypto->key.data = NULL;
crypto->key.length = 0; crypto->key.length = 0;
return HX509_CRYPTO_INTERNAL_ERROR; return HX509_CRYPTO_INTERNAL_ERROR;
} }