refactor libcrypto initialisation

Don't call OpenSSL_add_all_algorithms() unless OpenSSL actually
supports it.

Move all libcrypto initialisation to a single function, and call that
from seed_rng() that is called early in each tool's main().

Prompted by patch from Rosen Penev

1 files changed, 2 insertions, 7 deletions

diff --git a/ssh.c b/ssh.c
index 1e471f5c4..1ac903d16 100644
--- a/ssh.c
+++ b/ssh.c
@@ -610,6 +610,8 @@ main(int ac, char **av)
         av = saved_av;
 #endif
 
+        seed_rng();
+
         /*
          * Discard other fds that are hanging around. These can cause problem
          * with backgrounded ssh processes started by ControlPersist.
@@ -1036,11 +1038,6 @@ main(int ac, char **av)
 
         host_arg = xstrdup(host);
 
-#ifdef WITH_OPENSSL
-        OpenSSL_add_all_algorithms();
-        ERR_load_crypto_strings();
-#endif
-
         /* Initialize the command to execute on remote host. */
         if ((command = sshbuf_new()) == NULL)
                 fatal("sshbuf_new failed");
@@ -1264,8 +1261,6 @@ main(int ac, char **av)
                 tty_flag = 0;
         }
 
-        seed_rng();
-
         if (options.user == NULL)
                 options.user = xstrdup(pw->pw_name);