summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog17
-rw-r--r--atomicio.c3
-rw-r--r--auth-options.c3
-rw-r--r--auth-passwd.c3
-rw-r--r--auth-rhosts.c3
-rw-r--r--auth-rsa.c3
-rw-r--r--auth.c3
-rw-r--r--auth1.c3
-rw-r--r--auth2-chall.c4
-rw-r--r--auth2-hostbased.c3
-rw-r--r--auth2-passwd.c4
-rw-r--r--auth2.c3
-rw-r--r--authfd.c3
-rw-r--r--authfile.c3
-rw-r--r--bufaux.c5
-rw-r--r--bufbn.c5
-rw-r--r--buffer.c4
-rw-r--r--canohost.c3
-rw-r--r--channels.c3
-rw-r--r--cipher-3des1.c5
-rw-r--r--cipher-bf1.c5
-rw-r--r--cipher-ctr.c4
-rw-r--r--cipher.c8
-rw-r--r--clientloop.c3
-rw-r--r--compat.c4
-rw-r--r--deattack.c4
-rw-r--r--dh.c4
-rw-r--r--dns.c3
-rw-r--r--gss-genr.c4
-rw-r--r--gss-serv.c4
-rw-r--r--hostfile.c3
-rw-r--r--includes.h3
-rw-r--r--kex.c4
-rw-r--r--kexdhc.c4
-rw-r--r--kexdhs.c4
-rw-r--r--kexgexc.c4
-rw-r--r--kexgexs.c4
-rw-r--r--key.c4
-rw-r--r--log.c3
-rw-r--r--mac.c4
-rw-r--r--match.c3
-rw-r--r--md-sha256.c2
-rw-r--r--misc.c3
-rw-r--r--moduli.c3
-rw-r--r--monitor.c3
-rw-r--r--monitor_fdpass.c3
-rw-r--r--monitor_mm.c3
-rw-r--r--monitor_wrap.c3
-rw-r--r--msg.c3
-rw-r--r--nchan.c3
-rw-r--r--packet.c3
-rw-r--r--progressmeter.c3
-rw-r--r--readconf.c3
-rw-r--r--readpass.c3
-rw-r--r--rsa.c4
-rw-r--r--scp.c3
-rw-r--r--servconf.c3
-rw-r--r--serverloop.c3
-rw-r--r--session.c3
-rw-r--r--sftp-client.c3
-rw-r--r--sftp-common.c3
-rw-r--r--sftp-glob.c5
-rw-r--r--sftp-server.c5
-rw-r--r--sftp.c3
-rw-r--r--ssh-add.c3
-rw-r--r--ssh-agent.c9
-rw-r--r--ssh-dss.c4
-rw-r--r--ssh-keygen.c3
-rw-r--r--ssh-keyscan.c8
-rw-r--r--ssh-keysign.c3
-rw-r--r--ssh-rsa.c4
-rw-r--r--ssh.c3
-rw-r--r--sshconnect.c3
-rw-r--r--sshconnect1.c4
-rw-r--r--sshconnect2.c3
-rw-r--r--sshd.c3
-rw-r--r--sshlogin.c3
-rw-r--r--sshpty.c3
-rw-r--r--ttymodes.c3
-rw-r--r--uidswap.c3
-rw-r--r--xmalloc.c3
81 files changed, 213 insertions, 91 deletions
diff --git a/ChangeLog b/ChangeLog
index 636d309b9..000c57828 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,21 @@
80 [includes.h moduli.c progressmeter.c scp.c sftp-common.c] 80 [includes.h moduli.c progressmeter.c scp.c sftp-common.c]
81 [sftp-server.c ssh-agent.c sshlogin.c] 81 [sftp-server.c ssh-agent.c sshlogin.c]
82 move #include <time.h> out of includes.h 82 move #include <time.h> out of includes.h
83 - stevesk@cvs.openbsd.org 2006/07/22 20:48:23
84 [atomicio.c auth-options.c auth-passwd.c auth-rhosts.c auth-rsa.c]
85 [auth.c auth1.c auth2-chall.c auth2-hostbased.c auth2-passwd.c auth2.c]
86 [authfd.c authfile.c bufaux.c bufbn.c buffer.c canohost.c channels.c]
87 [cipher-3des1.c cipher-bf1.c cipher-ctr.c cipher.c clientloop.c]
88 [compat.c deattack.c dh.c dns.c gss-genr.c gss-serv.c hostfile.c]
89 [includes.h kex.c kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c log.c]
90 [mac.c match.c md-sha256.c misc.c moduli.c monitor.c monitor_fdpass.c]
91 [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c rsa.c]
92 [progressmeter.c readconf.c readpass.c scp.c servconf.c serverloop.c]
93 [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c sftp.c]
94 [ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]
95 [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c]
96 [sshd.c sshlogin.c sshpty.c ttymodes.c uidswap.c xmalloc.c]
97 move #include <string.h> out of includes.h
83 98
8420060713 9920060713
85 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h 100 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4998,4 +5013,4 @@
4998 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5013 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4999 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5014 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5000 5015
5001$Id: ChangeLog,v 1.4427 2006/07/24 04:09:40 djm Exp $ 5016$Id: ChangeLog,v 1.4428 2006/07/24 04:13:33 djm Exp $
diff --git a/atomicio.c b/atomicio.c
index bf1c0fd18..009ce1d11 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: atomicio.c,v 1.20 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: atomicio.c,v 1.21 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2006 Damien Miller. All rights reserved. 3 * Copyright (c) 2006 Damien Miller. All rights reserved.
4 * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. 4 * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -29,6 +29,7 @@
29#include "includes.h" 29#include "includes.h"
30 30
31#include <errno.h> 31#include <errno.h>
32#include <string.h>
32 33
33#include "atomicio.h" 34#include "atomicio.h"
34 35
diff --git a/auth-options.c b/auth-options.c
index 7e6bfeb40..33c62641b 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.38 2006/07/17 12:02:24 dtucker Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.39 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -18,6 +18,7 @@
18# include <netdb.h> 18# include <netdb.h>
19#endif 19#endif
20#include <pwd.h> 20#include <pwd.h>
21#include <string.h>
21 22
22#include "xmalloc.h" 23#include "xmalloc.h"
23#include "match.h" 24#include "match.h"
diff --git a/auth-passwd.c b/auth-passwd.c
index 3cf86dcbd..e5edc9336 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-passwd.c,v 1.37 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: auth-passwd.c,v 1.38 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -41,6 +41,7 @@
41#include <sys/types.h> 41#include <sys/types.h>
42 42
43#include <pwd.h> 43#include <pwd.h>
44#include <string.h>
44 45
45#include "packet.h" 46#include "packet.h"
46#include "buffer.h" 47#include "buffer.h"
diff --git a/auth-rhosts.c b/auth-rhosts.c
index d50ea3a01..c14604dc4 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-rhosts.c,v 1.38 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: auth-rhosts.c,v 1.39 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -23,6 +23,7 @@
23# include <netgroup.h> 23# include <netgroup.h>
24#endif 24#endif
25#include <pwd.h> 25#include <pwd.h>
26#include <string.h>
26 27
27#include "packet.h" 28#include "packet.h"
28#include "uidswap.h" 29#include "uidswap.h"
diff --git a/auth-rsa.c b/auth-rsa.c
index 867597642..65c77805f 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-rsa.c,v 1.68 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: auth-rsa.c,v 1.69 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -23,6 +23,7 @@
23#include <openssl/md5.h> 23#include <openssl/md5.h>
24 24
25#include <pwd.h> 25#include <pwd.h>
26#include <string.h>
26 27
27#include "rsa.h" 28#include "rsa.h"
28#include "packet.h" 29#include "packet.h"
diff --git a/auth.c b/auth.c
index 3bca8dc21..0f1d530e7 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.71 2006/07/12 11:34:58 dtucker Exp $ */ 1/* $OpenBSD: auth.c,v 1.72 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -43,6 +43,7 @@
43#include <libgen.h> 43#include <libgen.h>
44#endif 44#endif
45#include <stdarg.h> 45#include <stdarg.h>
46#include <string.h>
46 47
47#include "xmalloc.h" 48#include "xmalloc.h"
48#include "match.h" 49#include "match.h"
diff --git a/auth1.c b/auth1.c
index 089291882..034010fda 100644
--- a/auth1.c
+++ b/auth1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth1.c,v 1.67 2006/07/20 15:26:14 stevesk Exp $ */ 1/* $OpenBSD: auth1.c,v 1.68 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -14,6 +14,7 @@
14 14
15#include <sys/types.h> 15#include <sys/types.h>
16 16
17#include <string.h>
17#include <unistd.h> 18#include <unistd.h>
18 19
19#include "xmalloc.h" 20#include "xmalloc.h"
diff --git a/auth2-chall.c b/auth2-chall.c
index 09412aa4a..ad6b7233f 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-chall.c,v 1.27 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth2-chall.c,v 1.28 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2001 Per Allansson. All rights reserved. 4 * Copyright (c) 2001 Per Allansson. All rights reserved.
@@ -25,6 +25,8 @@
25 */ 25 */
26#include "includes.h" 26#include "includes.h"
27 27
28#include <string.h>
29
28#include "ssh2.h" 30#include "ssh2.h"
29#include "auth.h" 31#include "auth.h"
30#include "buffer.h" 32#include "buffer.h"
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index 56bf0be13..5cb617e1c 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-hostbased.c,v 1.9 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: auth2-hostbased.c,v 1.10 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -28,6 +28,7 @@
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <pwd.h> 30#include <pwd.h>
31#include <string.h>
31 32
32#include "ssh2.h" 33#include "ssh2.h"
33#include "xmalloc.h" 34#include "xmalloc.h"
diff --git a/auth2-passwd.c b/auth2-passwd.c
index a1e77c41c..a1b65da50 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-passwd.c,v 1.7 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth2-passwd.c,v 1.8 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,8 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <string.h>
29
28#include "xmalloc.h" 30#include "xmalloc.h"
29#include "packet.h" 31#include "packet.h"
30#include "log.h" 32#include "log.h"
diff --git a/auth2.c b/auth2.c
index ad57c64e6..83d5224c9 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.111 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: auth2.c,v 1.112 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -28,6 +28,7 @@
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <pwd.h> 30#include <pwd.h>
31#include <string.h>
31 32
32#include "ssh2.h" 33#include "ssh2.h"
33#include "xmalloc.h" 34#include "xmalloc.h"
diff --git a/authfd.c b/authfd.c
index f8b7ed71f..52766bcd2 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.c,v 1.77 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: authfd.c,v 1.78 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -44,6 +44,7 @@
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45 45
46#include <fcntl.h> 46#include <fcntl.h>
47#include <string.h>
47#include <unistd.h> 48#include <unistd.h>
48 49
49#include "ssh.h" 50#include "ssh.h"
diff --git a/authfile.c b/authfile.c
index 53397ea53..8421665b8 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.c,v 1.70 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: authfile.c,v 1.71 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -47,6 +47,7 @@
47 47
48#include <errno.h> 48#include <errno.h>
49#include <fcntl.h> 49#include <fcntl.h>
50#include <string.h>
50#include <unistd.h> 51#include <unistd.h>
51 52
52#include "cipher.h" 53#include "cipher.h"
diff --git a/bufaux.c b/bufaux.c
index 4c9cb662c..a384cc685 100644
--- a/bufaux.c
+++ b/bufaux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bufaux.c,v 1.42 2006/04/18 10:44:28 dtucker Exp $ */ 1/* $OpenBSD: bufaux.c,v 1.43 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -40,6 +40,9 @@
40#include "includes.h" 40#include "includes.h"
41 41
42#include <openssl/bn.h> 42#include <openssl/bn.h>
43
44#include <string.h>
45
43#include "bufaux.h" 46#include "bufaux.h"
44#include "xmalloc.h" 47#include "xmalloc.h"
45#include "log.h" 48#include "log.h"
diff --git a/bufbn.c b/bufbn.c
index 56f4f6d5b..aa42ea62b 100644
--- a/bufbn.c
+++ b/bufbn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bufbn.c,v 1.1 2006/04/18 10:44:28 dtucker Exp $*/ 1/* $OpenBSD: bufbn.c,v 1.2 2006/07/22 20:48:22 stevesk Exp $*/
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -40,6 +40,9 @@
40#include "includes.h" 40#include "includes.h"
41 41
42#include <openssl/bn.h> 42#include <openssl/bn.h>
43
44#include <string.h>
45
43#include "bufaux.h" 46#include "bufaux.h"
44#include "xmalloc.h" 47#include "xmalloc.h"
45#include "log.h" 48#include "log.h"
diff --git a/buffer.c b/buffer.c
index ba718daf2..8c9f534f8 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: buffer.c,v 1.27 2006/04/16 00:48:52 djm Exp $ */ 1/* $OpenBSD: buffer.c,v 1.28 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,6 +14,8 @@
14 14
15#include "includes.h" 15#include "includes.h"
16 16
17#include <string.h>
18
17#include "xmalloc.h" 19#include "xmalloc.h"
18#include "buffer.h" 20#include "buffer.h"
19#include "log.h" 21#include "log.h"
diff --git a/canohost.c b/canohost.c
index da5131de3..97b5a78f9 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: canohost.c,v 1.57 2006/07/12 22:28:51 stevesk Exp $ */ 1/* $OpenBSD: canohost.c,v 1.58 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -24,6 +24,7 @@
24#if defined(HAVE_NETDB_H) 24#if defined(HAVE_NETDB_H)
25# include <netdb.h> 25# include <netdb.h>
26#endif 26#endif
27#include <string.h>
27 28
28#include "packet.h" 29#include "packet.h"
29#include "xmalloc.h" 30#include "xmalloc.h"
diff --git a/channels.c b/channels.c
index e44a2ab4f..8cf4242fe 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.259 2006/07/21 21:13:30 stevesk Exp $ */ 1/* $OpenBSD: channels.c,v 1.260 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -53,6 +53,7 @@
53#if defined(HAVE_NETDB_H) 53#if defined(HAVE_NETDB_H)
54# include <netdb.h> 54# include <netdb.h>
55#endif 55#endif
56#include <string.h>
56#include <termios.h> 57#include <termios.h>
57#include <unistd.h> 58#include <unistd.h>
58 59
diff --git a/cipher-3des1.c b/cipher-3des1.c
index c2c0bf811..2e8735d54 100644
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher-3des1.c,v 1.4 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: cipher-3des1.c,v 1.5 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Markus Friedl. All rights reserved. 3 * Copyright (c) 2003 Markus Friedl. All rights reserved.
4 * 4 *
@@ -26,6 +26,9 @@
26#include "includes.h" 26#include "includes.h"
27 27
28#include <openssl/evp.h> 28#include <openssl/evp.h>
29
30#include <string.h>
31
29#include "xmalloc.h" 32#include "xmalloc.h"
30#include "log.h" 33#include "log.h"
31 34
diff --git a/cipher-bf1.c b/cipher-bf1.c
index b6aa0152a..95b4e5e93 100644
--- a/cipher-bf1.c
+++ b/cipher-bf1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher-bf1.c,v 1.3 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: cipher-bf1.c,v 1.4 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Markus Friedl. All rights reserved. 3 * Copyright (c) 2003 Markus Friedl. All rights reserved.
4 * 4 *
@@ -26,6 +26,9 @@
26#include "includes.h" 26#include "includes.h"
27 27
28#include <openssl/evp.h> 28#include <openssl/evp.h>
29
30#include <string.h>
31
29#include "xmalloc.h" 32#include "xmalloc.h"
30#include "log.h" 33#include "log.h"
31 34
diff --git a/cipher-ctr.c b/cipher-ctr.c
index be82fd3a9..105d0bd5b 100644
--- a/cipher-ctr.c
+++ b/cipher-ctr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher-ctr.c,v 1.8 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: cipher-ctr.c,v 1.9 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> 3 * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
4 * 4 *
@@ -16,6 +16,8 @@
16 */ 16 */
17#include "includes.h" 17#include "includes.h"
18 18
19#include <string.h>
20
19#include <openssl/evp.h> 21#include <openssl/evp.h>
20 22
21#include "log.h" 23#include "log.h"
diff --git a/cipher.c b/cipher.c
index c42963897..20fa59c6a 100644
--- a/cipher.c
+++ b/cipher.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher.c,v 1.79 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: cipher.c,v 1.80 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -37,12 +37,14 @@
37 37
38#include "includes.h" 38#include "includes.h"
39 39
40#include <openssl/md5.h>
41
42#include <string.h>
43
40#include "xmalloc.h" 44#include "xmalloc.h"
41#include "log.h" 45#include "log.h"
42#include "cipher.h" 46#include "cipher.h"
43 47
44#include <openssl/md5.h>
45
46/* compatibility with old or broken OpenSSL versions */ 48/* compatibility with old or broken OpenSSL versions */
47#include "openbsd-compat/openssl-compat.h" 49#include "openbsd-compat/openssl-compat.h"
48 50
diff --git a/clientloop.c b/clientloop.c
index 9398dc989..0c700dbd4 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.169 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.170 2006/07/22 20:48:22 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -74,6 +74,7 @@
74#include <paths.h> 74#include <paths.h>
75#endif 75#endif
76#include <signal.h> 76#include <signal.h>
77#include <string.h>
77#include <termios.h> 78#include <termios.h>
78#include <unistd.h> 79#include <unistd.h>
79 80
diff --git a/compat.c b/compat.c
index 1573ed64e..35e429a5f 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compat.c,v 1.73 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: compat.c,v 1.74 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,8 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <string.h>
29
28#include "buffer.h" 30#include "buffer.h"
29#include "packet.h" 31#include "packet.h"
30#include "xmalloc.h" 32#include "xmalloc.h"
diff --git a/deattack.c b/deattack.c
index fa397e6e8..57a747da5 100644
--- a/deattack.c
+++ b/deattack.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: deattack.c,v 1.27 2006/03/30 09:58:15 djm Exp $ */ 1/* $OpenBSD: deattack.c,v 1.28 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Cryptographic attack detector for ssh - source code 3 * Cryptographic attack detector for ssh - source code
4 * 4 *
@@ -20,6 +20,8 @@
20 20
21#include "includes.h" 21#include "includes.h"
22 22
23#include <string.h>
24
23#include "deattack.h" 25#include "deattack.h"
24#include "log.h" 26#include "log.h"
25#include "crc32.h" 27#include "crc32.h"
diff --git a/dh.c b/dh.c
index ff31ca991..b37195f41 100644
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh.c,v 1.37 2006/07/18 22:27:55 stevesk Exp $ */ 1/* $OpenBSD: dh.c,v 1.38 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
4 * 4 *
@@ -28,6 +28,8 @@
28#include <openssl/bn.h> 28#include <openssl/bn.h>
29#include <openssl/dh.h> 29#include <openssl/dh.h>
30 30
31#include <string.h>
32
31#include "dh.h" 33#include "dh.h"
32#include "pathnames.h" 34#include "pathnames.h"
33#include "log.h" 35#include "log.h"
diff --git a/dns.c b/dns.c
index 16954a6a1..5f123a2ee 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.c,v 1.20 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: dns.c,v 1.21 2006/07/22 20:48:23 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -33,6 +33,7 @@
33#if defined(HAVE_NETDB_H) 33#if defined(HAVE_NETDB_H)
34# include <netdb.h> 34# include <netdb.h>
35#endif 35#endif
36#include <string.h>
36 37
37#include "xmalloc.h" 38#include "xmalloc.h"
38#include "key.h" 39#include "key.h"
diff --git a/gss-genr.c b/gss-genr.c
index 3d630ab82..0497657c0 100644
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gss-genr.c,v 1.10 2006/04/03 07:10:38 djm Exp $ */ 1/* $OpenBSD: gss-genr.c,v 1.11 2006/07/22 20:48:23 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -28,6 +28,8 @@
28 28
29#ifdef GSSAPI 29#ifdef GSSAPI
30 30
31#include <string.h>
32
31#include "xmalloc.h" 33#include "xmalloc.h"
32#include "bufaux.h" 34#include "bufaux.h"
33#include "log.h" 35#include "log.h"
diff --git a/gss-serv.c b/gss-serv.c
index 4ce536d99..c033aad4f 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gss-serv.c,v 1.18 2006/07/02 18:36:47 stevesk Exp $ */ 1/* $OpenBSD: gss-serv.c,v 1.19 2006/07/22 20:48:23 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -28,6 +28,8 @@
28 28
29#ifdef GSSAPI 29#ifdef GSSAPI
30 30
31#include <string.h>
32
31#include "bufaux.h" 33#include "bufaux.h"
32#include "auth.h" 34#include "auth.h"
33#include "log.h" 35#include "log.h"
diff --git a/hostfile.c b/hostfile.c
index a6714b6e1..c067f5e11 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: hostfile.c,v 1.41 2006/07/05 02:42:09 stevesk Exp $ */ 1/* $OpenBSD: hostfile.c,v 1.42 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -43,6 +43,7 @@
43#include <netinet/in.h> 43#include <netinet/in.h>
44 44
45#include <resolv.h> 45#include <resolv.h>
46#include <string.h>
46 47
47#include <openssl/hmac.h> 48#include <openssl/hmac.h>
48#include <openssl/sha.h> 49#include <openssl/sha.h>
diff --git a/includes.h b/includes.h
index da526bc72..7a7bd8176 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.53 2006/07/22 19:08:54 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.54 2006/07/22 20:48:23 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -22,7 +22,6 @@
22 22
23#include <stdio.h> 23#include <stdio.h>
24#include <stdlib.h> 24#include <stdlib.h>
25#include <string.h>
26 25
27#ifdef HAVE_LIMITS_H 26#ifdef HAVE_LIMITS_H
28# include <limits.h> /* For PATH_MAX */ 27# include <limits.h> /* For PATH_MAX */
diff --git a/kex.c b/kex.c
index 6a5fd264b..007173388 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.71 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.72 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -27,6 +27,8 @@
27 27
28#include <openssl/crypto.h> 28#include <openssl/crypto.h>
29 29
30#include <string.h>
31
30#include "ssh2.h" 32#include "ssh2.h"
31#include "xmalloc.h" 33#include "xmalloc.h"
32#include "buffer.h" 34#include "buffer.h"
diff --git a/kexdhc.c b/kexdhc.c
index f5f01196f..dbbd9bbd0 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexdhc.c,v 1.6 2006/05/18 21:27:25 miod Exp $ */ 1/* $OpenBSD: kexdhc.c,v 1.7 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,8 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <string.h>
29
28#include "xmalloc.h" 30#include "xmalloc.h"
29#include "key.h" 31#include "key.h"
30#include "kex.h" 32#include "kex.h"
diff --git a/kexdhs.c b/kexdhs.c
index d139f5c7b..c64cd77cb 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexdhs.c,v 1.5 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: kexdhs.c,v 1.6 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,8 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <string.h>
29
28#include "xmalloc.h" 30#include "xmalloc.h"
29#include "key.h" 31#include "key.h"
30#include "kex.h" 32#include "kex.h"
diff --git a/kexgexc.c b/kexgexc.c
index 9da184488..fb2049ea7 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexgexc.c,v 1.6 2006/05/18 21:27:25 miod Exp $ */ 1/* $OpenBSD: kexgexc.c,v 1.7 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
4 * Copyright (c) 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -26,6 +26,8 @@
26 26
27#include "includes.h" 27#include "includes.h"
28 28
29#include <string.h>
30
29#include "xmalloc.h" 31#include "xmalloc.h"
30#include "key.h" 32#include "key.h"
31#include "kex.h" 33#include "kex.h"
diff --git a/kexgexs.c b/kexgexs.c
index 0141c6d0f..72b66230f 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexgexs.c,v 1.4 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: kexgexs.c,v 1.5 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
4 * Copyright (c) 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -26,6 +26,8 @@
26 26
27#include "includes.h" 27#include "includes.h"
28 28
29#include <string.h>
30
29#include "xmalloc.h" 31#include "xmalloc.h"
30#include "key.h" 32#include "key.h"
31#include "kex.h" 33#include "kex.h"
diff --git a/key.c b/key.c
index 8e6ccc2bf..e6868de6d 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.c,v 1.64 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: key.c,v 1.65 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * read_bignum(): 3 * read_bignum():
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -36,6 +36,8 @@
36 36
37#include <openssl/evp.h> 37#include <openssl/evp.h>
38 38
39#include <string.h>
40
39#include "xmalloc.h" 41#include "xmalloc.h"
40#include "key.h" 42#include "key.h"
41#include "rsa.h" 43#include "rsa.h"
diff --git a/log.c b/log.c
index 4ad7cfff7..8a308c2f8 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: log.c,v 1.34 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: log.c,v 1.35 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -37,6 +37,7 @@
37#include "includes.h" 37#include "includes.h"
38 38
39#include <stdarg.h> 39#include <stdarg.h>
40#include <string.h>
40#include <syslog.h> 41#include <syslog.h>
41#include <unistd.h> 42#include <unistd.h>
42#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) 43#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
diff --git a/mac.c b/mac.c
index 02bcc31ed..a59e7edf1 100644
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mac.c,v 1.10 2006/03/30 09:58:15 djm Exp $ */ 1/* $OpenBSD: mac.c,v 1.11 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -27,6 +27,8 @@
27 27
28#include <openssl/hmac.h> 28#include <openssl/hmac.h>
29 29
30#include <string.h>
31
30#include "xmalloc.h" 32#include "xmalloc.h"
31#include "log.h" 33#include "log.h"
32#include "cipher.h" 34#include "cipher.h"
diff --git a/match.c b/match.c
index c0e5bf424..8f12ef539 100644
--- a/match.c
+++ b/match.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: match.c,v 1.24 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: match.c,v 1.25 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,6 +38,7 @@
38#include "includes.h" 38#include "includes.h"
39 39
40#include <ctype.h> 40#include <ctype.h>
41#include <string.h>
41 42
42#include "match.h" 43#include "match.h"
43#include "xmalloc.h" 44#include "xmalloc.h"
diff --git a/md-sha256.c b/md-sha256.c
index 33deb780a..063a1014f 100644
--- a/md-sha256.c
+++ b/md-sha256.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: md-sha256.c,v 1.3 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: md-sha256.c,v 1.4 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2005 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2005 Damien Miller <djm@openbsd.org>
4 * 4 *
diff --git a/misc.c b/misc.c
index e9c5ddf8b..4c202db2a 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.59 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: misc.c,v 1.60 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -31,6 +31,7 @@
31#include <sys/socket.h> 31#include <sys/socket.h>
32 32
33#include <stdarg.h> 33#include <stdarg.h>
34#include <string.h>
34#include <unistd.h> 35#include <unistd.h>
35 36
36#include <netinet/in.h> 37#include <netinet/in.h>
diff --git a/moduli.c b/moduli.c
index 9d4aedd5b..4d5576a1f 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: moduli.c,v 1.14 2006/07/22 19:08:54 stevesk Exp $ */ 1/* $OpenBSD: moduli.c,v 1.15 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright 1994 Phil Karn <karn@qualcomm.com> 3 * Copyright 1994 Phil Karn <karn@qualcomm.com>
4 * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> 4 * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -43,6 +43,7 @@
43 43
44#include <openssl/bn.h> 44#include <openssl/bn.h>
45 45
46#include <string.h>
46#include <time.h> 47#include <time.h>
47 48
48#include "xmalloc.h" 49#include "xmalloc.h"
diff --git a/monitor.c b/monitor.c
index a5263d746..3799d8862 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.81 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: monitor.c,v 1.82 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -38,6 +38,7 @@
38#endif 38#endif
39#include <pwd.h> 39#include <pwd.h>
40#include <signal.h> 40#include <signal.h>
41#include <string.h>
41 42
42#ifdef SKEY 43#ifdef SKEY
43#include <skey.h> 44#include <skey.h>
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 9d319ac1a..d3e65cbaa 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_fdpass.c,v 1.10 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: monitor_fdpass.c,v 1.11 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright 2001 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2001 Niels Provos <provos@citi.umich.edu>
4 * All rights reserved. 4 * All rights reserved.
@@ -31,6 +31,7 @@
31#include <sys/uio.h> 31#include <sys/uio.h>
32 32
33#include <errno.h> 33#include <errno.h>
34#include <string.h>
34 35
35#include "log.h" 36#include "log.h"
36#include "monitor_fdpass.h" 37#include "monitor_fdpass.h"
diff --git a/monitor_mm.c b/monitor_mm.c
index dc0dbda76..b6da6927f 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_mm.c,v 1.12 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: monitor_mm.c,v 1.13 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * All rights reserved. 4 * All rights reserved.
@@ -27,6 +27,7 @@
27#include "includes.h" 27#include "includes.h"
28 28
29#include <errno.h> 29#include <errno.h>
30#include <string.h>
30 31
31#ifdef HAVE_SYS_MMAN_H 32#ifdef HAVE_SYS_MMAN_H
32#include <sys/mman.h> 33#include <sys/mman.h>
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 9ec60b6af..3728e5f55 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.47 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.48 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -34,6 +34,7 @@
34 34
35#include <errno.h> 35#include <errno.h>
36#include <pwd.h> 36#include <pwd.h>
37#include <string.h>
37 38
38#include "ssh.h" 39#include "ssh.h"
39#include "dh.h" 40#include "dh.h"
diff --git a/msg.c b/msg.c
index 5c535d1af..322472668 100644
--- a/msg.c
+++ b/msg.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: msg.c,v 1.13 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: msg.c,v 1.14 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -27,6 +27,7 @@
27#include <sys/types.h> 27#include <sys/types.h>
28 28
29#include <errno.h> 29#include <errno.h>
30#include <string.h>
30#include <unistd.h> 31#include <unistd.h>
31 32
32#include "buffer.h" 33#include "buffer.h"
diff --git a/nchan.c b/nchan.c
index 43816a65b..78908c3c6 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: nchan.c,v 1.55 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: nchan.c,v 1.56 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -29,6 +29,7 @@
29#include <sys/socket.h> 29#include <sys/socket.h>
30 30
31#include <errno.h> 31#include <errno.h>
32#include <string.h>
32 33
33#include "ssh1.h" 34#include "ssh1.h"
34#include "ssh2.h" 35#include "ssh2.h"
diff --git a/packet.c b/packet.c
index ce652cfd8..8250b3bc8 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.136 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: packet.c,v 1.137 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -49,6 +49,7 @@
49 49
50#include <errno.h> 50#include <errno.h>
51#include <stdarg.h> 51#include <stdarg.h>
52#include <string.h>
52#include <unistd.h> 53#include <unistd.h>
53 54
54#include "xmalloc.h" 55#include "xmalloc.h"
diff --git a/progressmeter.c b/progressmeter.c
index c70e9939a..19dc917c9 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: progressmeter.c,v 1.33 2006/07/22 19:08:54 stevesk Exp $ */ 1/* $OpenBSD: progressmeter.c,v 1.34 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Nils Nordman. All rights reserved. 3 * Copyright (c) 2003 Nils Nordman. All rights reserved.
4 * 4 *
@@ -30,6 +30,7 @@
30 30
31#include <errno.h> 31#include <errno.h>
32#include <signal.h> 32#include <signal.h>
33#include <string.h>
33#include <time.h> 34#include <time.h>
34#include <unistd.h> 35#include <unistd.h>
35 36
diff --git a/readconf.c b/readconf.c
index 73271e84e..432b80ed0 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.156 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: readconf.c,v 1.157 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -25,6 +25,7 @@
25#if defined(HAVE_NETDB_H) 25#if defined(HAVE_NETDB_H)
26# include <netdb.h> 26# include <netdb.h>
27#endif 27#endif
28#include <string.h>
28#include <unistd.h> 29#include <unistd.h>
29 30
30#include "ssh.h" 31#include "ssh.h"
diff --git a/readpass.c b/readpass.c
index 725ae5789..1982fb6c5 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readpass.c,v 1.43 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: readpass.c,v 1.44 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -34,6 +34,7 @@
34# include <paths.h> 34# include <paths.h>
35#endif 35#endif
36#include <stdarg.h> 36#include <stdarg.h>
37#include <string.h>
37#include <unistd.h> 38#include <unistd.h>
38 39
39#include "xmalloc.h" 40#include "xmalloc.h"
diff --git a/rsa.c b/rsa.c
index 6ca05b3d2..c656291ed 100644
--- a/rsa.c
+++ b/rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa.c,v 1.26 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: rsa.c,v 1.27 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -62,6 +62,8 @@
62 62
63#include "includes.h" 63#include "includes.h"
64 64
65#include <string.h>
66
65#include "rsa.h" 67#include "rsa.h"
66#include "log.h" 68#include "log.h"
67#include "xmalloc.h" 69#include "xmalloc.h"
diff --git a/scp.c b/scp.c
index 72c4ee430..5ff6cac9a 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: scp.c,v 1.149 2006/07/22 19:08:54 stevesk Exp $ */ 1/* $OpenBSD: scp.c,v 1.150 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * scp - secure remote copy. This is basically patched BSD rcp which 3 * scp - secure remote copy. This is basically patched BSD rcp which
4 * uses ssh to do the data transfer (instead of using rcmd). 4 * uses ssh to do the data transfer (instead of using rcmd).
@@ -86,6 +86,7 @@
86#include <pwd.h> 86#include <pwd.h>
87#include <signal.h> 87#include <signal.h>
88#include <stdarg.h> 88#include <stdarg.h>
89#include <string.h>
89#include <time.h> 90#include <time.h>
90#include <unistd.h> 91#include <unistd.h>
91 92
diff --git a/servconf.c b/servconf.c
index 46558b690..ce44b5f60 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.159 2006/07/21 12:43:36 dtucker Exp $ */ 1/* $OpenBSD: servconf.c,v 1.160 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -18,6 +18,7 @@
18#if defined(HAVE_NETDB_H) 18#if defined(HAVE_NETDB_H)
19# include <netdb.h> 19# include <netdb.h>
20#endif 20#endif
21#include <string.h>
21#include <unistd.h> 22#include <unistd.h>
22 23
23#include "ssh.h" 24#include "ssh.h"
diff --git a/serverloop.c b/serverloop.c
index 1ca3e673f..ba1e0dad7 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: serverloop.c,v 1.140 2006/07/20 15:26:15 stevesk Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.141 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -47,6 +47,7 @@
47#include <fcntl.h> 47#include <fcntl.h>
48#include <pwd.h> 48#include <pwd.h>
49#include <signal.h> 49#include <signal.h>
50#include <string.h>
50#include <termios.h> 51#include <termios.h>
51#include <unistd.h> 52#include <unistd.h>
52 53
diff --git a/session.c b/session.c
index be65086ae..c2730a425 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.211 2006/07/20 15:26:15 stevesk Exp $ */ 1/* $OpenBSD: session.c,v 1.212 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -52,6 +52,7 @@
52#endif 52#endif
53#include <pwd.h> 53#include <pwd.h>
54#include <signal.h> 54#include <signal.h>
55#include <string.h>
55#include <unistd.h> 56#include <unistd.h>
56 57
57#include "ssh.h" 58#include "ssh.h"
diff --git a/sftp-client.c b/sftp-client.c
index 5ba4f0a9f..84dae58d2 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.68 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.69 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -30,6 +30,7 @@
30#include <errno.h> 30#include <errno.h>
31#include <fcntl.h> 31#include <fcntl.h>
32#include <signal.h> 32#include <signal.h>
33#include <string.h>
33#include <unistd.h> 34#include <unistd.h>
34 35
35#include "openbsd-compat/sys-queue.h" 36#include "openbsd-compat/sys-queue.h"
diff --git a/sftp-common.c b/sftp-common.c
index 6fd0d76b6..2f3a90971 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-common.c,v 1.16 2006/07/22 19:08:54 stevesk Exp $ */ 1/* $OpenBSD: sftp-common.c,v 1.17 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2001 Damien Miller. All rights reserved. 4 * Copyright (c) 2001 Damien Miller. All rights reserved.
@@ -31,6 +31,7 @@
31 31
32#include <grp.h> 32#include <grp.h>
33#include <pwd.h> 33#include <pwd.h>
34#include <string.h>
34#include <time.h> 35#include <time.h>
35 36
36#include "buffer.h" 37#include "buffer.h"
diff --git a/sftp-glob.c b/sftp-glob.c
index 0342de47d..f8549ea76 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-glob.c,v 1.20 2006/07/10 16:01:57 stevesk Exp $ */ 1/* $OpenBSD: sftp-glob.c,v 1.21 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -21,8 +21,9 @@
21#ifdef HAVE_SYS_STAT_H 21#ifdef HAVE_SYS_STAT_H
22# include <sys/stat.h> 22# include <sys/stat.h>
23#endif 23#endif
24 24
25#include <dirent.h> 25#include <dirent.h>
26#include <string.h>
26 27
27#include "xmalloc.h" 28#include "xmalloc.h"
28 29
diff --git a/sftp-server.c b/sftp-server.c
index 3c254e332..6067f0203 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.64 2006/07/22 19:08:54 stevesk Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.65 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
4 * 4 *
@@ -23,8 +23,9 @@
23#include <errno.h> 23#include <errno.h>
24#include <fcntl.h> 24#include <fcntl.h>
25#include <pwd.h> 25#include <pwd.h>
26#include <unistd.h> 26#include <string.h>
27#include <time.h> 27#include <time.h>
28#include <unistd.h>
28 29
29#include "buffer.h" 30#include "buffer.h"
30#include "bufaux.h" 31#include "bufaux.h"
diff --git a/sftp.c b/sftp.c
index 1a88f33f9..2da6c722f 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.86 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: sftp.c,v 1.87 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -36,6 +36,7 @@
36typedef void EditLine; 36typedef void EditLine;
37#endif 37#endif
38#include <signal.h> 38#include <signal.h>
39#include <string.h>
39#include <unistd.h> 40#include <unistd.h>
40 41
41#include "xmalloc.h" 42#include "xmalloc.h"
diff --git a/ssh-add.c b/ssh-add.c
index 974a1629b..f79ffb915 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.84 2006/07/17 01:31:09 stevesk Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.85 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -44,6 +44,7 @@
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46#include <pwd.h> 46#include <pwd.h>
47#include <string.h>
47#include <unistd.h> 48#include <unistd.h>
48 49
49#include "ssh.h" 50#include "ssh.h"
diff --git a/ssh-agent.c b/ssh-agent.c
index a0713b238..5bf4dbc18 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.145 2006/07/22 19:08:54 stevesk Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.146 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -45,6 +45,9 @@
45#include "openbsd-compat/sys-queue.h" 45#include "openbsd-compat/sys-queue.h"
46#include <sys/resource.h> 46#include <sys/resource.h>
47 47
48#include <openssl/evp.h>
49#include <openssl/md5.h>
50
48#include <errno.h> 51#include <errno.h>
49#include <fcntl.h> 52#include <fcntl.h>
50#ifdef HAVE_PATHS_H 53#ifdef HAVE_PATHS_H
@@ -52,11 +55,9 @@
52#endif 55#endif
53#include <signal.h> 56#include <signal.h>
54#include <time.h> 57#include <time.h>
58#include <string.h>
55#include <unistd.h> 59#include <unistd.h>
56 60
57#include <openssl/evp.h>
58#include <openssl/md5.h>
59
60#include "ssh.h" 61#include "ssh.h"
61#include "rsa.h" 62#include "rsa.h"
62#include "buffer.h" 63#include "buffer.h"
diff --git a/ssh-dss.c b/ssh-dss.c
index d16f75e63..a8d45a2b4 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-dss.c,v 1.21 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: ssh-dss.c,v 1.22 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -28,6 +28,8 @@
28#include <openssl/bn.h> 28#include <openssl/bn.h>
29#include <openssl/evp.h> 29#include <openssl/evp.h>
30 30
31#include <string.h>
32
31#include "xmalloc.h" 33#include "xmalloc.h"
32#include "buffer.h" 34#include "buffer.h"
33#include "bufaux.h" 35#include "bufaux.h"
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 56ad725d8..f2d37129b 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.149 2006/07/17 01:31:10 stevesk Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.150 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -30,6 +30,7 @@
30# include <paths.h> 30# include <paths.h>
31#endif 31#endif
32#include <pwd.h> 32#include <pwd.h>
33#include <string.h>
33#include <unistd.h> 34#include <unistd.h>
34 35
35#include "xmalloc.h" 36#include "xmalloc.h"
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index fd71f7224..30df75166 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.68 2006/07/17 01:31:10 stevesk Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.69 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
@@ -11,16 +11,18 @@
11 11
12#include "openbsd-compat/sys-queue.h" 12#include "openbsd-compat/sys-queue.h"
13#include <sys/resource.h> 13#include <sys/resource.h>
14
15#include <openssl/bn.h>
16
14#if defined(HAVE_NETDB_H) 17#if defined(HAVE_NETDB_H)
15# include <netdb.h> 18# include <netdb.h>
16#endif 19#endif
17#include <errno.h> 20#include <errno.h>
18#include <stdarg.h> 21#include <stdarg.h>
19#include <setjmp.h> 22#include <setjmp.h>
23#include <string.h>
20#include <unistd.h> 24#include <unistd.h>
21 25
22#include <openssl/bn.h>
23
24#include "xmalloc.h" 26#include "xmalloc.h"
25#include "ssh.h" 27#include "ssh.h"
26#include "ssh1.h" 28#include "ssh1.h"
diff --git a/ssh-keysign.c b/ssh-keysign.c
index b558e54f7..435b839fa 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.26 2006/07/17 01:31:10 stevesk Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.27 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -29,6 +29,7 @@
29#include <paths.h> 29#include <paths.h>
30#endif 30#endif
31#include <pwd.h> 31#include <pwd.h>
32#include <string.h>
32#include <unistd.h> 33#include <unistd.h>
33 34
34#include <openssl/evp.h> 35#include <openssl/evp.h>
diff --git a/ssh-rsa.c b/ssh-rsa.c
index 4580c0644..236f77aac 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-rsa.c,v 1.37 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: ssh-rsa.c,v 1.38 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> 3 * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
4 * 4 *
@@ -19,6 +19,8 @@
19#include <openssl/evp.h> 19#include <openssl/evp.h>
20#include <openssl/err.h> 20#include <openssl/err.h>
21 21
22#include <string.h>
23
22#include "xmalloc.h" 24#include "xmalloc.h"
23#include "log.h" 25#include "log.h"
24#include "buffer.h" 26#include "buffer.h"
diff --git a/ssh.c b/ssh.c
index e482eb1b5..d0d9457c2 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.288 2006/07/17 01:31:10 stevesk Exp $ */ 1/* $OpenBSD: ssh.c,v 1.289 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -63,6 +63,7 @@
63#include <pwd.h> 63#include <pwd.h>
64#include <signal.h> 64#include <signal.h>
65#include <stddef.h> 65#include <stddef.h>
66#include <string.h>
66#include <unistd.h> 67#include <unistd.h>
67 68
68#include <openssl/evp.h> 69#include <openssl/evp.h>
diff --git a/sshconnect.c b/sshconnect.c
index 1c69044ea..f33cf52b1 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.192 2006/07/17 01:31:10 stevesk Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.193 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -31,6 +31,7 @@
31#include <paths.h> 31#include <paths.h>
32#endif 32#endif
33#include <pwd.h> 33#include <pwd.h>
34#include <string.h>
34#include <unistd.h> 35#include <unistd.h>
35 36
36#include "ssh.h" 37#include "ssh.h"
diff --git a/sshconnect1.c b/sshconnect1.c
index 5467f04bf..ab5216214 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect1.c,v 1.65 2006/04/25 08:02:27 dtucker Exp $ */ 1/* $OpenBSD: sshconnect1.c,v 1.66 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -18,6 +18,8 @@
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19#include <openssl/md5.h> 19#include <openssl/md5.h>
20 20
21#include <string.h>
22
21#include "ssh.h" 23#include "ssh.h"
22#include "ssh1.h" 24#include "ssh1.h"
23#include "xmalloc.h" 25#include "xmalloc.h"
diff --git a/sshconnect2.c b/sshconnect2.c
index f55002bdf..41be0b91c 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.157 2006/07/20 15:26:15 stevesk Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.158 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -30,6 +30,7 @@
30#include <sys/stat.h> 30#include <sys/stat.h>
31 31
32#include <errno.h> 32#include <errno.h>
33#include <string.h>
33#include <unistd.h> 34#include <unistd.h>
34 35
35#include "openbsd-compat/sys-queue.h" 36#include "openbsd-compat/sys-queue.h"
diff --git a/sshd.c b/sshd.c
index 3da176da1..6428f42a0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.338 2006/07/12 22:28:52 stevesk Exp $ */ 1/* $OpenBSD: sshd.c,v 1.339 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -63,6 +63,7 @@
63#include <grp.h> 63#include <grp.h>
64#include <pwd.h> 64#include <pwd.h>
65#include <signal.h> 65#include <signal.h>
66#include <string.h>
66 67
67#include <openssl/dh.h> 68#include <openssl/dh.h>
68#include <openssl/bn.h> 69#include <openssl/bn.h>
diff --git a/sshlogin.c b/sshlogin.c
index ea313e800..8d811facd 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshlogin.c,v 1.21 2006/07/22 19:08:54 stevesk Exp $ */ 1/* $OpenBSD: sshlogin.c,v 1.22 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -45,6 +45,7 @@
45 45
46#include <errno.h> 46#include <errno.h>
47#include <fcntl.h> 47#include <fcntl.h>
48#include <string.h>
48#include <time.h> 49#include <time.h>
49#include <unistd.h> 50#include <unistd.h>
50 51
diff --git a/sshpty.c b/sshpty.c
index 931c91f47..719a79303 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshpty.c,v 1.24 2006/07/17 01:31:10 stevesk Exp $ */ 1/* $OpenBSD: sshpty.c,v 1.25 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -26,6 +26,7 @@
26# include <paths.h> 26# include <paths.h>
27#endif 27#endif
28#include <pwd.h> 28#include <pwd.h>
29#include <string.h>
29#include <termios.h> 30#include <termios.h>
30#ifdef HAVE_UTIL_H 31#ifdef HAVE_UTIL_H
31# include <util.h> 32# include <util.h>
diff --git a/ttymodes.c b/ttymodes.c
index b46305430..680909b22 100644
--- a/ttymodes.c
+++ b/ttymodes.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ttymodes.c,v 1.24 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: ttymodes.c,v 1.25 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -46,6 +46,7 @@
46#include "includes.h" 46#include "includes.h"
47 47
48#include <errno.h> 48#include <errno.h>
49#include <string.h>
49#include <termios.h> 50#include <termios.h>
50 51
51#include "packet.h" 52#include "packet.h"
diff --git a/uidswap.c b/uidswap.c
index 2fe5feaed..255f9142c 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: uidswap.c,v 1.32 2006/07/17 01:31:10 stevesk Exp $ */ 1/* $OpenBSD: uidswap.c,v 1.33 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -18,6 +18,7 @@
18 18
19#include <errno.h> 19#include <errno.h>
20#include <pwd.h> 20#include <pwd.h>
21#include <string.h>
21#include <unistd.h> 22#include <unistd.h>
22 23
23#include <grp.h> 24#include <grp.h>
diff --git a/xmalloc.c b/xmalloc.c
index 8f9c3e12e..e7a14866b 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: xmalloc.c,v 1.22 2006/07/10 16:37:36 stevesk Exp $ */ 1/* $OpenBSD: xmalloc.c,v 1.23 2006/07/22 20:48:23 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -16,6 +16,7 @@
16#include "includes.h" 16#include "includes.h"
17 17
18#include <stdarg.h> 18#include <stdarg.h>
19#include <string.h>
19 20
20#include "xmalloc.h" 21#include "xmalloc.h"
21#include "log.h" 22#include "log.h"