summaryrefslogtreecommitdiffstats
path: root/key.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 /key.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 'key.c')
-rw-r--r--key.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/key.c b/key.c
index 437a5e245..872313abc 100644
--- a/key.c
+++ b/key.c
@@ -32,21 +32,10 @@
*/
#include "includes.h"
-
-#ifdef HAVE_OPENSSL
-#include <openssl/bn.h>
+#include "ssh.h"
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/evp.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/bn.h>
-#include <ssl/rsa.h>
-#include <ssl/dsa.h>
-#include <ssl/evp.h>
-#endif
-
-#include "ssh.h"
#include "xmalloc.h"
#include "key.h"