diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-02-05 09:20:38 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-02-05 09:57:14 -0800 |
| commit | 04ef91b390dfcc6125913e2f2af502d23d7a5112 (patch) | |
| tree | 2350c86475958f85c6fd56b7c80e0817a1c75b56 /crypto/rand | |
| parent | 3ccf38e0fb3064a4b19879d5e068fb7a124234c0 (diff) | |
| download | replicant_openssl-04ef91b390dfcc6125913e2f2af502d23d7a5112.zip replicant_openssl-04ef91b390dfcc6125913e2f2af502d23d7a5112.tar.gz replicant_openssl-04ef91b390dfcc6125913e2f2af502d23d7a5112.tar.bz2 | |
openssl-1.0.1d upgrade
Change-Id: Ie980c8834cf2c843858182d98d1f60c65a2a9b70
Diffstat (limited to 'crypto/rand')
| -rw-r--r-- | crypto/rand/md_rand.c | 2 | ||||
| -rw-r--r-- | crypto/rand/rand_lib.c | 7 | ||||
| -rw-r--r-- | crypto/rand/randfile.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index fcdd3f2..1e3bcb9 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -123,10 +123,10 @@ #include "e_os.h" +#include <openssl/crypto.h> #include <openssl/rand.h> #include "rand_lcl.h" -#include <openssl/crypto.h> #include <openssl/err.h> #ifdef BN_DEBUG diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index daf1dab..476a0cd 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -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) { - OPENSSL_cleanse(out, olen); - OPENSSL_free(out); + if (out) + { + OPENSSL_cleanse(out, olen); + OPENSSL_free(out); + } } /* Set "additional input" when generating random data. This uses the diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 030e07f..7f14280 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -57,7 +57,9 @@ */ /* We need to define this to get macros like S_IFBLK and S_IFCHR */ +#if !defined(OPENSSL_SYS_VXWORKS) #define _XOPEN_SOURCE 500 +#endif #include <errno.h> #include <stdio.h> |