Module Name:	src
Committed By:	christos
Date:		Sat Apr 23 16:53:29 UTC 2005

Modified Files:
	src/crypto/dist/ssh: LICENCE auth-bsdauth.c auth-options.c
	    auth-passwd.c auth-rsa.c auth.c auth2-chall.c auth2-pubkey.c
	    authfile.c bufaux.c buffer.c canohost.c channels.c channels.h
	    cipher.c clientloop.c clientloop.h compat.c compat.h hostfile.c
	    hostfile.h key.c misc.c misc.h monitor.c packet.c readconf.c
	    readconf.h readpass.c scp.c servconf.c servconf.h session.c
	    sftp-client.c sftp-client.h sftp.1 sftp.c ssh-add.1 ssh-agent.c
	    ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.c
	    ssh.1 ssh.c ssh.h ssh1.h ssh_config ssh_config.5 sshconnect.c
	    sshd.8 sshd.c sshd_config sshd_config.5 version.h
Removed Files:
	src/crypto/dist/ssh: auth-krb4.c auth2-krb5.c cipher-aes.c date moduli
	    moduli.5 radix.c radix.h readpassphrase.3 readpassphrase.c
	    readpassphrase.h rijndael.c rijndael.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ssh/LICENCE
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ssh/auth-bsdauth.c \
    src/crypto/dist/ssh/buffer.c src/crypto/dist/ssh/compat.c \
    src/crypto/dist/ssh/ssh1.h
cvs rdiff -r1.15 -r0 src/crypto/dist/ssh/auth-krb4.c \
    src/crypto/dist/ssh/radix.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ssh/auth-options.c \
    src/crypto/dist/ssh/auth-rsa.c src/crypto/dist/ssh/auth2-pubkey.c
cvs rdiff -r1.12 -r1.13 src/crypto/dist/ssh/auth-passwd.c \
    src/crypto/dist/ssh/channels.h src/crypto/dist/ssh/hostfile.c \
    src/crypto/dist/ssh/sftp.1 src/crypto/dist/ssh/ssh-add.1 \
    src/crypto/dist/ssh/ssh-keyscan.1
cvs rdiff -r1.21 -r1.22 src/crypto/dist/ssh/auth.c \
    src/crypto/dist/ssh/ssh-keyscan.c src/crypto/dist/ssh/sshd_config
cvs rdiff -r1.14 -r1.15 src/crypto/dist/ssh/auth2-chall.c \
    src/crypto/dist/ssh/readconf.h
cvs rdiff -r1.5 -r0 src/crypto/dist/ssh/auth2-krb5.c
cvs rdiff -r1.19 -r1.20 src/crypto/dist/ssh/authfile.c \
    src/crypto/dist/ssh/canohost.c src/crypto/dist/ssh/servconf.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ssh/bufaux.c \
    src/crypto/dist/ssh/clientloop.h
cvs rdiff -r1.31 -r1.32 src/crypto/dist/ssh/channels.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ssh/cipher-aes.c \
    src/crypto/dist/ssh/date
cvs rdiff -r1.16 -r1.17 src/crypto/dist/ssh/cipher.c \
    src/crypto/dist/ssh/sftp.c
cvs rdiff -r1.27 -r1.28 src/crypto/dist/ssh/clientloop.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ssh/compat.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ssh/hostfile.h \
    src/crypto/dist/ssh/misc.h src/crypto/dist/ssh/ssh_config \
    src/crypto/dist/ssh/ssh_config.5
cvs rdiff -r1.20 -r1.21 src/crypto/dist/ssh/key.c
cvs rdiff -r1.15 -r1.16 src/crypto/dist/ssh/misc.c \
    src/crypto/dist/ssh/ssh-keygen.1
cvs rdiff -r1.3 -r0 src/crypto/dist/ssh/moduli \
    src/crypto/dist/ssh/readpassphrase.h
cvs rdiff -r1.11 -r0 src/crypto/dist/ssh/moduli.5
cvs rdiff -r1.18 -r1.19 src/crypto/dist/ssh/monitor.c
cvs rdiff -r1.22 -r1.23 src/crypto/dist/ssh/packet.c \
    src/crypto/dist/ssh/sftp-client.c src/crypto/dist/ssh/ssh-keygen.c
cvs rdiff -r1.7 -r0 src/crypto/dist/ssh/radix.h
cvs rdiff -r1.23 -r1.24 src/crypto/dist/ssh/readconf.c
cvs rdiff -r1.13 -r1.14 src/crypto/dist/ssh/readpass.c \
    src/crypto/dist/ssh/ssh.h
cvs rdiff -r1.4 -r0 src/crypto/dist/ssh/readpassphrase.3 \
    src/crypto/dist/ssh/readpassphrase.c
cvs rdiff -r1.6 -r0 src/crypto/dist/ssh/rijndael.c \
    src/crypto/dist/ssh/rijndael.h
cvs rdiff -r1.25 -r1.26 src/crypto/dist/ssh/scp.c
cvs rdiff -r1.30 -r1.31 src/crypto/dist/ssh/servconf.c \
    src/crypto/dist/ssh/ssh.1 src/crypto/dist/ssh/sshconnect.c
cvs rdiff -r1.39 -r1.40 src/crypto/dist/ssh/session.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ssh/sftp-client.h \
    src/crypto/dist/ssh/ssh-keysign.c src/crypto/dist/ssh/sshd_config.5
cvs rdiff -r1.24 -r1.25 src/crypto/dist/ssh/ssh-agent.c
cvs rdiff -r1.32 -r1.33 src/crypto/dist/ssh/ssh.c
cvs rdiff -r1.34 -r1.35 src/crypto/dist/ssh/sshd.8
cvs rdiff -r1.37 -r1.38 src/crypto/dist/ssh/sshd.c
cvs rdiff -r1.33 -r1.34 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.