summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-add.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2019-09-06 05:23:55 +0000
committerdjm <djm@openbsd.org>2019-09-06 05:23:55 +0000
commit1f96526fb0deff53898d266d4e2e399e64e301ef (patch)
tree97f4b05f2b48e51c0d3734edbd9464b42cb9ed34 /usr.bin/ssh/ssh-add.c
parentlots of things were relying on libcrypto headers to transitively (diff)
downloadwireguard-openbsd-1f96526fb0deff53898d266d4e2e399e64e301ef.tar.xz
wireguard-openbsd-1f96526fb0deff53898d266d4e2e399e64e301ef.zip
fixes for !WITH_OPENSSL compilation; ok dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
-rw-r--r--usr.bin/ssh/ssh-add.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index cf978f65fb5..5a4f6891f2e 100644
--- a/usr.bin/ssh/ssh-add.c
+++ b/usr.bin/ssh/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.140 2019/06/28 13:35:04 deraadt Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.141 2019/09/06 05:23:55 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,7 +38,9 @@
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef WITH_OPENSSL
#include <openssl/evp.h>
+#endif
#include <errno.h>
#include <fcntl.h>
@@ -570,8 +572,9 @@ main(int argc, char **argv)
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
sanitise_stdfd();
+#ifdef WITH_OPENSSL
OpenSSL_add_all_algorithms();
-
+#endif
log_init(__progname, log_level, log_facility, 1);
setvbuf(stdout, NULL, _IOLBF, 0);