Module Name:	src
Committed By:	christos
Date:		Sat Feb  4 22:32:14 UTC 2006

Modified Files:
	src/crypto/dist/ssh: atomicio.c atomicio.h auth-chall.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.c auth.h auth1.c
	    auth2-chall.c auth2-gss.c auth2.c authfd.c authfile.c bufaux.c
	    bufaux.h buffer.c buffer.h canohost.c channels.c channels.h
	    cipher-ctr.c cipher.c clientloop.c clientloop.h dns.c dns.h
	    getrrsetbyname.c getrrsetbyname.h gss-genr.c gss-serv-krb5.c
	    gss-serv.c hostfile.c includes.h kex.c kex.h kexdh.c kexdhc.c
	    kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c mac.c match.c misc.c
	    misc.h moduli.c monitor.c monitor_wrap.c msg.c myproposal.h
	    packet.c packet.h progressmeter.c readconf.c readconf.h readpass.c
	    scp.1 scp.c servconf.c servconf.h serverloop.c session.c session.h
	    sftp-client.c sftp-client.h sftp-common.h sftp-server.c sftp.1
	    sftp.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1
	    ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.c ssh-rsa.c
	    ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c sshconnect.h
	    sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5
	    version.h
Removed Files:
	src/crypto/dist/ssh: tildexpand.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ssh/atomicio.c \
    src/crypto/dist/ssh/auth-chall.c src/crypto/dist/ssh/buffer.c \
    src/crypto/dist/ssh/mac.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ssh/atomicio.h \
    src/crypto/dist/ssh/bufaux.c src/crypto/dist/ssh/clientloop.h
cvs rdiff -r1.15 -r1.16 src/crypto/dist/ssh/auth-krb5.c \
    src/crypto/dist/ssh/auth-rhosts.c src/crypto/dist/ssh/hostfile.c \
    src/crypto/dist/ssh/readconf.h src/crypto/dist/ssh/ssh-agent.1 \
    src/crypto/dist/ssh/ssh-rsa.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ssh/auth-options.c \
    src/crypto/dist/ssh/auth-rsa.c src/crypto/dist/ssh/progressmeter.c \
    src/crypto/dist/ssh/session.h src/crypto/dist/ssh/sftp-common.h
cvs rdiff -r1.1.1.8 -r1.2 src/crypto/dist/ssh/auth-options.h \
    src/crypto/dist/ssh/buffer.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ssh/auth-pam.c \
    src/crypto/dist/ssh/auth-rh-rsa.c src/crypto/dist/ssh/kexdhc.c \
    src/crypto/dist/ssh/kexdhs.c src/crypto/dist/ssh/packet.h
cvs rdiff -r1.14 -r1.15 src/crypto/dist/ssh/auth-passwd.c \
    src/crypto/dist/ssh/monitor_wrap.c src/crypto/dist/ssh/readpass.c
cvs rdiff -r1.22 -r1.23 src/crypto/dist/ssh/auth.c \
    src/crypto/dist/ssh/ssh-add.c src/crypto/dist/ssh/ssh-keyscan.c \
    src/crypto/dist/ssh/sshd_config
cvs rdiff -r1.19 -r1.20 src/crypto/dist/ssh/auth.h src/crypto/dist/ssh/kex.c \
    src/crypto/dist/ssh/monitor.c
cvs rdiff -r1.29 -r1.30 src/crypto/dist/ssh/auth1.c
cvs rdiff -r1.16 -r1.17 src/crypto/dist/ssh/auth2-chall.c \
    src/crypto/dist/ssh/misc.c src/crypto/dist/ssh/ssh-keygen.1
cvs rdiff -r1.1.1.2 -r1.2 src/crypto/dist/ssh/auth2-gss.c \
    src/crypto/dist/ssh/dns.h src/crypto/dist/ssh/gss-genr.c \
    src/crypto/dist/ssh/gss-serv.c
cvs rdiff -r1.26 -r1.27 src/crypto/dist/ssh/auth2.c \
    src/crypto/dist/ssh/readconf.c src/crypto/dist/ssh/sshconnect2.c
cvs rdiff -r1.17 -r1.18 src/crypto/dist/ssh/authfd.c \
    src/crypto/dist/ssh/cipher.c src/crypto/dist/ssh/sftp.c
cvs rdiff -r1.20 -r1.21 src/crypto/dist/ssh/authfile.c \
    src/crypto/dist/ssh/canohost.c src/crypto/dist/ssh/servconf.h
cvs rdiff -r1.1.1.10 -r1.2 src/crypto/dist/ssh/bufaux.h \
    src/crypto/dist/ssh/myproposal.h src/crypto/dist/ssh/sshconnect.h
cvs rdiff -r1.32 -r1.33 src/crypto/dist/ssh/channels.c \
    src/crypto/dist/ssh/servconf.c
cvs rdiff -r1.13 -r1.14 src/crypto/dist/ssh/channels.h \
    src/crypto/dist/ssh/sftp.1 src/crypto/dist/ssh/ssh-add.1 \
    src/crypto/dist/ssh/ssh-keyscan.1
cvs rdiff -r1.1.1.3 -r1.2 src/crypto/dist/ssh/cipher-ctr.c \
    src/crypto/dist/ssh/moduli.c
cvs rdiff -r1.28 -r1.29 src/crypto/dist/ssh/clientloop.c \
    src/crypto/dist/ssh/sshconnect1.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ssh/dns.c \
    src/crypto/dist/ssh/gss-serv-krb5.c src/crypto/dist/ssh/kexgexs.c
cvs rdiff -r1.1 -r1.2 src/crypto/dist/ssh/getrrsetbyname.c \
    src/crypto/dist/ssh/getrrsetbyname.h
cvs rdiff -r1.10 -r1.11 src/crypto/dist/ssh/includes.h \
    src/crypto/dist/ssh/kexgex.c src/crypto/dist/ssh/misc.h \
    src/crypto/dist/ssh/msg.c src/crypto/dist/ssh/ssh_config \
    src/crypto/dist/ssh/ssh_config.5
cvs rdiff -r1.1.1.15 -r1.2 src/crypto/dist/ssh/kex.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ssh/kexdh.c \
    src/crypto/dist/ssh/sftp-client.h src/crypto/dist/ssh/ssh-keysign.c \
    src/crypto/dist/ssh/sshd_config.5
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ssh/kexgexc.c \
    src/crypto/dist/ssh/match.c
cvs rdiff -r1.21 -r1.22 src/crypto/dist/ssh/key.c \
    src/crypto/dist/ssh/sftp-server.c
cvs rdiff -r1.23 -r1.24 src/crypto/dist/ssh/packet.c \
    src/crypto/dist/ssh/serverloop.c src/crypto/dist/ssh/ssh-keygen.c
cvs rdiff -r1.1.1.11 -r1.2 src/crypto/dist/ssh/scp.1
cvs rdiff -r1.27 -r1.28 src/crypto/dist/ssh/scp.c
cvs rdiff -r1.41 -r1.42 src/crypto/dist/ssh/session.c
cvs rdiff -r1.24 -r1.25 src/crypto/dist/ssh/sftp-client.c
cvs rdiff -r1.25 -r1.26 src/crypto/dist/ssh/ssh-agent.c
cvs rdiff -r1.33 -r1.34 src/crypto/dist/ssh/ssh.1
cvs rdiff -r1.35 -r1.36 src/crypto/dist/ssh/ssh.c src/crypto/dist/ssh/sshd.8
cvs rdiff -r1.31 -r1.32 src/crypto/dist/ssh/sshconnect.c
cvs rdiff -r1.38 -r1.39 src/crypto/dist/ssh/sshd.c
cvs rdiff -r1.9 -r0 src/crypto/dist/ssh/tildexpand.c
cvs rdiff -r1.34 -r1.35 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.