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, 6 deletions

diff --git a/sshd.c b/sshd.c
index afd959329..fb9d9b60f 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1510,6 +1510,8 @@ main(int ac, char **av)
         /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
         sanitise_stdfd();
 
+        seed_rng();
+
         /* Initialize configuration options to their default values. */
         initialize_server_options(&options);
 
@@ -1631,10 +1633,6 @@ main(int ac, char **av)
         else
                 closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
 
-#ifdef WITH_OPENSSL
-        OpenSSL_add_all_algorithms();
-#endif
-
         /* If requested, redirect the logs to the specified logfile. */
         if (logfile != NULL)
                 log_redirect_stderr_to(logfile);
@@ -1677,8 +1675,6 @@ main(int ac, char **av)
         parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name,
             cfg, NULL);
 
-        seed_rng();
-
         /* Fill in default values for those options not explicitly set. */
         fill_default_server_options(&options);