summaryrefslogtreecommitdiffstats
path: root/hostfile.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-16 04:31:48 +0200
committerDamien Miller <djm@mindrot.org>2000-04-16 04:31:48 +0200
commit5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 (patch)
tree443665fb58916f33c2f346aa3284a444d3352311 /hostfile.c
parentforgot -kb, remove openssl/ssl conditional (diff)
downloadopenssh-5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7.tar.xz
openssh-5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7.zip
- Reduce diff against OpenBSD source
- All OpenSSL includes are now unconditionally referenced as openssl/foo.h - Pick up formatting changes - Other minor changed (typecasts, etc) that I missed
Diffstat (limited to 'hostfile.c')
-rw-r--r--hostfile.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/hostfile.c b/hostfile.c
index b027075af..29efe5656 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -16,20 +16,11 @@
#include "includes.h"
RCSID("$OpenBSD: hostfile.c,v 1.16 2000/04/14 10:30:31 markus Exp $");
-#ifdef HAVE_OPENSSL
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/bn.h>
-#include <ssl/rsa.h>
-#include <ssl/dsa.h>
-#endif
-
#include "packet.h"
#include "match.h"
#include "ssh.h"
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
#include "key.h"
#include "hostfile.h"