Module Name:	src
Committed By:	christos
Date:		Sun Feb 13 00:53:29 UTC 2005

Update of /cvsroot/src/crypto/dist/ssh
In directory ivanova.netbsd.org:/tmp/cvs-serv17276

Log Message:
from ftp.openbsd.org


Vendor Tag:	OPENSSH
Release Tags:	v39-20040816
		
N src/crypto/dist/ssh/date
C src/crypto/dist/ssh/LICENCE
N src/crypto/dist/ssh/README.dns
U src/crypto/dist/ssh/OVERVIEW
U src/crypto/dist/ssh/README
C src/crypto/dist/ssh/auth2-chall.c
C src/crypto/dist/ssh/README.smartcard
C src/crypto/dist/ssh/atomicio.c
C src/crypto/dist/ssh/atomicio.h
U src/crypto/dist/ssh/auth-bsdauth.c
C src/crypto/dist/ssh/auth-chall.c
C src/crypto/dist/ssh/auth-krb5.c
C src/crypto/dist/ssh/auth-options.c
U src/crypto/dist/ssh/auth-options.h
C src/crypto/dist/ssh/auth-passwd.c
C src/crypto/dist/ssh/auth-rh-rsa.c
C src/crypto/dist/ssh/auth-rhosts.c
C src/crypto/dist/ssh/auth-rsa.c
U src/crypto/dist/ssh/auth-skey.c
C src/crypto/dist/ssh/auth.c
C src/crypto/dist/ssh/auth.h
C src/crypto/dist/ssh/auth1.c
C src/crypto/dist/ssh/auth2.c
C src/crypto/dist/ssh/auth2-hostbased.c
N src/crypto/dist/ssh/auth2-gss.c
U src/crypto/dist/ssh/auth2-kbdint.c
C src/crypto/dist/ssh/auth2-none.c
C src/crypto/dist/ssh/auth2-passwd.c
C src/crypto/dist/ssh/auth2-pubkey.c
C src/crypto/dist/ssh/authfd.c
U src/crypto/dist/ssh/authfd.h
C src/crypto/dist/ssh/authfile.c
U src/crypto/dist/ssh/authfile.h
C src/crypto/dist/ssh/bufaux.c
U src/crypto/dist/ssh/bufaux.h
C src/crypto/dist/ssh/buffer.c
U src/crypto/dist/ssh/buffer.h
C src/crypto/dist/ssh/canohost.c
U src/crypto/dist/ssh/canohost.h
C src/crypto/dist/ssh/channels.c
C src/crypto/dist/ssh/channels.h
N src/crypto/dist/ssh/cipher-3des1.c
N src/crypto/dist/ssh/cipher-aes.c
U src/crypto/dist/ssh/crc32.c
N src/crypto/dist/ssh/cipher-bf1.c
N src/crypto/dist/ssh/cipher-ctr.c
U src/crypto/dist/ssh/crc32.h
C src/crypto/dist/ssh/cipher.c
U src/crypto/dist/ssh/cipher.h
N src/crypto/dist/ssh/cleanup.c
C src/crypto/dist/ssh/clientloop.c
C src/crypto/dist/ssh/clientloop.h
C src/crypto/dist/ssh/compat.c
U src/crypto/dist/ssh/compat.h
C src/crypto/dist/ssh/compress.c
U src/crypto/dist/ssh/compress.h
C src/crypto/dist/ssh/deattack.c
U src/crypto/dist/ssh/deattack.h
C src/crypto/dist/ssh/dh.c
C src/crypto/dist/ssh/dh.h
C src/crypto/dist/ssh/dispatch.c
U src/crypto/dist/ssh/dispatch.h
N src/crypto/dist/ssh/dns.c
N src/crypto/dist/ssh/dns.h
C src/crypto/dist/ssh/fatal.c
U src/crypto/dist/ssh/getput.h
C src/crypto/dist/ssh/groupaccess.c
U src/crypto/dist/ssh/groupaccess.h
N src/crypto/dist/ssh/gss-genr.c
N src/crypto/dist/ssh/gss-serv-krb5.c
N src/crypto/dist/ssh/gss-serv.c
C src/crypto/dist/ssh/hostfile.c
C src/crypto/dist/ssh/hostfile.h
C src/crypto/dist/ssh/includes.h
C src/crypto/dist/ssh/kex.c
U src/crypto/dist/ssh/kex.h
U src/crypto/dist/ssh/kexdh.c
C src/crypto/dist/ssh/kexdhc.c
C src/crypto/dist/ssh/kexdhs.c
U src/crypto/dist/ssh/kexgex.c
C src/crypto/dist/ssh/kexgexc.c
U src/crypto/dist/ssh/kexgexs.c
C src/crypto/dist/ssh/key.c
U src/crypto/dist/ssh/key.h
C src/crypto/dist/ssh/log.c
C src/crypto/dist/ssh/log.h
C src/crypto/dist/ssh/mac.c
U src/crypto/dist/ssh/mac.h
U src/crypto/dist/ssh/match.c
U src/crypto/dist/ssh/match.h
C src/crypto/dist/ssh/misc.c
C src/crypto/dist/ssh/misc.h
N src/crypto/dist/ssh/moduli.c
C src/crypto/dist/ssh/monitor.c
C src/crypto/dist/ssh/monitor.h
C src/crypto/dist/ssh/monitor_fdpass.c
U src/crypto/dist/ssh/monitor_fdpass.h
C src/crypto/dist/ssh/monitor_mm.c
U src/crypto/dist/ssh/monitor_mm.h
C src/crypto/dist/ssh/monitor_wrap.c
C src/crypto/dist/ssh/monitor_wrap.h
C src/crypto/dist/ssh/msg.c
C src/crypto/dist/ssh/msg.h
U src/crypto/dist/ssh/myproposal.h
C src/crypto/dist/ssh/nchan.c
U src/crypto/dist/ssh/nchan.ms
C src/crypto/dist/ssh/nchan2.ms
C src/crypto/dist/ssh/packet.c
C src/crypto/dist/ssh/packet.h
C src/crypto/dist/ssh/pathnames.h
C src/crypto/dist/ssh/progressmeter.c
U src/crypto/dist/ssh/progressmeter.h
C src/crypto/dist/ssh/readconf.c
C src/crypto/dist/ssh/readconf.h
C src/crypto/dist/ssh/readpass.c
C src/crypto/dist/ssh/rijndael.c
U src/crypto/dist/ssh/rijndael.h
U src/crypto/dist/ssh/rsa.c
U src/crypto/dist/ssh/rsa.h
C src/crypto/dist/ssh/scard.c
C src/crypto/dist/ssh/scard.h
U src/crypto/dist/ssh/scp.1
C src/crypto/dist/ssh/scp.c
C src/crypto/dist/ssh/servconf.c
C src/crypto/dist/ssh/servconf.h
C src/crypto/dist/ssh/serverloop.c
U src/crypto/dist/ssh/serverloop.h
C src/crypto/dist/ssh/session.c
C src/crypto/dist/ssh/session.h
C src/crypto/dist/ssh/sftp-client.c
C src/crypto/dist/ssh/sftp-client.h
C src/crypto/dist/ssh/sftp-common.c
C src/crypto/dist/ssh/sftp-common.h
C src/crypto/dist/ssh/sftp-glob.c
U src/crypto/dist/ssh/sftp-server.8
C src/crypto/dist/ssh/sftp-server.c
C src/crypto/dist/ssh/sftp.1
C src/crypto/dist/ssh/sftp.c
U src/crypto/dist/ssh/sftp.h
C src/crypto/dist/ssh/ssh-add.1
C src/crypto/dist/ssh/ssh-add.c
C src/crypto/dist/ssh/ssh-agent.1
C src/crypto/dist/ssh/ssh-agent.c
C src/crypto/dist/ssh/ssh-dss.c
N src/crypto/dist/ssh/ssh-gss.h
C src/crypto/dist/ssh/ssh-rsa.c
C src/crypto/dist/ssh/ssh-keygen.1
C src/crypto/dist/ssh/ssh-keygen.c
C src/crypto/dist/ssh/ssh-keyscan.1
C src/crypto/dist/ssh/ssh-keyscan.c
C src/crypto/dist/ssh/ssh-keysign.8
C src/crypto/dist/ssh/ssh-keysign.c
C src/crypto/dist/ssh/ssh.1
C src/crypto/dist/ssh/ssh.c
C src/crypto/dist/ssh/ssh.h
C src/crypto/dist/ssh/ssh1.h
U src/crypto/dist/ssh/ssh2.h
C src/crypto/dist/ssh/ssh_config
C src/crypto/dist/ssh/ssh_config.5
C src/crypto/dist/ssh/sshconnect.c
U src/crypto/dist/ssh/sshconnect.h
C src/crypto/dist/ssh/sshconnect1.c
C src/crypto/dist/ssh/sshconnect2.c
C src/crypto/dist/ssh/sshd.8
C src/crypto/dist/ssh/sshd.c
C src/crypto/dist/ssh/sshd_config
C src/crypto/dist/ssh/sshd_config.5
C src/crypto/dist/ssh/sshlogin.c
U src/crypto/dist/ssh/sshlogin.h
C src/crypto/dist/ssh/sshpty.c
C src/crypto/dist/ssh/sshpty.h
C src/crypto/dist/ssh/sshtty.c
C src/crypto/dist/ssh/tildexpand.c
C src/crypto/dist/ssh/ttymodes.c
U src/crypto/dist/ssh/ttymodes.h
C src/crypto/dist/ssh/uidswap.c
U src/crypto/dist/ssh/uidswap.h
C src/crypto/dist/ssh/uuencode.c
U src/crypto/dist/ssh/uuencode.h
C src/crypto/dist/ssh/version.h
U src/crypto/dist/ssh/xmalloc.c
U src/crypto/dist/ssh/xmalloc.h
U src/crypto/dist/ssh/scard/Ssh.bin.uu
U src/crypto/dist/ssh/scard/Makefile
U src/crypto/dist/ssh/scard/Ssh.java

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

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