summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--auth-bsdauth.c2
-rw-r--r--auth-options.c1
-rw-r--r--auth.h4
-rw-r--r--auth2.c3
-rw-r--r--dns.c1
-rw-r--r--hmac.c1
-rw-r--r--hostfile.c1
-rw-r--r--kex.h15
-rw-r--r--kexecdh.c8
-rw-r--r--krl.c1
-rw-r--r--mac.c1
-rw-r--r--sandbox-systrace.c1
-rw-r--r--ssh-keysign.c1
-rw-r--r--sshconnect.c1
14 files changed, 8 insertions, 33 deletions
diff --git a/auth-bsdauth.c b/auth-bsdauth.c
index 4dc5045c2..d124e994e 100644
--- a/auth-bsdauth.c
+++ b/auth-bsdauth.c
@@ -29,8 +29,6 @@
29#include <stdarg.h> 29#include <stdarg.h>
30#include <stdio.h> 30#include <stdio.h>
31 31
32#include <stdarg.h>
33
34#ifdef BSD_AUTH 32#ifdef BSD_AUTH
35#include "xmalloc.h" 33#include "xmalloc.h"
36#include "sshkey.h" 34#include "sshkey.h"
diff --git a/auth-options.c b/auth-options.c
index 9550f656f..90b0d7f25 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -22,7 +22,6 @@
22#include <stdlib.h> 22#include <stdlib.h>
23#include <netdb.h> 23#include <netdb.h>
24#include <pwd.h> 24#include <pwd.h>
25#include <stdlib.h>
26#include <string.h> 25#include <string.h>
27#include <stdio.h> 26#include <stdio.h>
28#include <stdarg.h> 27#include <stdarg.h>
diff --git a/auth.h b/auth.h
index 04ad99ffb..becc672b5 100644
--- a/auth.h
+++ b/auth.h
@@ -234,7 +234,7 @@ pid_t subprocess(const char *, struct passwd *,
234int sys_auth_passwd(struct ssh *, const char *); 234int sys_auth_passwd(struct ssh *, const char *);
235 235
236#if defined(KRB5) && !defined(HEIMDAL) 236#if defined(KRB5) && !defined(HEIMDAL)
237#include <krb5.h>
238krb5_error_code ssh_krb5_cc_gen(krb5_context, krb5_ccache *); 237krb5_error_code ssh_krb5_cc_gen(krb5_context, krb5_ccache *);
239#endif 238#endif
240#endif 239
240#endif /* AUTH_H */
diff --git a/auth2.c b/auth2.c
index 2143ff5de..0e7762242 100644
--- a/auth2.c
+++ b/auth2.c
@@ -52,14 +52,11 @@
52#include "auth.h" 52#include "auth.h"
53#include "dispatch.h" 53#include "dispatch.h"
54#include "pathnames.h" 54#include "pathnames.h"
55#include "sshbuf.h"
56#include "ssherr.h" 55#include "ssherr.h"
57
58#ifdef GSSAPI 56#ifdef GSSAPI
59#include "ssh-gss.h" 57#include "ssh-gss.h"
60#endif 58#endif
61#include "monitor_wrap.h" 59#include "monitor_wrap.h"
62#include "ssherr.h"
63#include "digest.h" 60#include "digest.h"
64 61
65/* import */ 62/* import */
diff --git a/dns.c b/dns.c
index ff1a2c41c..e4f9bf830 100644
--- a/dns.c
+++ b/dns.c
@@ -34,7 +34,6 @@
34#include <stdarg.h> 34#include <stdarg.h>
35#include <stdio.h> 35#include <stdio.h>
36#include <string.h> 36#include <string.h>
37#include <stdarg.h>
38#include <stdlib.h> 37#include <stdlib.h>
39 38
40#include "xmalloc.h" 39#include "xmalloc.h"
diff --git a/hmac.c b/hmac.c
index a79e8569c..32688876d 100644
--- a/hmac.c
+++ b/hmac.c
@@ -21,7 +21,6 @@
21 21
22#include <stdlib.h> 22#include <stdlib.h>
23#include <string.h> 23#include <string.h>
24#include <stdlib.h>
25 24
26#include "sshbuf.h" 25#include "sshbuf.h"
27#include "digest.h" 26#include "digest.h"
diff --git a/hostfile.c b/hostfile.c
index 389aae1fc..96ab880d4 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -49,7 +49,6 @@
49#include <stdio.h> 49#include <stdio.h>
50#include <stdlib.h> 50#include <stdlib.h>
51#include <string.h> 51#include <string.h>
52#include <stdarg.h>
53#include <unistd.h> 52#include <unistd.h>
54 53
55#include "xmalloc.h" 54#include "xmalloc.h"
diff --git a/kex.h b/kex.h
index 6465df88d..a5ae6ac05 100644
--- a/kex.h
+++ b/kex.h
@@ -30,6 +30,9 @@
30#include "crypto_api.h" 30#include "crypto_api.h"
31 31
32#ifdef WITH_OPENSSL 32#ifdef WITH_OPENSSL
33# include <openssl/bn.h>
34# include <openssl/dh.h>
35# include <openssl/ecdsa.h>
33# ifdef OPENSSL_HAS_ECC 36# ifdef OPENSSL_HAS_ECC
34# include <openssl/ec.h> 37# include <openssl/ec.h>
35# else /* OPENSSL_HAS_ECC */ 38# else /* OPENSSL_HAS_ECC */
@@ -45,18 +48,6 @@
45# define EC_POINT void 48# define EC_POINT void
46#endif /* WITH_OPENSSL */ 49#endif /* WITH_OPENSSL */
47 50
48#ifdef WITH_OPENSSL
49#include <openssl/bn.h>
50#include <openssl/dh.h>
51#include <openssl/ec.h>
52#include <openssl/ecdsa.h>
53#else /* OPENSSL */
54#define BIGNUM void
55#define DH void
56#define EC_KEY void
57#define EC_GROUP void
58#endif /* WITH_OPENSSL */
59
60#define KEX_COOKIE_LEN 16 51#define KEX_COOKIE_LEN 16
61 52
62#define KEX_DH1 "diffie-hellman-group1-sha1" 53#define KEX_DH1 "diffie-hellman-group1-sha1"
diff --git a/kexecdh.c b/kexecdh.c
index be324a838..bcfa3b107 100644
--- a/kexecdh.c
+++ b/kexecdh.c
@@ -211,11 +211,9 @@ kex_ecdh_dec(struct kex *kex, const struct sshbuf *server_blob,
211 211
212#else 212#else
213 213
214#include <stdio.h> 214struct kex;
215 215struct sshbuf;
216#include "sshkey.h" 216struct sshkey;
217#include "kex.h"
218#include "ssherr.h"
219 217
220int 218int
221kex_ecdh_keypair(struct kex *kex) 219kex_ecdh_keypair(struct kex *kex)
diff --git a/krl.c b/krl.c
index 10a8bcc87..a7f690955 100644
--- a/krl.c
+++ b/krl.c
@@ -29,7 +29,6 @@
29#include <string.h> 29#include <string.h>
30#include <time.h> 30#include <time.h>
31#include <unistd.h> 31#include <unistd.h>
32#include <stdlib.h>
33 32
34#include "sshbuf.h" 33#include "sshbuf.h"
35#include "ssherr.h" 34#include "ssherr.h"
diff --git a/mac.c b/mac.c
index de346ed20..f3dda6692 100644
--- a/mac.c
+++ b/mac.c
@@ -30,7 +30,6 @@
30#include <stdlib.h> 30#include <stdlib.h>
31#include <string.h> 31#include <string.h>
32#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h>
34 33
35#include "digest.h" 34#include "digest.h"
36#include "hmac.h" 35#include "hmac.h"
diff --git a/sandbox-systrace.c b/sandbox-systrace.c
index add4c46d0..93e63b8e0 100644
--- a/sandbox-systrace.c
+++ b/sandbox-systrace.c
@@ -36,7 +36,6 @@
36#include <stdlib.h> 36#include <stdlib.h>
37#include <string.h> 37#include <string.h>
38#include <unistd.h> 38#include <unistd.h>
39#include <limits.h>
40 39
41#include "atomicio.h" 40#include "atomicio.h"
42#include "log.h" 41#include "log.h"
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 3ede407d3..6cfd5b46c 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -33,7 +33,6 @@
33#include <stdarg.h> 33#include <stdarg.h>
34#include <stdio.h> 34#include <stdio.h>
35#include <stdlib.h> 35#include <stdlib.h>
36#include <stdio.h>
37#include <string.h> 36#include <string.h>
38#include <unistd.h> 37#include <unistd.h>
39#include <errno.h> 38#include <errno.h>
diff --git a/sshconnect.c b/sshconnect.c
index bcb732a32..6230dad32 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -56,7 +56,6 @@
56#include "compat.h" 56#include "compat.h"
57#include "sshkey.h" 57#include "sshkey.h"
58#include "sshconnect.h" 58#include "sshconnect.h"
59#include "hostfile.h"
60#include "log.h" 59#include "log.h"
61#include "misc.h" 60#include "misc.h"
62#include "readconf.h" 61#include "readconf.h"