diff options
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | auth-passwd.c | 3 | ||||
-rw-r--r-- | auth-rhosts.c | 3 | ||||
-rw-r--r-- | auth-rsa.c | 3 | ||||
-rw-r--r-- | auth.c | 3 | ||||
-rw-r--r-- | auth.h | 3 | ||||
-rw-r--r-- | auth1.c | 3 | ||||
-rw-r--r-- | auth2-chall.c | 3 | ||||
-rw-r--r-- | auth2-pubkey.c | 3 | ||||
-rw-r--r-- | authfile.c | 3 | ||||
-rw-r--r-- | buffer.c | 3 | ||||
-rw-r--r-- | canohost.c | 3 | ||||
-rw-r--r-- | channels.c | 3 | ||||
-rw-r--r-- | clientloop.c | 3 | ||||
-rw-r--r-- | dh.c | 3 | ||||
-rw-r--r-- | dns.c | 3 | ||||
-rw-r--r-- | dns.h | 4 | ||||
-rw-r--r-- | hostfile.c | 3 | ||||
-rw-r--r-- | includes.h | 1 | ||||
-rw-r--r-- | kex.c | 3 | ||||
-rw-r--r-- | kexdhc.c | 3 | ||||
-rw-r--r-- | kexgexc.c | 3 | ||||
-rw-r--r-- | kexgexs.c | 3 | ||||
-rw-r--r-- | key.c | 3 | ||||
-rw-r--r-- | key.h | 4 | ||||
-rw-r--r-- | log.c | 3 | ||||
-rw-r--r-- | misc.c | 3 | ||||
-rw-r--r-- | misc.h | 3 | ||||
-rw-r--r-- | moduli.c | 3 | ||||
-rw-r--r-- | monitor_wrap.c | 3 | ||||
-rw-r--r-- | packet.c | 3 | ||||
-rw-r--r-- | progressmeter.c | 3 | ||||
-rw-r--r-- | readconf.c | 3 | ||||
-rw-r--r-- | readpass.c | 3 | ||||
-rw-r--r-- | scp.c | 3 | ||||
-rw-r--r-- | servconf.c | 3 | ||||
-rw-r--r-- | session.c | 3 | ||||
-rw-r--r-- | sftp-client.c | 3 | ||||
-rw-r--r-- | sftp-common.c | 3 | ||||
-rw-r--r-- | sftp-server.c | 3 | ||||
-rw-r--r-- | sftp.c | 3 | ||||
-rw-r--r-- | ssh-add.c | 3 | ||||
-rw-r--r-- | ssh-agent.c | 3 | ||||
-rw-r--r-- | ssh-keygen.c | 3 | ||||
-rw-r--r-- | ssh-keyscan.c | 3 | ||||
-rw-r--r-- | ssh.c | 3 | ||||
-rw-r--r-- | sshconnect.c | 3 | ||||
-rw-r--r-- | sshconnect1.c | 3 | ||||
-rw-r--r-- | sshconnect2.c | 3 | ||||
-rw-r--r-- | sshd.c | 3 | ||||
-rw-r--r-- | sshlogin.c | 3 | ||||
-rw-r--r-- | sshtty.c | 3 | ||||
-rw-r--r-- | uuencode.c | 3 | ||||
-rw-r--r-- | uuencode.h | 5 | ||||
-rw-r--r-- | xmalloc.c | 3 |
55 files changed, 122 insertions, 55 deletions
@@ -40,6 +40,17 @@ Allow fallback to known_hosts entries without port qualifiers for non-standard ports too, so that all existing known_hosts entries will be recognised. Requested by, feedback and ok markus@ + - stevesk@cvs.openbsd.org 2006/08/01 23:22:48 + [auth-passwd.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c] + [auth2-chall.c auth2-pubkey.c authfile.c buffer.c canohost.c] + [channels.c clientloop.c dh.c dns.c dns.h hostfile.c kex.c kexdhc.c] + [kexgexc.c kexgexs.c key.c key.h log.c misc.c misc.h moduli.c] + [monitor_wrap.c packet.c progressmeter.c readconf.c readpass.c scp.c] + [servconf.c session.c sftp-client.c sftp-common.c sftp-server.c sftp.c] + [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh.c sshconnect.c] + [sshconnect1.c sshconnect2.c sshd.c sshlogin.c sshtty.c uuencode.c] + [uuencode.h xmalloc.c] + move #include <stdio.h> out of includes.h 20060804 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent @@ -5110,4 +5121,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4449 2006/08/05 01:35:45 djm Exp $ +$Id: ChangeLog,v 1.4450 2006/08/05 01:37:59 djm Exp $ diff --git a/auth-passwd.c b/auth-passwd.c index e5edc933..f8df17e6 100644 --- a/auth-passwd.c +++ b/auth-passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-passwd.c,v 1.38 2006/07/22 20:48:22 stevesk Exp $ */ +/* $OpenBSD: auth-passwd.c,v 1.39 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -41,6 +41,7 @@ #include <sys/types.h> #include <pwd.h> +#include <stdio.h> #include <string.h> #include "packet.h" diff --git a/auth-rhosts.c b/auth-rhosts.c index c14604dc..8dc4ede0 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-rhosts.c,v 1.39 2006/07/22 20:48:22 stevesk Exp $ */ +/* $OpenBSD: auth-rhosts.c,v 1.40 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -23,6 +23,7 @@ # include <netgroup.h> #endif #include <pwd.h> +#include <stdio.h> #include <string.h> #include "packet.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-rsa.c,v 1.69 2006/07/22 20:48:22 stevesk Exp $ */ +/* $OpenBSD: auth-rsa.c,v 1.70 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -23,6 +23,7 @@ #include <openssl/md5.h> #include <pwd.h> +#include <stdio.h> #include <string.h> #include "rsa.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.73 2006/07/26 02:35:17 stevesk Exp $ */ +/* $OpenBSD: auth.c,v 1.74 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -44,6 +44,7 @@ #include <libgen.h> #endif #include <stdarg.h> +#include <stdio.h> #include <string.h> #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.55 2006/07/23 01:11:05 stevesk Exp $ */ +/* $OpenBSD: auth.h,v 1.56 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -33,6 +33,7 @@ #include <signal.h> #include <pwd.h> #include <signal.h> +#include <stdio.h> #include "buffer.h" #include <openssl/rsa.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: auth1.c,v 1.68 2006/07/22 20:48:22 stevesk Exp $ */ +/* $OpenBSD: auth1.c,v 1.69 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -14,6 +14,7 @@ #include <sys/types.h> +#include <stdio.h> #include <string.h> #include <unistd.h> diff --git a/auth2-chall.c b/auth2-chall.c index ad6b7233..89b261e6 100644 --- a/auth2-chall.c +++ b/auth2-chall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-chall.c,v 1.28 2006/07/22 20:48:22 stevesk Exp $ */ +/* $OpenBSD: auth2-chall.c,v 1.29 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Per Allansson. All rights reserved. @@ -25,6 +25,7 @@ */ #include "includes.h" +#include <stdio.h> #include <string.h> #include "ssh2.h" diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 7962dcef..41763f76 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.13 2006/07/06 16:03:53 stevesk Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.14 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -29,6 +29,7 @@ #include <sys/stat.h> #include <pwd.h> +#include <stdio.h> #include "ssh.h" #include "ssh2.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.73 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: authfile.c,v 1.74 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -48,6 +48,7 @@ #include <errno.h> #include <fcntl.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.29 2006/07/26 02:35:17 stevesk Exp $ */ +/* $OpenBSD: buffer.c,v 1.30 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -16,6 +16,7 @@ #include <sys/param.h> +#include <stdio.h> #include <string.h> #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.59 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: canohost.c,v 1.60 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -22,6 +22,7 @@ #include <ctype.h> #include <errno.h> #include <netdb.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.262 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: channels.c,v 1.263 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -54,6 +54,7 @@ #include <errno.h> #include <netdb.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <termios.h> diff --git a/clientloop.c b/clientloop.c index 46f52e1a..f9ffa2bb 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.173 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: clientloop.c,v 1.174 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -78,6 +78,7 @@ #include <paths.h> #endif #include <signal.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <termios.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.40 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: dh.c,v 1.41 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * @@ -30,6 +30,7 @@ #include <openssl/bn.h> #include <openssl/dh.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: dns.c,v 1.21 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: dns.c,v 1.22 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2003 Wesley Griffin. All rights reserved. @@ -31,6 +31,7 @@ #include <sys/socket.h> #include <netdb.h> +#include <stdio.h> #include <string.h> #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: dns.h,v 1.8 2006/07/08 21:47:12 stevesk Exp $ */ +/* $OpenBSD: dns.h,v 1.9 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2003 Wesley Griffin. All rights reserved. @@ -30,6 +30,8 @@ #include <sys/types.h> #include <sys/socket.h> +#include <stdio.h> + #ifndef DNS_H #define DNS_H @@ -1,4 +1,4 @@ -/* $OpenBSD: hostfile.c,v 1.43 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: hostfile.c,v 1.44 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -46,6 +46,7 @@ #include <openssl/sha.h> #include <resolv.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> @@ -21,7 +21,6 @@ #define _GNU_SOURCE /* activate extra prototypes for glibc */ #include <sys/types.h> -#include <stdio.h> #ifdef HAVE_LIMITS_H # include <limits.h> /* For PATH_MAX */ @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.74 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: kex.c,v 1.75 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -29,6 +29,7 @@ #include <openssl/crypto.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: kexdhc.c,v 1.7 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: kexdhc.c,v 1.8 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -25,6 +25,7 @@ #include "includes.h" +#include <stdio.h> #include <string.h> #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: kexgexc.c,v 1.7 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: kexgexc.c,v 1.8 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -26,6 +26,7 @@ #include "includes.h" +#include <stdio.h> #include <string.h> #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: kexgexs.c,v 1.6 2006/07/26 02:35:17 stevesk Exp $ */ +/* $OpenBSD: kexgexs.c,v 1.7 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -28,6 +28,7 @@ #include <sys/param.h> +#include <stdio.h> #include <string.h> #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.65 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: key.c,v 1.66 2006/08/01 23:22:47 stevesk Exp $ */ /* * read_bignum(): * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -36,6 +36,7 @@ #include <openssl/evp.h> +#include <stdio.h> #include <string.h> #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: key.h,v 1.24 2006/03/25 22:22:43 djm Exp $ */ +/* $OpenBSD: key.h,v 1.25 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -29,6 +29,8 @@ #include <openssl/rsa.h> #include <openssl/dsa.h> +#include <stdio.h> + typedef struct Key Key; enum types { KEY_RSA1, @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.36 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: log.c,v 1.37 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -37,6 +37,7 @@ #include "includes.h" #include <stdarg.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <syslog.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.62 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: misc.c,v 1.63 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -32,6 +32,7 @@ #include <sys/param.h> #include <stdarg.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.33 2006/07/10 12:46:51 dtucker Exp $ */ +/* $OpenBSD: misc.h,v 1.34 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -18,6 +18,7 @@ #include <sys/types.h> #include <pwd.h> +#include <stdio.h> /* misc.c */ @@ -1,4 +1,4 @@ -/* $OpenBSD: moduli.c,v 1.16 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: moduli.c,v 1.17 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> @@ -43,6 +43,7 @@ #include <openssl/bn.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> diff --git a/monitor_wrap.c b/monitor_wrap.c index 3728e5f5..27e2fc7c 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.48 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.49 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -34,6 +34,7 @@ #include <errno.h> #include <pwd.h> +#include <stdio.h> #include <string.h> #include "ssh.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.140 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: packet.c,v 1.141 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -53,6 +53,7 @@ #include <errno.h> #include <stdarg.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> diff --git a/progressmeter.c b/progressmeter.c index 19dc917c..cbbb3402 100644 --- a/progressmeter.c +++ b/progressmeter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: progressmeter.c,v 1.34 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: progressmeter.c,v 1.35 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2003 Nils Nordman. All rights reserved. * @@ -30,6 +30,7 @@ #include <errno.h> #include <signal.h> +#include <stdio.h> #include <string.h> #include <time.h> #include <unistd.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.157 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: readconf.c,v 1.158 2006/08/01 23:22:47 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -23,6 +23,7 @@ #include <ctype.h> #include <errno.h> #include <netdb.h> +#include <stdio.h> #include <string.h> #include <unistd.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: readpass.c,v 1.45 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: readpass.c,v 1.46 2006/08/01 23:22:47 stevesk Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -34,6 +34,7 @@ # include <paths.h> #endif #include <stdarg.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.153 2006/07/26 13:57:17 stevesk Exp $ */ +/* $OpenBSD: scp.c,v 1.154 2006/08/01 23:22:47 stevesk Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -90,6 +90,7 @@ #include <pwd.h> #include <signal.h> #include <stdarg.h> +#include <stdio.h> #include & |