generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 2786

Browse Source 
Reported by: Tomas Mraz <tmraz@redhat.com>

Treat a NULL value passed to drbg_free_entropy callback as non-op. This
can happen if the call to fips_get_entropy fails.
This commit is contained in:
Dr. Stephen Henson 2012-08-22 22:42:04 +00:00
parent 0720bf7df1
commit 7a217076d9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/rand/rand_lib.c
View File

@ -210,8 +210,11 @@ static size_t drbg_get_entropy(DRBG_CTX *ctx, unsigned char **pout,
static void drbg_free_entropy(DRBG_CTX *ctx, unsigned char *out, size_t olen) static void drbg_free_entropy(DRBG_CTX *ctx, unsigned char *out, size_t olen)
{ {
OPENSSL_cleanse(out, olen); if (out)
OPENSSL_free(out); {
OPENSSL_cleanse(out, olen);
OPENSSL_free(out);
}
} }
/* Set "additional input" when generating random data. This uses the /* Set "additional input" when generating random data. This uses the