Module Name:	src
Committed By:	christos
Date:		Thu Sep 28 21:22:15 UTC 2006

Modified Files:
	src/crypto/dist/ssh: atomicio.c atomicio.h auth-bsdauth.c auth-chall.c
	    auth-krb4.c auth-krb5.c auth-options.c auth-options.h auth-pam.c
	    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-krb5.c auth2-none.c auth2-passwd.c
	    auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c authfile.h
	    bufaux.c bufbn.c buffer.c buffer.h canohost.c canohost.h channels.c
	    channels.h cipher-3des1.c cipher-bf1.c cipher-ctr.c cipher.c
	    cipher.h cleanup.c clientloop.c clientloop.h compat.c compat.h
	    compress.c compress.h crc32.c crc32.h deattack.c deattack.h dh.c
	    dh.h dispatch.c dispatch.h dns.c dns.h fatal.c getpeereid.c
	    getrrsetbyname.c groupaccess.c groupaccess.h gss-genr.c
	    gss-serv-krb5.c gss-serv.c hostfile.c hostfile.h 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 mac.h match.c match.h md-sha256.c misc.c misc.h
	    moduli.c monitor.c monitor.h monitor_fdpass.c monitor_fdpass.h
	    monitor_mm.c monitor_mm.h monitor_wrap.c monitor_wrap.h msg.c msg.h
	    myproposal.h namespace.h nchan.c packet.c packet.h pathnames.h
	    progressmeter.c progressmeter.h radix.c random.c readconf.c
	    readconf.h readpass.c readpassphrase.c rsa.c rsa.h scard.c scard.h
	    scp.1 scp.c servconf.c servconf.h serverloop.c serverloop.h
	    session.c session.h sftp-client.c sftp-common.c sftp-common.h
	    sftp-glob.c sftp-server.8 sftp-server.c sftp.c sftp.h ssh-add.c
	    ssh-agent.1 ssh-agent.c ssh-dss.c ssh-gss.h ssh-keygen.c
	    ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-rsa.c ssh.1 ssh.c
	    ssh.h ssh1.h ssh2.h ssh_config ssh_config.5 sshconnect.c
	    sshconnect.h sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config
	    sshd_config.5 sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c
	    strtonum.c ttymodes.c ttymodes.h uidswap.c uidswap.h uuencode.c
	    uuencode.h version.h xmalloc.c xmalloc.h
Removed Files:
	src/crypto/dist/ssh: README.dns README.tun bufaux.h getput.h includes.h

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ssh/README.dns \
    src/crypto/dist/ssh/README.tun
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ssh/atomicio.c \
    src/crypto/dist/ssh/auth-chall.c src/crypto/dist/ssh/bufaux.c \
    src/crypto/dist/ssh/buffer.c src/crypto/dist/ssh/log.c \
    src/crypto/dist/ssh/mac.c src/crypto/dist/ssh/scard.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ssh/atomicio.h \
    src/crypto/dist/ssh/auth-bsdauth.c src/crypto/dist/ssh/auth2-krb5.c \
    src/crypto/dist/ssh/clientloop.h src/crypto/dist/ssh/compat.c \
    src/crypto/dist/ssh/groupaccess.c src/crypto/dist/ssh/monitor.h \
    src/crypto/dist/ssh/monitor_wrap.h src/crypto/dist/ssh/readpassphrase.c \
    src/crypto/dist/ssh/ssh1.h src/crypto/dist/ssh/xmalloc.c
cvs rdiff -r1.18 -r1.19 src/crypto/dist/ssh/auth-krb4.c \
    src/crypto/dist/ssh/authfd.c src/crypto/dist/ssh/cipher.c \
    src/crypto/dist/ssh/radix.c
cvs rdiff -r1.16 -r1.17 src/crypto/dist/ssh/auth-krb5.c \
    src/crypto/dist/ssh/auth-rhosts.c src/crypto/dist/ssh/readconf.h \
    src/crypto/dist/ssh/ssh-agent.1 src/crypto/dist/ssh/ssh-rsa.c \
    src/crypto/dist/ssh/sshlogin.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ssh/auth-options.c \
    src/crypto/dist/ssh/auth-pam.c src/crypto/dist/ssh/auth-rsa.c \
    src/crypto/dist/ssh/auth2-none.c src/crypto/dist/ssh/progressmeter.c \
    src/crypto/dist/ssh/session.h src/crypto/dist/ssh/sftp-common.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ssh/auth-options.h \
    src/crypto/dist/ssh/auth2-kbdint.c src/crypto/dist/ssh/buffer.h \
    src/crypto/dist/ssh/cipher-ctr.c src/crypto/dist/ssh/deattack.h \
    src/crypto/dist/ssh/dns.h src/crypto/dist/ssh/getpeereid.c \
    src/crypto/dist/ssh/getrrsetbyname.c src/crypto/dist/ssh/kex.h \
    src/crypto/dist/ssh/moduli.c src/crypto/dist/ssh/myproposal.h \
    src/crypto/dist/ssh/namespace.h src/crypto/dist/ssh/rsa.c \
    src/crypto/dist/ssh/scp.1 src/crypto/dist/ssh/sshconnect.h
cvs rdiff -r1.15 -r1.16 src/crypto/dist/ssh/auth-passwd.c \
    src/crypto/dist/ssh/deattack.c src/crypto/dist/ssh/monitor_wrap.c \
    src/crypto/dist/ssh/readpass.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ssh/auth-rh-rsa.c \
    src/crypto/dist/ssh/auth2-pubkey.c src/crypto/dist/ssh/kexdhc.c \
    src/crypto/dist/ssh/kexdhs.c src/crypto/dist/ssh/monitor_mm.c \
    src/crypto/dist/ssh/packet.h src/crypto/dist/ssh/random.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/ssh/auth-skey.c \
    src/crypto/dist/ssh/hostfile.h src/crypto/dist/ssh/kexdh.c \
    src/crypto/dist/ssh/sshd_config.5
cvs rdiff -r1.23 -r1.24 src/crypto/dist/ssh/auth.c src/crypto/dist/ssh/key.c \
    src/crypto/dist/ssh/ssh-add.c src/crypto/dist/ssh/ssh-keyscan.c \
    src/crypto/dist/ssh/sshd_config
cvs rdiff -r1.20 -r1.21 src/crypto/dist/ssh/auth.h src/crypto/dist/ssh/kex.c \
    src/crypto/dist/ssh/sftp.c
cvs rdiff -r1.30 -r1.31 src/crypto/dist/ssh/auth1.c \
    src/crypto/dist/ssh/sshconnect1.c
cvs rdiff -r1.17 -r1.18 src/crypto/dist/ssh/auth2-chall.c \
    src/crypto/dist/ssh/hostfile.c src/crypto/dist/ssh/misc.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ssh/auth2-gss.c \
    src/crypto/dist/ssh/compat.h src/crypto/dist/ssh/dns.c \
    src/crypto/dist/ssh/fatal.c src/crypto/dist/ssh/groupaccess.h \
    src/crypto/dist/ssh/gss-genr.c src/crypto/dist/ssh/gss-serv-krb5.c \
    src/crypto/dist/ssh/gss-serv.c src/crypto/dist/ssh/kexgexs.c \
    src/crypto/dist/ssh/mac.h src/crypto/dist/ssh/monitor_mm.h \
    src/crypto/dist/ssh/msg.h src/crypto/dist/ssh/scard.h \
    src/crypto/dist/ssh/serverloop.h src/crypto/dist/ssh/sshlogin.h \
    src/crypto/dist/ssh/sshtty.c src/crypto/dist/ssh/uidswap.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ssh/auth2-hostbased.c \
    src/crypto/dist/ssh/auth2-passwd.c src/crypto/dist/ssh/canohost.h \
    src/crypto/dist/ssh/dh.h src/crypto/dist/ssh/dispatch.c \
    src/crypto/dist/ssh/kexgexc.c src/crypto/dist/ssh/match.c \
    src/crypto/dist/ssh/monitor_fdpass.c src/crypto/dist/ssh/nchan.c \
    src/crypto/dist/ssh/sftp.h src/crypto/dist/ssh/ssh-keysign.8 \
    src/crypto/dist/ssh/sshpty.h src/crypto/dist/ssh/ttymodes.c
cvs rdiff -r1.27 -r1.28 src/crypto/dist/ssh/auth2.c \
    src/crypto/dist/ssh/serverloop.c src/crypto/dist/ssh/ssh-agent.c
cvs rdiff -r1.1.1.12 -r1.2 src/crypto/dist/ssh/authfd.h \
    src/crypto/dist/ssh/key.h
cvs rdiff -r1.21 -r1.22 src/crypto/dist/ssh/authfile.c \
    src/crypto/dist/ssh/canohost.c src/crypto/dist/ssh/monitor.c \
    src/crypto/dist/ssh/servconf.h
cvs rdiff -r1.1.1.8 -r1.2 src/crypto/dist/ssh/authfile.h \
    src/crypto/dist/ssh/ttymodes.h src/crypto/dist/ssh/uuencode.h
cvs rdiff -r1.2 -r0 src/crypto/dist/ssh/bufaux.h
cvs rdiff -r1.1.1.1 -r1.2 src/crypto/dist/ssh/bufbn.c \
    src/crypto/dist/ssh/md-sha256.c
cvs rdiff -r1.33 -r1.34 src/crypto/dist/ssh/channels.c
cvs rdiff -r1.14 -r1.15 src/crypto/dist/ssh/channels.h \
    src/crypto/dist/ssh/dh.c src/crypto/dist/ssh/pathnames.h \
    src/crypto/dist/ssh/ssh-dss.c src/crypto/dist/ssh/ssh.h
cvs rdiff -r1.1.1.2 -r1.2 src/crypto/dist/ssh/cipher-3des1.c \
    src/crypto/dist/ssh/cipher-bf1.c src/crypto/dist/ssh/cleanup.c \
    src/crypto/dist/ssh/monitor_fdpass.h src/crypto/dist/ssh/progressmeter.h \
    src/crypto/dist/ssh/ssh-gss.h
cvs rdiff -r1.1.1.10 -r1.2 src/crypto/dist/ssh/cipher.h
cvs rdiff -r1.29 -r1.30 src/crypto/dist/ssh/clientloop.c \
    src/crypto/dist/ssh/readconf.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ssh/compress.c \
    src/crypto/dist/ssh/log.h src/crypto/dist/ssh/uuencode.c
cvs rdiff -r1.1.1.7 -r1.2 src/crypto/dist/ssh/compress.h \
    src/crypto/dist/ssh/rsa.h src/crypto/dist/ssh/ssh2.h \
    src/crypto/dist/ssh/xmalloc.h
cvs rdiff -r1.1.1.6 -r1.2 src/crypto/dist/ssh/crc32.c \
    src/crypto/dist/ssh/dispatch.h
cvs rdiff -r1.1.1.9 -r1.2 src/crypto/dist/ssh/crc32.h \
    src/crypto/dist/ssh/match.h src/crypto/dist/ssh/sftp-server.8
cvs rdiff -r1.1.1.5 -r0 src/crypto/dist/ssh/getput.h
cvs rdiff -r1.12 -r0 src/crypto/dist/ssh/includes.h
cvs rdiff -r1.11 -r1.12 src/crypto/dist/ssh/kexgex.c \
    src/crypto/dist/ssh/misc.h src/crypto/dist/ssh/msg.c \
    src/crypto/dist/ssh/sftp-common.c src/crypto/dist/ssh/ssh-keysign.c \
    src/crypto/dist/ssh/ssh_config src/crypto/dist/ssh/sshpty.c
cvs rdiff -r1.25 -r1.26 src/crypto/dist/ssh/packet.c \
    src/crypto/dist/ssh/sftp-client.c
cvs rdiff -r1.28 -r1.29 src/crypto/dist/ssh/scp.c \
    src/crypto/dist/ssh/sshconnect2.c
cvs rdiff -r1.35 -r1.36 src/crypto/dist/ssh/servconf.c \
    src/crypto/dist/ssh/sshconnect.c src/crypto/dist/ssh/version.h
cvs rdiff -r1.42 -r1.43 src/crypto/dist/ssh/session.c
cvs rdiff -r1.12 -r1.13 src/crypto/dist/ssh/sftp-glob.c \
    src/crypto/dist/ssh/ssh_config.5
cvs rdiff -r1.22 -r1.23 src/crypto/dist/ssh/sftp-server.c
cvs rdiff -r1.24 -r1.25 src/crypto/dist/ssh/ssh-keygen.c
cvs rdiff -r1.34 -r1.35 src/crypto/dist/ssh/ssh.1
cvs rdiff -r1.36 -r1.37 src/crypto/dist/ssh/ssh.c src/crypto/dist/ssh/sshd.8
cvs rdiff -r1.39 -r1.40 src/crypto/dist/ssh/sshd.c
cvs rdiff -r1.1 -r1.2 src/crypto/dist/ssh/strtonum.c
cvs rdiff -r1.1.1.5 -r1.2 src/crypto/dist/ssh/uidswap.h

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