tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2006/08/03 03:34:42 

[OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]
     [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
     [auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]
     [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]
     [auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]
     [buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]
     [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
     [compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]
     [groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
     [kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]
     [key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]
     [monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]
     [monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]
     [readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]
     [serverloop.c session.c session.h sftp-client.c sftp-common.c]
     [sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
     [ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]
     [ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]
     [sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]
     [uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]
     [loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]
     almost entirely get rid of the culture of ".h files that include .h files"
     ok djm, sort of ok stevesk
     makes the pain stop in one easy step
     NB. portable commit contains everything *except* removing includes.h, as
     that will take a fair bit more work as we move headers that are required
     for portability workarounds to defines.h. (also, this step wasn't "easy")
This commit is contained in:
Damien Miller 2006-08-05 12:39:39 +10:00
parent 4dec5d75da
commit d783435315
133 changed files with 587 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ChangeLog
View File

@ -54,6 +54,34 @@
- stevesk@cvs.openbsd.org 2006/08/01 23:36:12 - stevesk@cvs.openbsd.org 2006/08/01 23:36:12
[authfile.c channels.c progressmeter.c scard.c servconf.c ssh.c] [authfile.c channels.c progressmeter.c scard.c servconf.c ssh.c]
clean extra spaces clean extra spaces
- deraadt@cvs.openbsd.org 2006/08/03 03:34:42
[OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]
[auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
[auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]
[auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]
[auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]
[buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]
[cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
[compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]
[groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
[kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]
[key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]
[monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]
[monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]
[readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]
[serverloop.c session.c session.h sftp-client.c sftp-common.c]
[sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
[ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]
[ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]
[sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]
[uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]
[loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]
almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step
NB. portable commit contains everything *except* removing includes.h, as
that will take a fair bit more work as we move headers that are required
for portability workarounds to defines.h. (also, this step wasn't "easy")
20060804 20060804
- (dtucker) [configure.ac] The "crippled AES" test does not work on recent - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@ -5124,4 +5152,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4451 2006/08/05 01:38:40 djm Exp $ $Id: ChangeLog,v 1.4452 2006/08/05 02:39:39 djm Exp $

3
OVERVIEW
View File

@ -162,8 +162,7 @@ these programs.
- There are several other files in the distribution that contain - There are several other files in the distribution that contain
various auxiliary routines: various auxiliary routines:
ssh.h the main header file for ssh (various definitions) ssh.h the main header file for ssh (various definitions)
includes.h includes most system headers. Lots of #ifdefs.
uidswap.c uid-swapping uidswap.c uid-swapping
xmalloc.c "safe" malloc routines xmalloc.c "safe" malloc routines
$OpenBSD: OVERVIEW,v 1.10 2006/04/01 05:37:46 djm Exp $ $OpenBSD: OVERVIEW,v 1.11 2006/08/03 03:34:41 deraadt Exp $

3
atomicio.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: atomicio.c,v 1.22 2006/07/26 02:35:17 stevesk Exp $ */ /* $OpenBSD: atomicio.c,v 1.23 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@ -29,6 +29,7 @@
#include "includes.h" #include "includes.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/uio.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>

7
atomicio.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: atomicio.h,v 1.9 2006/07/30 20:15:19 stevesk Exp $ */ /* $OpenBSD: atomicio.h,v 1.10 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 2006 Damien Miller. All rights reserved.
@ -29,11 +29,6 @@
#ifndef _ATOMICIO_H #ifndef _ATOMICIO_H
#define _ATOMICIO_H #define _ATOMICIO_H
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
/* /*
* Ensure all of data on socket comes through. f==read || f==vwrite * Ensure all of data on socket comes through. f==read || f==vwrite
*/ */

11
auth-bsdauth.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-bsdauth.c,v 1.9 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: auth-bsdauth.c,v 1.10 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -22,12 +22,21 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#ifdef BSD_AUTH #ifdef BSD_AUTH
#include "xmalloc.h" #include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
static void * static void *

8
auth-chall.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-chall.c,v 1.11 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: auth-chall.c,v 1.12 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -25,9 +25,13 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "log.h" #include "log.h"
#include "xmalloc.h"
#include "servconf.h" #include "servconf.h"
/* limited protocol v1 interface to kbd-interactive authentication */ /* limited protocol v1 interface to kbd-interactive authentication */

11
auth-krb5.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-krb5.c,v 1.18 2006/05/06 08:35:40 dtucker Exp $ */ /* $OpenBSD: auth-krb5.c,v 1.19 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Kerberos v5 authentication and ticket-passing routines. * Kerberos v5 authentication and ticket-passing routines.
* *
@ -30,13 +30,20 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <pwd.h>
#include <stdarg.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
#include "packet.h" #include "packet.h"
#include "xmalloc.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "uidswap.h" #include "uidswap.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#ifdef KRB5 #ifdef KRB5

12
auth-options.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-options.c,v 1.39 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: auth-options.c,v 1.40 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -17,17 +17,25 @@
#include <netdb.h> #include <netdb.h>
#include <pwd.h> #include <pwd.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "match.h" #include "match.h"
#include "log.h" #include "log.h"
#include "canohost.h" #include "canohost.h"
#include "buffer.h"
#include "channels.h" #include "channels.h"
#include "auth-options.h" #include "auth-options.h"
#include "servconf.h" #include "servconf.h"
#include "misc.h" #include "misc.h"
#include "monitor_wrap.h" #include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h"
/* Flags set authorized_keys flags */ /* Flags set authorized_keys flags */
int no_port_forwarding_flag = 0; int no_port_forwarding_flag = 0;

6
auth-options.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-options.h,v 1.15 2006/07/06 16:03:53 stevesk Exp $ */ /* $OpenBSD: auth-options.h,v 1.16 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -15,10 +15,6 @@
#ifndef AUTH_OPTIONS_H #ifndef AUTH_OPTIONS_H
#define AUTH_OPTIONS_H #define AUTH_OPTIONS_H
#include <sys/types.h>
#include <pwd.h>
/* Linked list of custom environment strings */ /* Linked list of custom environment strings */
struct envstring { struct envstring {
struct envstring *next; struct envstring *next;

5
auth-passwd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-passwd.c,v 1.39 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth-passwd.c,v 1.40 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -43,11 +43,14 @@
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "auth-options.h" #include "auth-options.h"

8
auth-rh-rsa.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-rh-rsa.c,v 1.41 2006/07/06 16:03:53 stevesk Exp $ */ /* $OpenBSD: auth-rh-rsa.c,v 1.42 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -18,17 +18,21 @@
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
#include <stdarg.h>
#include "packet.h" #include "packet.h"
#include "uidswap.h" #include "uidswap.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "key.h" #include "key.h"
#include "hostfile.h" #include "hostfile.h"
#include "pathnames.h" #include "pathnames.h"
#include "auth.h" #include "auth.h"
#include "canohost.h" #include "canohost.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
/* import */ /* import */

6
auth-rhosts.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-rhosts.c,v 1.40 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth-rhosts.c,v 1.41 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -25,13 +25,17 @@
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "packet.h" #include "packet.h"
#include "buffer.h"
#include "uidswap.h" #include "uidswap.h"
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "canohost.h" #include "canohost.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
/* import */ /* import */

11
auth-rsa.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-rsa.c,v 1.70 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth-rsa.c,v 1.71 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -26,18 +26,23 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
#include "packet.h" #include "packet.h"
#include "xmalloc.h"
#include "ssh1.h" #include "ssh1.h"
#include "uidswap.h" #include "uidswap.h"
#include "match.h" #include "match.h"
#include "buffer.h"
#include "auth-options.h" #include "auth-options.h"
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "auth.h" #include "key.h"
#include "hostfile.h" #include "hostfile.h"
#include "auth.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "ssh.h" #include "ssh.h"
#include "misc.h" #include "misc.h"

5
auth-skey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-skey.c,v 1.23 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: auth-skey.c,v 1.24 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -22,10 +22,13 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#ifdef SKEY #ifdef SKEY
#include <sys/types.h>
#include <skey.h> #include <skey.h>
#include "xmalloc.h" #include "xmalloc.h"

10
auth.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth.c,v 1.74 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth.c,v 1.75 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -51,17 +51,21 @@
#include "match.h" #include "match.h"
#include "groupaccess.h" #include "groupaccess.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "auth-options.h" #include "auth-options.h"
#include "canohost.h" #include "canohost.h"
#include "buffer.h"
#include "bufaux.h"
#include "uidswap.h" #include "uidswap.h"
#include "misc.h" #include "misc.h"
#include "bufaux.h" #include "bufaux.h"
#include "packet.h" #include "packet.h"
#include "loginrec.h" #include "loginrec.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
/* import */ /* import */

11
auth.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth.h,v 1.56 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth.h,v 1.57 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
@ -28,14 +28,8 @@
#ifndef AUTH_H #ifndef AUTH_H
#define AUTH_H #define AUTH_H
#include <sys/types.h>
#include <signal.h> #include <signal.h>
#include <pwd.h>
#include <signal.h>
#include <stdio.h>
#include "buffer.h"
#include <openssl/rsa.h> #include <openssl/rsa.h>
#ifdef HAVE_LOGIN_CAP #ifdef HAVE_LOGIN_CAP
@ -48,9 +42,6 @@
#include <krb5.h> #include <krb5.h>
#endif #endif
#include "key.h"
#include "hostfile.h"
typedef struct Authctxt Authctxt; typedef struct Authctxt Authctxt;
typedef struct Authmethod Authmethod; typedef struct Authmethod Authmethod;
typedef struct KbdintDevice KbdintDevice; typedef struct KbdintDevice KbdintDevice;

8
auth1.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth1.c,v 1.69 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth1.c,v 1.70 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -17,6 +17,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <pwd.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
@ -26,10 +27,15 @@
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "compat.h" #include "compat.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "channels.h" #include "channels.h"
#include "session.h" #include "session.h"
#include "uidswap.h" #include "uidswap.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "buffer.h" #include "buffer.h"

9
auth2-chall.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-chall.c,v 1.29 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth2-chall.c,v 1.30 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2001 Per Allansson. All rights reserved. * Copyright (c) 2001 Per Allansson. All rights reserved.
@ -23,16 +23,21 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "xmalloc.h"
#include "ssh2.h" #include "ssh2.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "buffer.h" #include "buffer.h"
#include "packet.h" #include "packet.h"
#include "xmalloc.h"
#include "dispatch.h" #include "dispatch.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"

14
auth2-gss.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-gss.c,v 1.14 2006/03/25 22:22:42 djm Exp $ */ /* $OpenBSD: auth2-gss.c,v 1.15 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -26,18 +26,20 @@
#include "includes.h" #include "includes.h"
#ifdef GSSAPI #include <sys/types.h>
#include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "ssh2.h" #include "ssh2.h"
#include "xmalloc.h"
#include "log.h" #include "log.h"
#include "dispatch.h" #include "dispatch.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "packet.h" #include "packet.h"
#include "monitor_wrap.h"
#include "ssh-gss.h" #include "ssh-gss.h"
#include "monitor_wrap.h"
extern ServerOptions options; extern ServerOptions options;
@ -291,5 +293,3 @@ Authmethod method_gssapi = {
userauth_gssapi, userauth_gssapi,
&options.gss_authentication &options.gss_authentication
}; };
#endif /* GSSAPI */

12
auth2-hostbased.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-hostbased.c,v 1.10 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: auth2-hostbased.c,v 1.11 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -29,18 +29,22 @@
#include <pwd.h> #include <pwd.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "ssh2.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh2.h"
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "compat.h" #include "compat.h"
#include "bufaux.h"
#include "auth.h"
#include "key.h" #include "key.h"
#include "hostfile.h"
#include "auth.h"
#include "canohost.h" #include "canohost.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "pathnames.h" #include "pathnames.h"

9
auth2-kbdint.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-kbdint.c,v 1.4 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: auth2-kbdint.c,v 1.5 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -25,11 +25,16 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include "xmalloc.h"
#include "packet.h" #include "packet.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "xmalloc.h"
/* import */ /* import */
extern ServerOptions options; extern ServerOptions options;

10
auth2-none.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-none.c,v 1.11 2006/07/09 15:15:10 stevesk Exp $ */ /* $OpenBSD: auth2-none.c,v 1.12 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -30,14 +30,20 @@
#include <fcntl.h> #include <fcntl.h>
#include "auth.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h"
#include "packet.h" #include "packet.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "atomicio.h" #include "atomicio.h"
#include "compat.h" #include "compat.h"
#include "ssh2.h" #include "ssh2.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
/* import */ /* import */

11
auth2-passwd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-passwd.c,v 1.8 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: auth2-passwd.c,v 1.9 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -25,12 +25,21 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h" #include "packet.h"
#include "log.h" #include "log.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "buffer.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "servconf.h" #include "servconf.h"

12
auth2-pubkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-pubkey.c,v 1.14 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth2-pubkey.c,v 1.15 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -30,22 +30,26 @@
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "ssh2.h" #include "ssh2.h"
#include "xmalloc.h"
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "compat.h" #include "compat.h"
#include "bufaux.h"
#include "auth.h"
#include "key.h" #include "key.h"
#include "hostfile.h"
#include "auth.h"
#include "pathnames.h" #include "pathnames.h"
#include "uidswap.h" #include "uidswap.h"
#include "auth-options.h" #include "auth-options.h"
#include "canohost.h" #include "canohost.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "misc.h" #include "misc.h"

10
auth2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2.c,v 1.112 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: auth2.c,v 1.113 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -28,23 +28,27 @@
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
#include <stdarg.h>
#include <string.h> #include <string.h>
#include "ssh2.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh2.h"
#include "packet.h" #include "packet.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "compat.h" #include "compat.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "dispatch.h" #include "dispatch.h"
#include "pathnames.h" #include "pathnames.h"
#include "monitor_wrap.h"
#include "buffer.h" #include "buffer.h"
#ifdef GSSAPI #ifdef GSSAPI
#include "ssh-gss.h" #include "ssh-gss.h"
#endif #endif
#include "monitor_wrap.h"
/* import */ /* import */
extern ServerOptions options; extern ServerOptions options;

7
authfd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfd.c,v 1.79 2006/07/26 13:57:17 stevesk Exp $ */ /* $OpenBSD: authfd.c,v 1.80 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -43,16 +43,17 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/crypto.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <signal.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "rsa.h" #include "rsa.h"
#include "buffer.h" #include "buffer.h"
#include "bufaux.h"
#include "xmalloc.h"
#include "key.h" #include "key.h"
#include "authfd.h" #include "authfd.h"
#include "cipher.h" #include "cipher.h"

4
authfd.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfd.h,v 1.35 2006/03/25 22:22:42 djm Exp $ */ /* $OpenBSD: authfd.h,v 1.36 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -16,8 +16,6 @@
#ifndef AUTHFD_H #ifndef AUTHFD_H
#define AUTHFD_H #define AUTHFD_H
#include "buffer.h"
/* Messages for the authentication agent connection. */ /* Messages for the authentication agent connection. */
#define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1 #define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1
#define SSH_AGENT_RSA_IDENTITIES_ANSWER 2 #define SSH_AGENT_RSA_IDENTITIES_ANSWER 2

6
authfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.75 2006/08/01 23:36:11 stevesk Exp $ */ /* $OpenBSD: authfile.c,v 1.76 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -41,6 +41,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/uio.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
@ -53,10 +54,9 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "cipher.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "cipher.h"
#include "buffer.h" #include "buffer.h"
#include "bufaux.h"
#include "key.h" #include "key.h"
#include "ssh.h" #include "ssh.h"
#include "log.h" #include "log.h"

7
bufaux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bufaux.c,v 1.43 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: bufaux.c,v 1.44 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -39,12 +39,15 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "bufaux.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h"
#include "log.h" #include "log.h"
#include "misc.h" #include "misc.h"

7
bufbn.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bufbn.c,v 1.2 2006/07/22 20:48:22 stevesk Exp $*/ /* $OpenBSD: bufbn.c,v 1.3 2006/08/03 03:34:41 deraadt Exp $*/
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -39,12 +39,15 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "bufaux.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h"
#include "log.h" #include "log.h"
#include "misc.h" #include "misc.h"

3
buffer.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: buffer.c,v 1.30 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: buffer.c,v 1.31 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -18,6 +18,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"

38
buffer.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: buffer.h,v 1.15 2006/04/16 00:48:52 djm Exp $ */ /* $OpenBSD: buffer.h,v 1.16 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -46,4 +46,40 @@ int buffer_get_ret(Buffer *, void *, u_int);
int buffer_consume_ret(Buffer *, u_int); int buffer_consume_ret(Buffer *, u_int);
int buffer_consume_end_ret(Buffer *, u_int); int buffer_consume_end_ret(Buffer *, u_int);
#include <openssl/bn.h>
void buffer_put_bignum(Buffer *, const BIGNUM *);
void buffer_put_bignum2(Buffer *, const BIGNUM *);
void buffer_get_bignum(Buffer *, BIGNUM *);
void buffer_get_bignum2(Buffer *, BIGNUM *);
u_short buffer_get_short(Buffer *);
void buffer_put_short(Buffer *, u_short);
u_int buffer_get_int(Buffer *);
void buffer_put_int(Buffer *, u_int);
u_int64_t buffer_get_int64(Buffer *);
void buffer_put_int64(Buffer *, u_int64_t);
int buffer_get_char(Buffer *);
void buffer_put_char(Buffer *, int);
void *buffer_get_string(Buffer *, u_int *);
void buffer_put_string(Buffer *, const void *, u_int);
void buffer_put_cstring(Buffer *, const char *);
#define buffer_skip_string(b) \
do { u_int l = buffer_get_int(b); buffer_consume(b, l); } while (0)
int buffer_put_bignum_ret(Buffer *, const BIGNUM *);
int buffer_get_bignum_ret(Buffer *, BIGNUM *);
int buffer_put_bignum2_ret(Buffer *, const BIGNUM *);
int buffer_get_bignum2_ret(Buffer *, BIGNUM *);
int buffer_get_short_ret(u_short *, Buffer *);
int buffer_get_int_ret(u_int *, Buffer *);
int buffer_get_int64_ret(u_int64_t *, Buffer *);
void *buffer_get_string_ret(Buffer *, u_int *);
int buffer_get_char_ret(char *, Buffer *);
#endif /* BUFFER_H */ #endif /* BUFFER_H */

5
canohost.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: canohost.c,v 1.60 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: canohost.c,v 1.61 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -25,9 +25,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "packet.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h"
#include "log.h" #include "log.h"
#include "canohost.h" #include "canohost.h"

9
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.264 2006/08/01 23:36:11 stevesk Exp $ */ /* $OpenBSD: channels.c,v 1.265 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -41,8 +41,8 @@
#include "includes.h" #include "includes.h"
#include <sys/ioctl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/un.h> #include <sys/un.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
@ -59,21 +59,22 @@
#include <string.h> #include <string.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"
#include "packet.h" #include "packet.h"
#include "xmalloc.h"
#include "log.h" #include "log.h"
#include "misc.h" #include "misc.h"
#include "buffer.h"
#include "channels.h" #include "channels.h"
#include "compat.h" #include "compat.h"
#include "canohost.h" #include "canohost.h"
#include "key.h" #include "key.h"
#include "authfd.h" #include "authfd.h"
#include "pathnames.h" #include "pathnames.h"
#include "bufaux.h"
/* -- channel core */ /* -- channel core */

4
channels.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.h,v 1.87 2006/07/21 12:43:36 dtucker Exp $ */ /* $OpenBSD: channels.h,v 1.88 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -38,8 +38,6 @@
#ifndef CHANNEL_H #ifndef CHANNEL_H
#define CHANNEL_H #define CHANNEL_H
#include "buffer.h"
/* Definitions for channel types. */ /* Definitions for channel types. */
#define SSH_CHANNEL_X11_LISTENER 1 /* Listening for inet X11 conn. */ #define SSH_CHANNEL_X11_LISTENER 1 /* Listening for inet X11 conn. */
#define SSH_CHANNEL_PORT_LISTENER 2 /* Listening on a port. */ #define SSH_CHANNEL_PORT_LISTENER 2 /* Listening on a port. */

4
cipher-3des1.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cipher-3des1.c,v 1.5 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: cipher-3des1.c,v 1.6 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2003 Markus Friedl. All rights reserved. * Copyright (c) 2003 Markus Friedl. All rights reserved.
* *
@ -25,6 +25,8 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <string.h> #include <string.h>

4
cipher-bf1.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cipher-bf1.c,v 1.4 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: cipher-bf1.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2003 Markus Friedl. All rights reserved. * Copyright (c) 2003 Markus Friedl. All rights reserved.
* *
@ -25,6 +25,8 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <string.h> #include <string.h>

6
cipher-ctr.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cipher-ctr.c,v 1.9 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: cipher-ctr.c,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2003 Markus Friedl <markus@openbsd.org> * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
* *
@ -16,12 +16,14 @@
*/ */
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <string.h> #include <string.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include "log.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h"
/* compatibility with old or broken OpenSSL versions */ /* compatibility with old or broken OpenSSL versions */
#include "openbsd-compat/openssl-compat.h" #include "openbsd-compat/openssl-compat.h"

5
cipher.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cipher.c,v 1.80 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: cipher.c,v 1.81 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -37,9 +37,12 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/md5.h> #include <openssl/md5.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h" #include "log.h"

5
cleanup.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cleanup.c,v 1.4 2006/07/17 01:31:09 stevesk Exp $ */ /* $OpenBSD: cleanup.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2003 Markus Friedl <markus@openbsd.org> * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
* *
@ -17,7 +17,10 @@
#include "config.h" #include "config.h"
#include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h>
#include "log.h" #include "log.h"

8
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.174 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: clientloop.c,v 1.175 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -82,20 +82,20 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <termios.h> #include <termios.h>
#include <pwd.h>
#include <unistd.h> #include <unistd.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"
#include "xmalloc.h"
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
#include "compat.h" #include "compat.h"
#include "channels.h" #include "channels.h"
#include "dispatch.h" #include "dispatch.h"
#include "buffer.h"
#include "bufaux.h"
#include "key.h" #include "key.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
#include "log.h" #include "log.h"
#include "readconf.h" #include "readconf.h"

7
compat.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: compat.c,v 1.75 2006/07/26 13:57:17 stevesk Exp $ */ /* $OpenBSD: compat.c,v 1.76 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
* *
@ -25,12 +25,15 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
#include "packet.h" #include "packet.h"
#include "xmalloc.h"
#include "compat.h" #include "compat.h"
#include "log.h" #include "log.h"
#include "match.h" #include "match.h"

6
compress.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: compress.c,v 1.23 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: compress.c,v 1.24 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -14,6 +14,10 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <stdarg.h>
#include "log.h" #include "log.h"
#include "buffer.h" #include "buffer.h"
#include "zlib.h" #include "zlib.h"

10
deattack.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: deattack.c,v 1.28 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: deattack.c,v 1.29 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Cryptographic attack detector for ssh - source code * Cryptographic attack detector for ssh - source code
* *
@ -20,12 +20,16 @@
#include "includes.h" #include "includes.h"
#include <string.h> #include <sys/types.h>
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include "xmalloc.h"
#include "deattack.h" #include "deattack.h"
#include "log.h" #include "log.h"
#include "crc32.h" #include "crc32.h"
#include "xmalloc.h"
#include "misc.h" #include "misc.h"
/* SSH Constants */ /* SSH Constants */

2
dh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: dh.c,v 1.41 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: dh.c,v 1.42 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2000 Niels Provos. All rights reserved.
* *

6
dispatch.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: dispatch.c,v 1.20 2006/07/23 01:11:05 stevesk Exp $ */ /* $OpenBSD: dispatch.c,v 1.21 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -22,9 +22,13 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h>
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"

2
dns.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: dns.c,v 1.22 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: dns.c,v 1.23 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2003 Wesley Griffin. All rights reserved. * Copyright (c) 2003 Wesley Griffin. All rights reserved.

9
dns.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: dns.h,v 1.9 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: dns.h,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2003 Wesley Griffin. All rights reserved. * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@ -25,13 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <stdio.h>
#ifndef DNS_H #ifndef DNS_H
#define DNS_H #define DNS_H

4
fatal.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: fatal.c,v 1.6 2006/07/10 16:37:36 stevesk Exp $ */ /* $OpenBSD: fatal.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2002 Markus Friedl. All rights reserved. * Copyright (c) 2002 Markus Friedl. All rights reserved.
* *
@ -25,6 +25,8 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <stdarg.h> #include <stdarg.h>
#include "log.h" #include "log.h"

5
groupaccess.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: groupaccess.c,v 1.11 2006/07/26 02:35:17 stevesk Exp $ */ /* $OpenBSD: groupaccess.c,v 1.12 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Kevin Steves. All rights reserved. * Copyright (c) 2001 Kevin Steves. All rights reserved.
* *
@ -30,9 +30,10 @@
#include <grp.h> #include <grp.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h>
#include "groupaccess.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "groupaccess.h"
#include "match.h" #include "match.h"
#include "log.h" #include "log.h"

4
groupaccess.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: groupaccess.h,v 1.6 2006/07/02 22:45:59 stevesk Exp $ */ /* $OpenBSD: groupaccess.h,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Kevin Steves. All rights reserved. * Copyright (c) 2001 Kevin Steves. All rights reserved.
@ -27,8 +27,6 @@
#ifndef GROUPACCESS_H #ifndef GROUPACCESS_H
#define GROUPACCESS_H #define GROUPACCESS_H
#include <sys/types.h>
int ga_init(const char *, gid_t); int ga_init(const char *, gid_t);
int ga_match(char * const *, int); int ga_match(char * const *, int);
void ga_free(void); void ga_free(void);

6
gss-genr.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-genr.c,v 1.12 2006/07/26 02:35:17 stevesk Exp $ */ /* $OpenBSD: gss-genr.c,v 1.13 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -28,13 +28,15 @@
#ifdef GSSAPI #ifdef GSSAPI
#include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
#include <stdarg.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "bufaux.h" #include "buffer.h"
#include "log.h" #include "log.h"
#include "ssh2.h" #include "ssh2.h"

9
gss-serv-krb5.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-serv-krb5.c,v 1.6 2006/07/02 18:36:47 stevesk Exp $ */ /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -29,13 +29,18 @@
#ifdef GSSAPI #ifdef GSSAPI
#ifdef KRB5 #ifdef KRB5
#include <sys/types.h>
#include <string.h> #include <string.h>
#include "auth.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "buffer.h"
#include "ssh-gss.h" #include "ssh-gss.h"
extern ServerOptions options; extern ServerOptions options;

10
gss-serv.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-serv.c,v 1.19 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: gss-serv.c,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -28,15 +28,19 @@
#ifdef GSSAPI #ifdef GSSAPI
#include <sys/types.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "bufaux.h" #include "xmalloc.h"
#include "buffer.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "log.h" #include "log.h"
#include "channels.h" #include "channels.h"
#include "session.h" #include "session.h"
#include "xmalloc.h"
#include "misc.h" #include "misc.h"
#include "ssh-gss.h" #include "ssh-gss.h"

4
hostfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: hostfile.c,v 1.44 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: hostfile.c,v 1.45 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -50,11 +50,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "xmalloc.h"
#include "match.h" #include "match.h"
#include "key.h" #include "key.h"
#include "hostfile.h" #include "hostfile.h"
#include "log.h" #include "log.h"
#include "xmalloc.h"
static int static int
extract_salt(const char *s, u_int l, char *salt, size_t salt_len) extract_salt(const char *s, u_int l, char *salt, size_t salt_len)

3
includes.h
View File

@ -25,9 +25,6 @@
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
# include <limits.h> /* For PATH_MAX */ # include <limits.h> /* For PATH_MAX */
#endif #endif
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#endif
#ifdef HAVE_BSTRING_H #ifdef HAVE_BSTRING_H
# include <bstring.h> # include <bstring.h>
#endif #endif

12
kex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kex.c,v 1.75 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: kex.c,v 1.76 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* *
@ -27,21 +27,21 @@
#include <sys/param.h> #include <sys/param.h>
#include <openssl/crypto.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "ssh2.h" #include <openssl/crypto.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh2.h"
#include "buffer.h" #include "buffer.h"
#include "bufaux.h"
#include "packet.h" #include "packet.h"
#include "compat.h" #include "compat.h"
#include "cipher.h" #include "cipher.h"
#include "kex.h"
#include "key.h" #include "key.h"
#include "kex.h"
#include "log.h" #include "log.h"
#include "mac.h" #include "mac.h"
#include "match.h" #include "match.h"

8
kex.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kex.h,v 1.43 2006/07/23 01:11:05 stevesk Exp $ */ /* $OpenBSD: kex.h,v 1.44 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@ -29,12 +29,6 @@
#include <signal.h> #include <signal.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <signal.h>
#include "buffer.h"
#include "cipher.h"
#include "key.h"
#define KEX_DH1 "diffie-hellman-group1-sha1" #define KEX_DH1 "diffie-hellman-group1-sha1"
#define KEX_DH14 "diffie-hellman-group14-sha1" #define KEX_DH14 "diffie-hellman-group14-sha1"
#define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1"

9
kexdh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kexdh.c,v 1.22 2006/03/25 13:17:02 djm Exp $ */ /* $OpenBSD: kexdh.c,v 1.23 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -25,11 +25,16 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <signal.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include "buffer.h" #include "buffer.h"
#include "bufaux.h"
#include "ssh2.h" #include "ssh2.h"
#include "key.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
void void

7
kexdhc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kexdhc.c,v 1.8 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: kexdhc.c,v 1.9 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -25,11 +25,16 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <signal.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h"
#include "key.h" #include "key.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
#include "log.h" #include "log.h"
#include "packet.h" #include "packet.h"

9
kexdhs.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kexdhs.c,v 1.6 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: kexdhs.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -25,15 +25,22 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <string.h> #include <string.h>
#include <signal.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h"
#include "key.h" #include "key.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
#include "log.h" #include "log.h"
#include "packet.h" #include "packet.h"
#include "dh.h" #include "dh.h"
#include "ssh2.h" #include "ssh2.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
void void

8
kexgex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kexgex.c,v 1.26 2006/03/25 13:17:02 djm Exp $ */ /* $OpenBSD: kexgex.c,v 1.27 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
@ -26,10 +26,14 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <signal.h>
#include "buffer.h" #include "buffer.h"
#include "bufaux.h" #include "key.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
#include "ssh2.h" #include "ssh2.h"

7
kexgexc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kexgexc.c,v 1.8 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: kexgexc.c,v 1.9 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
@ -26,11 +26,16 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <signal.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h"
#include "key.h" #include "key.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
#include "log.h" #include "log.h"
#include "packet.h" #include "packet.h"

8
kexgexs.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kexgexs.c,v 1.7 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: kexgexs.c,v 1.8 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
@ -30,15 +30,21 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <signal.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h"
#include "key.h" #include "key.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
#include "log.h" #include "log.h"
#include "packet.h" #include "packet.h"
#include "dh.h" #include "dh.h"
#include "ssh2.h" #include "ssh2.h"
#include "compat.h" #include "compat.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
void void

6
key.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: key.c,v 1.66 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: key.c,v 1.67 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* read_bignum(): * read_bignum():
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -32,8 +32,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <stdio.h> #include <stdio.h>
@ -44,7 +47,6 @@
#include "rsa.h" #include "rsa.h"
#include "uuencode.h" #include "uuencode.h"
#include "buffer.h" #include "buffer.h"
#include "bufaux.h"
#include "log.h" #include "log.h"
Key * Key *

4
key.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: key.h,v 1.25 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: key.h,v 1.26 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@ -29,8 +29,6 @@
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>
#include <stdio.h>
typedef struct Key Key; typedef struct Key Key;
enum types { enum types {
KEY_RSA1, KEY_RSA1,

6
log.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: log.c,v 1.37 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: log.c,v 1.38 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -36,6 +36,8 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -46,8 +48,8 @@
# include <vis.h> # include <vis.h>
#endif #endif
#include "log.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h"
static LogLevel log_level = SYSLOG_LEVEL_INFO; static LogLevel log_level = SYSLOG_LEVEL_INFO;
static int log_on_stderr = 1; static int log_on_stderr = 1;

8
log.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: log.h,v 1.13 2006/07/10 16:37:36 stevesk Exp $ */ /* $OpenBSD: log.h,v 1.14 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -15,12 +15,6 @@
#ifndef SSH_LOG_H #ifndef SSH_LOG_H
#define SSH_LOG_H #define SSH_LOG_H
#include "includes.h"
#include <stdarg.h>
#include <syslog.h> /* Needed for LOG_AUTHPRIV (if present) */
/* Supported syslog facilities and levels. */ /* Supported syslog facilities and levels. */
typedef enum { typedef enum {
SYSLOG_FACILITY_DAEMON, SYSLOG_FACILITY_DAEMON,

4
loginrec.c
View File

@ -159,8 +159,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "ssh.h"
#include "loginrec.h" #include "loginrec.h"
#include "log.h" #include "log.h"
#include "atomicio.h" #include "atomicio.h"

4
loginrec.h
View File

@ -31,10 +31,6 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <netinet/in.h>
#include <sys/socket.h>
/** /**
** you should use the login_* calls to work around platform dependencies ** you should use the login_* calls to work around platform dependencies
**/ **/

7
mac.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mac.c,v 1.11 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: mac.c,v 1.12 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -25,13 +25,18 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/hmac.h> #include <openssl/hmac.h>
#include <string.h> #include <string.h>
#include <signal.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h" #include "log.h"
#include "cipher.h" #include "cipher.h"
#include "buffer.h"
#include "key.h"
#include "kex.h" #include "kex.h"
#include "mac.h" #include "mac.h"
#include "misc.h" #include "misc.h"

6
match.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: match.c,v 1.25 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: match.c,v 1.26 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -37,11 +37,13 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include "match.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "match.h"
/* /*
* Returns true if the given string matches the pattern (which may contain ? * Returns true if the given string matches the pattern (which may contain ?

4
md-sha256.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: md-sha256.c,v 1.4 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: md-sha256.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2005 Damien Miller <djm@openbsd.org> * Copyright (c) 2005 Damien Miller <djm@openbsd.org>
* *
@ -18,6 +18,8 @@
/* EVP wrapper for SHA256 */ /* EVP wrapper for SHA256 */
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#if !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) #if !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L)

6
misc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.63 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: misc.c,v 1.64 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@ -26,8 +26,8 @@
#include "includes.h" #include "includes.h"
#include <sys/ioctl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/param.h> #include <sys/param.h>
@ -50,9 +50,9 @@
#include <net/if.h> #include <net/if.h>
#endif #endif
#include "xmalloc.h"
#include "misc.h" #include "misc.h"
#include "log.h" #include "log.h"
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
/* remove newline at end of string */ /* remove newline at end of string */

7
misc.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.h,v 1.34 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: misc.h,v 1.35 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -15,11 +15,6 @@
#ifndef _MISC_H #ifndef _MISC_H
#define _MISC_H #define _MISC_H
#include <sys/types.h>
#include <pwd.h>
#include <stdio.h>
/* misc.c */ /* misc.c */
char *chop(char *); char *chop(char *);

3
moduli.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: moduli.c,v 1.17 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: moduli.c,v 1.18 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1994 Phil Karn <karn@qualcomm.com>
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@ -46,6 +46,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include <time.h> #include <time.h>
#include "xmalloc.h" #include "xmalloc.h"

15
monitor.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor.c,v 1.84 2006/07/26 13:57:17 stevesk Exp $ */ /* $OpenBSD: monitor.c,v 1.85 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -30,6 +30,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/socket.h> #include <sys/socket.h>
#include "openbsd-compat/sys-tree.h"
#include <sys/wait.h> #include <sys/wait.h>
#include <errno.h> #include <errno.h>
@ -48,8 +49,13 @@
#include <openssl/dh.h> #include <openssl/dh.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "key.h"
#include "buffer.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
#include "dh.h" #include "dh.h"
#ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ #ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */
@ -70,17 +76,16 @@
#include "servconf.h" #include "servconf.h"
#include "monitor.h" #include "monitor.h"
#include "monitor_mm.h" #include "monitor_mm.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "monitor_fdpass.h" #include "monitor_fdpass.h"
#include "xmalloc.h"
#include "misc.h" #include "misc.h"
#include "buffer.h"
#include "bufaux.h"
#include "compat.h" #include "compat.h"
#include "ssh2.h" #include "ssh2.h"
#ifdef GSSAPI #ifdef GSSAPI
#include "ssh-gss.h"
static Gssctxt *gsscontext = NULL; static Gssctxt *gsscontext = NULL;
#endif #endif

3
monitor_fdpass.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor_fdpass.c,v 1.11 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: monitor_fdpass.c,v 1.12 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright 2001 Niels Provos <provos@citi.umich.edu> * Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved. * All rights reserved.
@ -32,6 +32,7 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "log.h" #include "log.h"
#include "monitor_fdpass.h" #include "monitor_fdpass.h"

7
monitor_mm.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor_mm.c,v 1.14 2006/07/26 02:35:17 stevesk Exp $ */ /* $OpenBSD: monitor_mm.c,v 1.15 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved. * All rights reserved.
@ -26,16 +26,19 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
#include <sys/param.h> #include <sys/param.h>
#include "openbsd-compat/sys-tree.h"
#include <errno.h> #include <errno.h>
#include <stdarg.h>
#include <string.h> #include <string.h>
#include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h"
#include "log.h" #include "log.h"
#include "monitor_mm.h" #include "monitor_mm.h"

3
monitor_mm.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor_mm.h,v 1.3 2006/03/25 22:22:43 djm Exp $ */ /* $OpenBSD: monitor_mm.h,v 1.4 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@ -27,7 +27,6 @@
#ifndef _MM_H_ #ifndef _MM_H_
#define _MM_H_ #define _MM_H_
#include "openbsd-compat/sys-tree.h"
struct mm_share { struct mm_share {
RB_ENTRY(mm_share) next; RB_ENTRY(mm_share) next;

25
monitor_wrap.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor_wrap.c,v 1.49 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: monitor_wrap.c,v 1.50 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -29,21 +29,25 @@
#include <sys/types.h> #include <sys/types.h>
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <errno.h> #include <errno.h>
#include <pwd.h> #include <pwd.h>
#include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <openssl/bn.h>
#include <openssl/dh.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "dh.h" #include "dh.h"
#include "buffer.h"
#include "key.h"
#include "cipher.h"
#include "kex.h" #include "kex.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "auth-options.h" #include "auth-options.h"
#include "buffer.h"
#include "bufaux.h"
#include "packet.h" #include "packet.h"
#include "mac.h" #include "mac.h"
#include "log.h" #include "log.h"
@ -55,21 +59,18 @@
#include "zlib.h" #include "zlib.h"
#endif #endif
#include "monitor.h" #include "monitor.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "xmalloc.h"
#include "atomicio.h" #include "atomicio.h"
#include "monitor_fdpass.h" #include "monitor_fdpass.h"
#include "misc.h" #include "misc.h"
#include "servconf.h" #include "servconf.h"
#include "auth.h"
#include "channels.h" #include "channels.h"
#include "session.h" #include "session.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
/* Imports */ /* Imports */
extern int compat20; extern int compat20;
extern Newkeys *newkeys[]; extern Newkeys *newkeys[];

10
monitor_wrap.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor_wrap.h,v 1.19 2006/07/14 01:15:28 stevesk Exp $ */ /* $OpenBSD: monitor_wrap.h,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@ -28,13 +28,6 @@
#ifndef _MM_WRAP_H_ #ifndef _MM_WRAP_H_
#define _MM_WRAP_H_ #define _MM_WRAP_H_
#include <sys/types.h>
#include <pwd.h>
#include "key.h"
#include "buffer.h"
extern int use_privsep; extern int use_privsep;
#define PRIVSEP(x) (use_privsep ? mm_##x : x) #define PRIVSEP(x) (use_privsep ? mm_##x : x)
@ -61,7 +54,6 @@ int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *);
BIGNUM *mm_auth_rsa_generate_challenge(Key *); BIGNUM *mm_auth_rsa_generate_challenge(Key *);
#ifdef GSSAPI #ifdef GSSAPI
#include "ssh-gss.h"
OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);

6
msg.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: msg.c,v 1.14 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: msg.c,v 1.15 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2002 Markus Friedl. All rights reserved. * Copyright (c) 2002 Markus Friedl. All rights reserved.
* *
@ -22,13 +22,17 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h>
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h>
#include "buffer.h" #include "buffer.h"
#include "log.h" #include "log.h"

3
nchan.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: nchan.c,v 1.56 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: nchan.c,v 1.57 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
* *
@ -30,6 +30,7 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"

7
openbsd-compat/port-aix.c
View File

@ -25,11 +25,14 @@
* *
*/ */
#include "includes.h" #include "includes.h"
#include "xmalloc.h"
#include "buffer.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "ssh.h" #include "ssh.h"
#include "log.h" #include "log.h"
#include "xmalloc.h"
#include "buffer.h"
#ifdef _AIX #ifdef _AIX

2
openbsd-compat/port-tun.h
View File

@ -17,8 +17,6 @@
#ifndef _PORT_TUN_H #ifndef _PORT_TUN_H
#define _PORT_TUN_H #define _PORT_TUN_H
#include "channels.h"
#if defined(SSH_TUN_LINUX) || defined(SSH_TUN_FREEBSD) #if defined(SSH_TUN_LINUX) || defined(SSH_TUN_FREEBSD)
# define CUSTOM_SYS_TUN_OPEN # define CUSTOM_SYS_TUN_OPEN
int sys_tun_open(int, int); int sys_tun_open(int, int);

8
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.141 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: packet.c,v 1.142 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -57,22 +57,20 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
#include "packet.h" #include "packet.h"
#include "bufaux.h"
#include "crc32.h" #include "crc32.h"
#include "compress.h" #include "compress.h"
#include "deattack.h" #include "deattack.h"
#include "channels.h" #include "channels.h"
#include "compat.h" #include "compat.h"
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"
#include "cipher.h" #include "cipher.h"
#include "key.h"
#include "kex.h" #include "kex.h"
#include "mac.h" #include "mac.h"
#include "log.h" #include "log.h"

3
progressmeter.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: progressmeter.c,v 1.36 2006/08/01 23:36:12 stevesk Exp $ */ /* $OpenBSD: progressmeter.c,v 1.37 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2003 Nils Nordman. All rights reserved. * Copyright (c) 2003 Nils Nordman. All rights reserved.
* *
@ -27,6 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/uio.h>
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>

7
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.158 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: readconf.c,v 1.159 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -23,19 +23,22 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h"
#include "compat.h" #include "compat.h"
#include "cipher.h" #include "cipher.h"
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
#include "key.h"
#include "readconf.h" #include "readconf.h"
#include "match.h" #include "match.h"
#include "misc.h" #include "misc.h"
#include "buffer.h"
#include "kex.h" #include "kex.h"
#include "mac.h" #include "mac.h"

4
readconf.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.h,v 1.70 2006/07/11 18:50:48 markus Exp $ */ /* $OpenBSD: readconf.h,v 1.71 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -16,8 +16,6 @@
#ifndef READCONF_H #ifndef READCONF_H
#define READCONF_H #define READCONF_H
#include "key.h"
/* Data structure for representing a forwarding request. */ /* Data structure for representing a forwarding request. */
typedef struct { typedef struct {

2
readpass.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readpass.c,v 1.46 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: readpass.c,v 1.47 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *

6
rsa.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: rsa.c,v 1.27 2006/07/22 20:48:23 stevesk Exp $ */ /* $OpenBSD: rsa.c,v 1.28 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -62,11 +62,13 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <string.h> #include <string.h>
#include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
#include "log.h" #include "log.h"
#include "xmalloc.h"
void void
rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key) rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)

8
scard.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scard.c,v 1.34 2006/08/01 23:36:12 stevesk Exp $ */ /* $OpenBSD: scard.c,v 1.35 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -26,14 +26,16 @@
#include "includes.h" #include "includes.h"
#if defined(SMARTCARD) && defined(USE_SECTOK) #if defined(SMARTCARD) && defined(USE_SECTOK)
#include <openssl/evp.h> #include <sys/types.h>
#include <sectok.h> #include <sectok.h>
#include <string.h> #include <string.h>
#include <openssl/evp.h>
#include "xmalloc.h"
#include "key.h" #include "key.h"
#include "log.h" #include "log.h"
#include "xmalloc.h"
#include "misc.h" #include "misc.h"
#include "scard.h" #include "scard.h"

4
scard.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scard.h,v 1.13 2006/03/25 22:22:43 djm Exp $ */ /* $OpenBSD: scard.h,v 1.14 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
@ -27,8 +27,6 @@
#ifndef SCARD_H #ifndef SCARD_H
#define SCARD_H #define SCARD_H
#include "key.h"
#define SCARD_ERROR_FAIL -1 #define SCARD_ERROR_FAIL -1
#define SCARD_ERROR_NOCARD -2 #define SCARD_ERROR_NOCARD -2
#define SCARD_ERROR_APPLET -3 #define SCARD_ERROR_APPLET -3

3
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.154 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: scp.c,v 1.155 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -82,6 +82,7 @@
# include <sys/time.h> # include <sys/time.h>
#endif #endif
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/uio.h>
#include <ctype.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>

8
servconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.c,v 1.163 2006/08/01 23:36:12 stevesk Exp $ */ /* $OpenBSD: servconf.c,v 1.164 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -19,16 +19,20 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <signal.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "xmalloc.h"
#include "compat.h" #include "compat.h"
#include "pathnames.h" #include "pathnames.h"
#include "misc.h" #include "misc.h"
#include "cipher.h" #include "cipher.h"
#include "key.h"
#include "kex.h" #include "kex.h"
#include "mac.h" #include "mac.h"
#include "match.h" #include "match.h"

4
servconf.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.h,v 1.77 2006/07/21 12:43:36 dtucker Exp $ */ /* $OpenBSD: servconf.h,v 1.78 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -16,8 +16,6 @@
#ifndef SERVCONF_H #ifndef SERVCONF_H
#define SERVCONF_H #define SERVCONF_H
#include "buffer.h"
#define MAX_PORTS 256 /* Max # ports. */ #define MAX_PORTS 256 /* Max # ports. */
#define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ #define MAX_ALLOW_USERS 256 /* Max # users on allow list. */

8
serverloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: serverloop.c,v 1.143 2006/07/26 02:35:17 stevesk Exp $ */ /* $OpenBSD: serverloop.c,v 1.144 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -54,6 +54,7 @@
#include <string.h> #include <string.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h" #include "packet.h"
@ -66,13 +67,16 @@
#include "compat.h" #include "compat.h"
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"
#include "key.h"
#include "cipher.h"
#include "kex.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "session.h" #include "session.h"
#include "dispatch.h" #include "dispatch.h"
#include "auth-options.h" #include "auth-options.h"
#include "serverloop.h" #include "serverloop.h"
#include "misc.h" #include "misc.h"
#include "kex.h"
extern ServerOptions options; extern ServerOptions options;

15
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.215 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: session.c,v 1.216 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -58,10 +58,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"
#include "xmalloc.h"
#include "sshpty.h" #include "sshpty.h"
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
@ -69,7 +69,12 @@
#include "uidswap.h" #include "uidswap.h"
#include "compat.h" #include "compat.h"
#include "channels.h" #include "channels.h"
#include "bufaux.h" #include "key.h"
#include "cipher.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "auth-options.h" #include "auth-options.h"
#include "pathnames.h" #include "pathnames.h"
@ -86,10 +91,6 @@
#include <kafs.h> #include <kafs.h>
#endif #endif
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
/* func */ /* func */
Session *session_new(void); Session *session_new(void);

6
session.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.h,v 1.28 2006/07/06 16:03:53 stevesk Exp $ */ /* $OpenBSD: session.h,v 1.29 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@ -26,10 +26,6 @@
#ifndef SESSION_H #ifndef SESSION_H
#define SESSION_H #define SESSION_H
#include <sys/types.h>
#include <pwd.h>
#define TTYSZ 64 #define TTYSZ 64
typedef struct Session Session; typedef struct Session Session;
struct Session { struct Session {

Some files were not shown because too many files have changed in this diff Show More