diff options
| author | Matt Caswell <matt@openssl.org> | 2016-02-08 16:45:35 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-09 15:11:38 +0000 |
| commit | 8793f012f11416abd300aa524057c863e8c16dd5 (patch) | |
| tree | ae6a3c00048af2d608e5736d9753217052749b57 /test/p5_crpt2_test.c | |
| parent | b9f757074d470ec6b031f348581160e48202b85c (diff) | |
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/p5_crpt2_test.c')
| -rw-r--r-- | test/p5_crpt2_test.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/test/p5_crpt2_test.c b/test/p5_crpt2_test.c index 2c998bada3..2c136b6488 100644 --- a/test/p5_crpt2_test.c +++ b/test/p5_crpt2_test.c @@ -183,11 +183,7 @@ int main(int argc, char **argv) CRYPTO_set_mem_debug(1); CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - OpenSSL_add_all_digests(); -# ifndef OPENSSL_NO_ENGINE - ENGINE_load_builtin_engines(); - ENGINE_register_all_digests(); -# endif + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL); printf("PKCS5_PBKDF2_HMAC() tests "); for (i = 0; test->pass != NULL; i++, test++) { @@ -198,13 +194,6 @@ int main(int argc, char **argv) } printf(" done\n"); -# ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); -# endif - EVP_cleanup(); - CRYPTO_cleanup_all_ex_data(); - ERR_remove_thread_state(NULL); - ERR_free_strings(); #ifndef OPENSSL_NO_CRYPTO_MDEBUG if (CRYPTO_mem_leaks_fp(stderr) <= 0) return 1; |