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)

1 files changed, 0 insertions, 9 deletions

diff --git a/src/init.c b/src/init.c
index 21505db1..241b8618 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();