summaryrefslogtreecommitdiff
path: root/ssh-add.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-01-15 02:21:31 +1100
committerDamien Miller <djm@mindrot.org>2015-01-15 02:28:36 +1100
commit72ef7c148c42db7d5632a29f137f8b87b579f2d9 (patch)
tree47954a387f4260cc8b1e0ff33bbbaf22fd6f11fc /ssh-add.c
parent4f38c61c68ae7e3f9ee4b3c38bc86cd39f65ece9 (diff)
support --without-openssl at configure time
Disables and removes dependency on OpenSSL. Many features don't work and the set of crypto options is greatly restricted. This will only work on system with native arc4random or /dev/urandom. Considered highly experimental for now.
Diffstat (limited to 'ssh-add.c')
-rw-r--r--ssh-add.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssh-add.c b/ssh-add.c
index 3680ab07a..8f369be4d 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -70,11 +70,13 @@ extern char *__progname;
70 70
71/* Default files to add */ 71/* Default files to add */
72static char *default_files[] = { 72static char *default_files[] = {
73#ifdef WITH_OPENSSL
73 _PATH_SSH_CLIENT_ID_RSA, 74 _PATH_SSH_CLIENT_ID_RSA,
74 _PATH_SSH_CLIENT_ID_DSA, 75 _PATH_SSH_CLIENT_ID_DSA,
75#ifdef OPENSSL_HAS_ECC 76#ifdef OPENSSL_HAS_ECC
76 _PATH_SSH_CLIENT_ID_ECDSA, 77 _PATH_SSH_CLIENT_ID_ECDSA,
77#endif 78#endif
79#endif /* WITH_OPENSSL */
78 _PATH_SSH_CLIENT_ID_ED25519, 80 _PATH_SSH_CLIENT_ID_ED25519,
79 _PATH_SSH_CLIENT_IDENTITY, 81 _PATH_SSH_CLIENT_IDENTITY,
80 NULL 82 NULL
@@ -440,7 +442,9 @@ main(int argc, char **argv)
440 __progname = ssh_get_progname(argv[0]); 442 __progname = ssh_get_progname(argv[0]);
441 seed_rng(); 443 seed_rng();
442 444
445#ifdef WITH_OPENSSL
443 OpenSSL_add_all_algorithms(); 446 OpenSSL_add_all_algorithms();
447#endif
444 448
445 setvbuf(stdout, NULL, _IOLBF, 0); 449 setvbuf(stdout, NULL, _IOLBF, 0);
446 450