Module Name:	basesrc
Committed By:	itojun
Date:		Tue Apr 10 07:15:16 UTC 2001

Update of /cvsroot/basesrc/crypto/dist/ssh
In directory netbsd.hut.fi:/tmp/cvs-serv16028

Log Message:
OpenSSH 2.5.4 as of 2001/04/10


Vendor Tag:	OPENSSH
Release Tags:	v254-20010410
		
U basesrc/crypto/dist/ssh/LICENCE
U basesrc/crypto/dist/ssh/OVERVIEW
U basesrc/crypto/dist/ssh/README
U basesrc/crypto/dist/ssh/RFC.nroff
C basesrc/crypto/dist/ssh/atomicio.c
C basesrc/crypto/dist/ssh/atomicio.h
C basesrc/crypto/dist/ssh/auth-chall.c
C basesrc/crypto/dist/ssh/auth-krb4.c
U basesrc/crypto/dist/ssh/auth-options.c
U basesrc/crypto/dist/ssh/auth-options.h
C basesrc/crypto/dist/ssh/auth-passwd.c
U basesrc/crypto/dist/ssh/auth-rh-rsa.c
C basesrc/crypto/dist/ssh/auth-rhosts.c
U basesrc/crypto/dist/ssh/auth-rsa.c
C basesrc/crypto/dist/ssh/auth.c
C basesrc/crypto/dist/ssh/auth.h
C basesrc/crypto/dist/ssh/auth1.c
C basesrc/crypto/dist/ssh/auth2-chall.c
C basesrc/crypto/dist/ssh/auth2.c
C basesrc/crypto/dist/ssh/authfd.c
U basesrc/crypto/dist/ssh/authfd.h
C basesrc/crypto/dist/ssh/authfile.c
U basesrc/crypto/dist/ssh/authfile.h
U basesrc/crypto/dist/ssh/bufaux.c
U basesrc/crypto/dist/ssh/bufaux.h
U basesrc/crypto/dist/ssh/buffer.c
U basesrc/crypto/dist/ssh/buffer.h
C basesrc/crypto/dist/ssh/canohost.c
C basesrc/crypto/dist/ssh/canohost.h
C basesrc/crypto/dist/ssh/channels.c
U basesrc/crypto/dist/ssh/channels.h
C basesrc/crypto/dist/ssh/cipher.c
U basesrc/crypto/dist/ssh/cipher.h
C basesrc/crypto/dist/ssh/cli.c
C basesrc/crypto/dist/ssh/cli.h
C basesrc/crypto/dist/ssh/clientloop.c
C basesrc/crypto/dist/ssh/clientloop.h
U basesrc/crypto/dist/ssh/compat.c
U basesrc/crypto/dist/ssh/compat.h
C basesrc/crypto/dist/ssh/compress.c
U basesrc/crypto/dist/ssh/compress.h
U basesrc/crypto/dist/ssh/crc32.c
U basesrc/crypto/dist/ssh/crc32.h
C basesrc/crypto/dist/ssh/deattack.c
U basesrc/crypto/dist/ssh/deattack.h
C basesrc/crypto/dist/ssh/dh.c
C basesrc/crypto/dist/ssh/dh.h
U basesrc/crypto/dist/ssh/dispatch.c
U basesrc/crypto/dist/ssh/dispatch.h
U basesrc/crypto/dist/ssh/getput.h
C basesrc/crypto/dist/ssh/groupaccess.c
C basesrc/crypto/dist/ssh/groupaccess.h
C basesrc/crypto/dist/ssh/hostfile.c
C basesrc/crypto/dist/ssh/hostfile.h
C basesrc/crypto/dist/ssh/includes.h
C basesrc/crypto/dist/ssh/kex.c
U basesrc/crypto/dist/ssh/kex.h
N basesrc/crypto/dist/ssh/kexdh.c
N basesrc/crypto/dist/ssh/kexgex.c
C basesrc/crypto/dist/ssh/key.c
U basesrc/crypto/dist/ssh/key.h
U basesrc/crypto/dist/ssh/log.c
C basesrc/crypto/dist/ssh/log.h
C basesrc/crypto/dist/ssh/mac.c
C basesrc/crypto/dist/ssh/mac.h
U basesrc/crypto/dist/ssh/match.c
U basesrc/crypto/dist/ssh/match.h
C basesrc/crypto/dist/ssh/misc.c
C basesrc/crypto/dist/ssh/misc.h
C basesrc/crypto/dist/ssh/mpaux.c
U basesrc/crypto/dist/ssh/mpaux.h
U basesrc/crypto/dist/ssh/myproposal.h
U basesrc/crypto/dist/ssh/nchan.c
U basesrc/crypto/dist/ssh/nchan.h
U basesrc/crypto/dist/ssh/nchan.ms
U basesrc/crypto/dist/ssh/nchan2.ms
C basesrc/crypto/dist/ssh/packet.c
U basesrc/crypto/dist/ssh/packet.h
C basesrc/crypto/dist/ssh/pathnames.h
C basesrc/crypto/dist/ssh/radix.c
C basesrc/crypto/dist/ssh/radix.h
C basesrc/crypto/dist/ssh/readconf.c
C basesrc/crypto/dist/ssh/readconf.h
C basesrc/crypto/dist/ssh/readpass.c
C basesrc/crypto/dist/ssh/readpass.h
C basesrc/crypto/dist/ssh/rijndael.c
C basesrc/crypto/dist/ssh/rijndael.h
U basesrc/crypto/dist/ssh/rsa.c
U basesrc/crypto/dist/ssh/rsa.h
U basesrc/crypto/dist/ssh/scp.1
C basesrc/crypto/dist/ssh/scp.c
C basesrc/crypto/dist/ssh/servconf.c
C basesrc/crypto/dist/ssh/servconf.h
C basesrc/crypto/dist/ssh/serverloop.c
C basesrc/crypto/dist/ssh/serverloop.h
C basesrc/crypto/dist/ssh/session.c
U basesrc/crypto/dist/ssh/session.h
C basesrc/crypto/dist/ssh/sftp-client.c
C basesrc/crypto/dist/ssh/sftp-client.h
C basesrc/crypto/dist/ssh/sftp-glob.c
C basesrc/crypto/dist/ssh/sftp-common.c
C basesrc/crypto/dist/ssh/sftp-common.h
U basesrc/crypto/dist/ssh/sftp-glob.h
C basesrc/crypto/dist/ssh/sftp-int.c
C basesrc/crypto/dist/ssh/sftp-int.h
U basesrc/crypto/dist/ssh/sftp-server.8
C basesrc/crypto/dist/ssh/sftp-server.c
C basesrc/crypto/dist/ssh/sftp.1
C basesrc/crypto/dist/ssh/sftp.c
C basesrc/crypto/dist/ssh/sftp.h
C basesrc/crypto/dist/ssh/ssh-add.1
C basesrc/crypto/dist/ssh/ssh-add.c
C basesrc/crypto/dist/ssh/ssh-agent.1
C basesrc/crypto/dist/ssh/ssh-agent.c
C basesrc/crypto/dist/ssh/ssh-dss.c
C basesrc/crypto/dist/ssh/ssh-dss.h
C basesrc/crypto/dist/ssh/ssh-keygen.1
C basesrc/crypto/dist/ssh/ssh-keygen.c
C basesrc/crypto/dist/ssh/ssh-keyscan.1
C basesrc/crypto/dist/ssh/ssh-keyscan.c
C basesrc/crypto/dist/ssh/ssh-rsa.c
C basesrc/crypto/dist/ssh/ssh-rsa.h
C basesrc/crypto/dist/ssh/ssh.1
C basesrc/crypto/dist/ssh/ssh.c
C basesrc/crypto/dist/ssh/ssh.h
C basesrc/crypto/dist/ssh/ssh1.h
U basesrc/crypto/dist/ssh/ssh2.h
C basesrc/crypto/dist/ssh/ssh_config
C basesrc/crypto/dist/ssh/sshconnect.c
U basesrc/crypto/dist/ssh/sshconnect.h
C basesrc/crypto/dist/ssh/sshconnect1.c
C basesrc/crypto/dist/ssh/sshconnect2.c
C basesrc/crypto/dist/ssh/sshd.8
C basesrc/crypto/dist/ssh/sshd.c
C basesrc/crypto/dist/ssh/sshd_config
U basesrc/crypto/dist/ssh/sshlogin.c
U basesrc/crypto/dist/ssh/sshlogin.h
U basesrc/crypto/dist/ssh/sshpty.c
U basesrc/crypto/dist/ssh/sshpty.h
C basesrc/crypto/dist/ssh/tildexpand.c
C basesrc/crypto/dist/ssh/tildexpand.h
U basesrc/crypto/dist/ssh/ttymodes.c
U basesrc/crypto/dist/ssh/ttymodes.h
U basesrc/crypto/dist/ssh/uidswap.c
U basesrc/crypto/dist/ssh/uidswap.h
C basesrc/crypto/dist/ssh/uuencode.c
U basesrc/crypto/dist/ssh/uuencode.h
C basesrc/crypto/dist/ssh/version.h
C basesrc/crypto/dist/ssh/xmalloc.c
U basesrc/crypto/dist/ssh/xmalloc.h

93 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jOPENSSH:yesterday -jOPENSSH basesrc/crypto/dist/ssh