diff options
author | Damien Miller <djm@mindrot.org> | 2018-11-23 10:40:06 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-11-23 10:42:05 +1100 |
commit | 42c5ec4b97b6a1bae70f323952d0646af16ce710 (patch) | |
tree | 6d85f7daebb7241b80bc91126f433dca62e850e8 /ssh-agent.c | |
parent | 5b60b6c02009547a3e2a99d4886965de2a4719da (diff) |
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
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index cb552462a..6baebc313 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1095,10 +1095,6 @@ main(int ac, char **av) | |||
1095 | if (getrlimit(RLIMIT_NOFILE, &rlim) == -1) | 1095 | if (getrlimit(RLIMIT_NOFILE, &rlim) == -1) |
1096 | fatal("%s: getrlimit: %s", __progname, strerror(errno)); | 1096 | fatal("%s: getrlimit: %s", __progname, strerror(errno)); |
1097 | 1097 | ||
1098 | #ifdef WITH_OPENSSL | ||
1099 | OpenSSL_add_all_algorithms(); | ||
1100 | #endif | ||
1101 | |||
1102 | __progname = ssh_get_progname(av[0]); | 1098 | __progname = ssh_get_progname(av[0]); |
1103 | seed_rng(); | 1099 | seed_rng(); |
1104 | 1100 | ||