From 3ae01ff9f5b3e1f2ebded97ff36a705ae3b17b30 Mon Sep 17 00:00:00 2001 From: Oliver Stöneberg Date: Tue, 26 Apr 2011 16:06:46 -0700 Subject: init: Some initialization fixes. - Check result of ssh_init() in privatekey_from_base64() - Moved code from ssh_finalize() to appropriate subroutines - Only initialize sockets once (caused mismatch of WSAStartup() and WSACleanup() calls and potential usage of bsd_poll when win_poll should be used) --- src/init.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/init.c') diff --git a/src/init.c b/src/init.c index 21505db..241b861 100644 --- a/src/init.c +++ b/src/init.c @@ -73,15 +73,6 @@ int ssh_init(void) { int ssh_finalize(void) { ssh_crypto_finalize(); ssh_socket_cleanup(); -#ifdef HAVE_LIBGCRYPT - gcry_control(GCRYCTL_TERM_SECMEM); -#elif defined HAVE_LIBCRYPTO - EVP_cleanup(); - CRYPTO_cleanup_all_ex_data(); -#endif -#ifdef _WIN32 - WSACleanup(); -#endif /* It is important to finalize threading after CRYPTO because * it still depends on it */ ssh_threads_finalize(); -- cgit