Module Name:	src
Committed By:	christos
Date:		Sun Feb 13 05:57:27 UTC 2005

Modified Files:
	src/crypto/dist/ssh: LICENCE README.smartcard atomicio.c atomicio.h
	    auth-chall.c auth-krb5.c auth-options.c auth-passwd.c auth-rh-rsa.c
	    auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c
	    auth2-hostbased.c auth2-none.c auth2-passwd.c auth2-pubkey.c
	    auth2.c authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c
	    channels.h cipher.c clientloop.c clientloop.h compat.c compress.c
	    deattack.c dh.c dh.h dispatch.c dns.c fatal.c groupaccess.c
	    hostfile.c hostfile.h includes.h kex.c kexdhc.c kexdhs.c kexgexc.c
	    key.c log.c log.h mac.c misc.c misc.h monitor.c monitor.h
	    monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c
	    monitor_wrap.h msg.c msg.h nchan.c nchan2.ms packet.c packet.h
	    pathnames.h progressmeter.c readconf.c readconf.h rijndael.c
	    scard.c scard.h scp.c servconf.c servconf.h serverloop.c session.c
	    session.h sftp-client.c sftp-client.h sftp-common.c sftp-common.h
	    sftp-glob.c sftp-server.c sftp.1 sftp.c ssh-add.1 ssh-add.c
	    ssh-agent.1 ssh-agent.c ssh-dss.c ssh-keygen.1 ssh-keygen.c
	    ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-rsa.c
	    ssh.1 ssh.c ssh.h ssh1.h ssh_config ssh_config.5 sshconnect.c
	    sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5
	    sshlogin.c sshpty.c sshpty.h sshtty.c tildexpand.c ttymodes.c
	    uuencode.c version.h
Removed Files:
	src/crypto/dist/ssh: RFC.nroff auth-krb4.c auth2-krb5.c moduli moduli.5
	    mpaux.c mpaux.h radix.c radix.h readpass.h readpassphrase.3
	    readpassphrase.c readpassphrase.h sftp-glob.h sftp-int.c sftp-int.h
	    sshtty.h tildexpand.h tree.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ssh/LICENCE \
    src/crypto/dist/ssh/README.smartcard src/crypto/dist/ssh/fatal.c \
    src/crypto/dist/ssh/kexdhc.c src/crypto/dist/ssh/kexdhs.c \
    src/crypto/dist/ssh/kexgexc.c src/crypto/dist/ssh/monitor_mm.h \
    src/crypto/dist/ssh/msg.h src/crypto/dist/ssh/scard.h \
    src/crypto/dist/ssh/sshtty.c
cvs rdiff -r1.1.1.2 -r0 src/crypto/dist/ssh/RFC.nroff
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ssh/atomicio.c \
    src/crypto/dist/ssh/auth-chall.c src/crypto/dist/ssh/groupaccess.c \
    src/crypto/dist/ssh/mac.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ssh/atomicio.h \
    src/crypto/dist/ssh/buffer.c src/crypto/dist/ssh/monitor.h \
    src/crypto/dist/ssh/monitor_wrap.h src/crypto/dist/ssh/rijndael.c \
    src/crypto/dist/ssh/ssh1.h
cvs rdiff -r1.13 -r0 src/crypto/dist/ssh/auth-krb4.c \
    src/crypto/dist/ssh/radix.c
cvs rdiff -r1.14 -r1.15 src/crypto/dist/ssh/auth-krb5.c \
    src/crypto/dist/ssh/auth-rhosts.c src/crypto/dist/ssh/misc.c \
    src/crypto/dist/ssh/ssh-agent.1 src/crypto/dist/ssh/ssh-keygen.1 \
    src/crypto/dist/ssh/ssh-rsa.c src/crypto/dist/ssh/sshlogin.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ssh/auth-options.c \
    src/crypto/dist/ssh/auth-rh-rsa.c src/crypto/dist/ssh/auth-rsa.c \
    src/crypto/dist/ssh/auth2-hostbased.c src/crypto/dist/ssh/auth2-passwd.c \
    src/crypto/dist/ssh/auth2-pubkey.c src/crypto/dist/ssh/dh.h \
    src/crypto/dist/ssh/dispatch.c src/crypto/dist/ssh/monitor_fdpass.c \
    src/crypto/dist/ssh/nchan.c src/crypto/dist/ssh/nchan2.ms \
    src/crypto/dist/ssh/packet.h src/crypto/dist/ssh/ssh-keysign.8 \
    src/crypto/dist/ssh/sshpty.h src/crypto/dist/ssh/ttymodes.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/ssh/auth-passwd.c \
    src/crypto/dist/ssh/sftp-common.c src/crypto/dist/ssh/sshpty.c
cvs rdiff -r1.20 -r1.21 src/crypto/dist/ssh/auth.c \
    src/crypto/dist/ssh/sftp-server.c src/crypto/dist/ssh/ssh-keyscan.c
cvs rdiff -r1.16 -r1.17 src/crypto/dist/ssh/auth.h \
    src/crypto/dist/ssh/authfd.c src/crypto/dist/ssh/servconf.h
cvs rdiff -r1.25 -r1.26 src/crypto/dist/ssh/auth1.c
cvs rdiff -r1.12 -r1.13 src/crypto/dist/ssh/auth2-chall.c \
    src/crypto/dist/ssh/dh.c src/crypto/dist/ssh/monitor_wrap.c \
    src/crypto/dist/ssh/ssh.h
cvs rdiff -r1.3 -r0 src/crypto/dist/ssh/auth2-krb5.c \
    src/crypto/dist/ssh/tildexpand.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ssh/auth2-none.c \
    src/crypto/dist/ssh/bufaux.c src/crypto/dist/ssh/clientloop.h \
    src/crypto/dist/ssh/compat.c src/crypto/dist/ssh/monitor_mm.c \
    src/crypto/dist/ssh/progressmeter.c src/crypto/dist/ssh/session.h \
    src/crypto/dist/ssh/sftp-common.h
cvs rdiff -r1.23 -r1.24 src/crypto/dist/ssh/auth2.c \
    src/crypto/dist/ssh/ssh-agent.c
cvs rdiff -r1.18 -r1.19 src/crypto/dist/ssh/authfile.c \
    src/crypto/dist/ssh/canohost.c src/crypto/dist/ssh/kex.c
cvs rdiff -r1.30 -r1.31 src/crypto/dist/ssh/channels.c \
    src/crypto/dist/ssh/ssh.c
cvs rdiff -r1.11 -r1.12 src/crypto/dist/ssh/channels.h \
    src/crypto/dist/ssh/hostfile.c src/crypto/dist/ssh/sftp-glob.c \
    src/crypto/dist/ssh/sftp.1 src/crypto/dist/ssh/ssh-add.1 \
    src/crypto/dist/ssh/ssh-keyscan.1
cvs rdiff -r1.15 -r1.16 src/crypto/dist/ssh/cipher.c \
    src/crypto/dist/ssh/monitor.c src/crypto/dist/ssh/sftp.c
cvs rdiff -r1.26 -r1.27 src/crypto/dist/ssh/clientloop.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ssh/compress.c \
    src/crypto/dist/ssh/hostfile.h src/crypto/dist/ssh/log.h \
    src/crypto/dist/ssh/misc.h src/crypto/dist/ssh/ssh_config \
    src/crypto/dist/ssh/ssh_config.5 src/crypto/dist/ssh/uuencode.c
cvs rdiff -r1.13 -r1.14 src/crypto/dist/ssh/deattack.c \
    src/crypto/dist/ssh/pathnames.h src/crypto/dist/ssh/readconf.h \
    src/crypto/dist/ssh/ssh-dss.c
cvs rdiff -r1.1.1.1 -r1.2 src/crypto/dist/ssh/dns.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ssh/includes.h \
    src/crypto/dist/ssh/log.c src/crypto/dist/ssh/scard.c \
    src/crypto/dist/ssh/sftp-client.h src/crypto/dist/ssh/ssh-keysign.c \
    src/crypto/dist/ssh/sshd_config.5 src/crypto/dist/ssh/tildexpand.c
cvs rdiff -r1.19 -r1.20 src/crypto/dist/ssh/key.c \
    src/crypto/dist/ssh/sshd_config
cvs rdiff -r1.1.1.3 -r0 src/crypto/dist/ssh/moduli
cvs rdiff -r1.9 -r0 src/crypto/dist/ssh/moduli.5
cvs rdiff -r1.5 -r0 src/crypto/dist/ssh/mpaux.c src/crypto/dist/ssh/radix.h \
    src/crypto/dist/ssh/readpass.h
cvs rdiff -r1.1.1.6 -r0 src/crypto/dist/ssh/mpaux.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ssh/msg.c
cvs rdiff -r1.21 -r1.22 src/crypto/dist/ssh/packet.c \
    src/crypto/dist/ssh/readconf.c src/crypto/dist/ssh/sftp-client.c \
    src/crypto/dist/ssh/ssh-add.c src/crypto/dist/ssh/ssh-keygen.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ssh/readpassphrase.3 \
    src/crypto/dist/ssh/readpassphrase.h src/crypto/dist/ssh/tree.h
cvs rdiff -r1.2 -r0 src/crypto/dist/ssh/readpassphrase.c \
    src/crypto/dist/ssh/sshtty.h
cvs rdiff -r1.24 -r1.25 src/crypto/dist/ssh/scp.c \
    src/crypto/dist/ssh/sshconnect2.c
cvs rdiff -r1.27 -r1.28 src/crypto/dist/ssh/servconf.c \
    src/crypto/dist/ssh/sshconnect1.c
cvs rdiff -r1.22 -r1.23 src/crypto/dist/ssh/serverloop.c
cvs rdiff -r1.36 -r1.37 src/crypto/dist/ssh/session.c
cvs rdiff -r1.6 -r0 src/crypto/dist/ssh/sftp-glob.h \
    src/crypto/dist/ssh/sftp-int.h
cvs rdiff -r1.18 -r0 src/crypto/dist/ssh/sftp-int.c
cvs rdiff -r1.28 -r1.29 src/crypto/dist/ssh/ssh.1
cvs rdiff -r1.29 -r1.30 src/crypto/dist/ssh/sshconnect.c
cvs rdiff -r1.33 -r1.34 src/crypto/dist/ssh/sshd.8
cvs rdiff -r1.34 -r1.35 src/crypto/dist/ssh/sshd.c
cvs rdiff -r1.32 -r1.33 src/crypto/dist/ssh/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.