aboutsummaryrefslogtreecommitdiff
path: root/test/ssltest.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-02-08 16:45:35 +0000
committerMatt Caswell <matt@openssl.org>2016-02-09 15:11:38 +0000
commit8793f012f11416abd300aa524057c863e8c16dd5 (patch)
treeae6a3c00048af2d608e5736d9753217052749b57 /test/ssltest.c
parentb9f757074d470ec6b031f348581160e48202b85c (diff)
downloadopenssl-8793f012f11416abd300aa524057c863e8c16dd5.zip
openssl-8793f012f11416abd300aa524057c863e8c16dd5.tar.gz
openssl-8793f012f11416abd300aa524057c863e8c16dd5.tar.bz2
Clean up the tests for auto-init/de-init
Remove the need to explicitly initialise/deinitialise for the tests Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/ssltest.c')
-rw-r--r--test/ssltest.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/test/ssltest.c b/test/ssltest.c
index f217a20..b5d44a0 100644
--- a/test/ssltest.c
+++ b/test/ssltest.c
@@ -1410,7 +1410,6 @@ int main(int argc, char *argv[])
#ifdef OPENSSL_FIPS
if (fips_mode) {
if (!FIPS_mode_set(1)) {
- ERR_load_crypto_strings();
ERR_print_errors(bio_err);
EXIT(1);
} else
@@ -1430,9 +1429,6 @@ int main(int argc, char *argv[])
/* if (cipher == NULL) cipher=getenv("SSL_CIPHER"); */
- SSL_library_init();
- SSL_load_error_strings();
-
#ifndef OPENSSL_NO_COMP
if (comp == COMP_ZLIB)
cm = COMP_zlib();
@@ -1856,14 +1852,6 @@ int main(int argc, char *argv[])
BIO_free(bio_stdout);
-#ifndef OPENSSL_NO_ENGINE
- ENGINE_cleanup();
-#endif
- CONF_modules_unload(1);
- CRYPTO_cleanup_all_ex_data();
- ERR_free_strings();
- ERR_remove_thread_state(NULL);
- EVP_cleanup();
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
if (CRYPTO_mem_leaks(bio_err) <= 0)
ret = 1;