diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-03-28 15:28:06 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-03-28 15:29:39 +0100 |
| commit | 3d1160d58bddc2c048fef0b5f66d68a9cadd08a0 (patch) | |
| tree | 3d55fc216aa8e92618592462e5c9147f1791673b /apps | |
| parent | Enable TLS 1.2 ciphers in DTLS 1.2. (diff) | |
| download | openssl-3d1160d58bddc2c048fef0b5f66d68a9cadd08a0.tar.xz openssl-3d1160d58bddc2c048fef0b5f66d68a9cadd08a0.zip | |
Call RAND_cleanup in openssl application.
(cherry picked from commit 944bc29f9004cf8851427ebfa83ee70b8399da57)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.h | 2 | ||||
| -rw-r--r-- | apps/openssl.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/apps/apps.h b/apps/apps.h index 390a58c67c..0a9d90bcb5 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -183,11 +183,13 @@ extern BIO *bio_err; # define apps_startup() \ do { do_pipe_sig(); CRYPTO_malloc_init(); \ ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \ + RAND_cleanup(); \ ENGINE_load_builtin_engines(); setup_ui_method(); } while(0) # define apps_shutdown() \ do { CONF_modules_unload(1); destroy_ui_method(); \ OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \ CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \ + RAND_cleanup(); \ ERR_free_strings(); zlib_cleanup();} while(0) # else # define apps_startup() \ diff --git a/apps/openssl.c b/apps/openssl.c index 1c880d90ba..71e1e48ece 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -117,6 +117,7 @@ #include "apps.h" #include <openssl/bio.h> #include <openssl/crypto.h> +#include <openssl/rand.h> #include <openssl/lhash.h> #include <openssl/conf.h> #include <openssl/x509.h> |