CVS commit: src/crypto/dist/ssh

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Mar 10 22:52:10 UTC 2007

Modified Files:
        src/crypto/dist/ssh: auth-rsa.c auth-skey.c auth2-chall.c auth2.c
            bufbn.c channels.c clientloop.c compat.c compat.h dh.c dns.c kex.c
            kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c misc.c moduli.c
            monitor.c monitor_wrap.c packet.c readconf.c rsa.c scard.c scp.c
            servconf.c servconf.h serverloop.c session.c sftp-client.c
            sftp-server.c sftp.c ssh-agent.c ssh-dss.c ssh-keygen.1
            ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh.1 ssh.c ssh_config.5
            sshconnect.c sshconnect1.c sshd.c sshd_config.5 version.h
Removed Files:
        src/crypto/dist/ssh: auth-krb4.c auth2-krb5.c includes.h moduli
            moduli.5 radix.c radix.h readpassphrase.3 readpassphrase.c
            readpassphrase.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.19 -r0 src/crypto/dist/ssh/auth-krb4.c \
    src/crypto/dist/ssh/radix.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ssh/auth-rsa.c
cvs rdiff -r1.11 -r1.12 src/crypto/dist/ssh/auth-skey.c \
    src/crypto/dist/ssh/sshd_config.5
cvs rdiff -r1.18 -r1.19 src/crypto/dist/ssh/auth2-chall.c \
    src/crypto/dist/ssh/misc.c src/crypto/dist/ssh/ssh-keygen.1
cvs rdiff -r1.8 -r0 src/crypto/dist/ssh/auth2-krb5.c \
    src/crypto/dist/ssh/readpassphrase.c
cvs rdiff -r1.28 -r1.29 src/crypto/dist/ssh/auth2.c \
    src/crypto/dist/ssh/serverloop.c src/crypto/dist/ssh/ssh-agent.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ssh/bufbn.c
cvs rdiff -r1.34 -r1.35 src/crypto/dist/ssh/channels.c
cvs rdiff -r1.30 -r1.31 src/crypto/dist/ssh/clientloop.c \
    src/crypto/dist/ssh/readconf.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ssh/compat.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ssh/compat.h src/crypto/dist/ssh/dns.c \
    src/crypto/dist/ssh/kexgexs.c
cvs rdiff -r1.15 -r1.16 src/crypto/dist/ssh/dh.c \
    src/crypto/dist/ssh/ssh-dss.c
cvs rdiff -r1.14 -r0 src/crypto/dist/ssh/includes.h
cvs rdiff -r1.21 -r1.22 src/crypto/dist/ssh/kex.c src/crypto/dist/ssh/sftp.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ssh/kexdhc.c \
    src/crypto/dist/ssh/kexdhs.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ssh/kexgexc.c
cvs rdiff -r1.24 -r1.25 src/crypto/dist/ssh/key.c \
    src/crypto/dist/ssh/monitor.c src/crypto/dist/ssh/sftp-server.c \
    src/crypto/dist/ssh/ssh-keyscan.c
cvs rdiff -r1.5 -r0 src/crypto/dist/ssh/moduli
cvs rdiff -r1.16 -r0 src/crypto/dist/ssh/moduli.5
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ssh/moduli.c src/crypto/dist/ssh/rsa.c
cvs rdiff -r1.16 -r1.17 src/crypto/dist/ssh/monitor_wrap.c
cvs rdiff -r1.26 -r1.27 src/crypto/dist/ssh/packet.c \
    src/crypto/dist/ssh/sftp-client.c
cvs rdiff -r1.9 -r0 src/crypto/dist/ssh/radix.h
cvs rdiff -r1.6 -r0 src/crypto/dist/ssh/readpassphrase.3 \
    src/crypto/dist/ssh/readpassphrase.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ssh/scard.c
cvs rdiff -r1.29 -r1.30 src/crypto/dist/ssh/scp.c
cvs rdiff -r1.37 -r1.38 src/crypto/dist/ssh/servconf.c \
    src/crypto/dist/ssh/ssh.c src/crypto/dist/ssh/version.h
cvs rdiff -r1.22 -r1.23 src/crypto/dist/ssh/servconf.h
cvs rdiff -r1.43 -r1.44 src/crypto/dist/ssh/session.c
cvs rdiff -r1.27 -r1.28 src/crypto/dist/ssh/ssh-keygen.c
cvs rdiff -r1.14 -r1.15 src/crypto/dist/ssh/ssh-keyscan.1
cvs rdiff -r1.36 -r1.37 src/crypto/dist/ssh/ssh.1 \
    src/crypto/dist/ssh/sshconnect.c
cvs rdiff -r1.13 -r1.14 src/crypto/dist/ssh/ssh_config.5
cvs rdiff -r1.31 -r1.32 src/crypto/dist/ssh/sshconnect1.c
cvs rdiff -r1.40 -r1.41 src/crypto/dist/ssh/sshd.c

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