CVS commit: src/crypto/dist/ssh

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

Module Name:    src
Committed By:   christos
Date:           Sun Apr  6 23:38:20 UTC 2008

Modified Files:
        src/crypto/dist/ssh: auth-bsdauth.c auth-options.c auth-options.h
            auth-pam.c auth-passwd.c auth.c auth.h auth1.c auth2-chall.c
            auth2-gss.c auth2-none.c auth2.c canohost.c channels.c clientloop.c
            dh.c misc.c misc.h monitor.c monitor_fdpass.c monitor_fdpass.h
            monitor_wrap.c packet.c packet.h readconf.c readconf.h scp.1 scp.c
            servconf.c servconf.h serverloop.c session.c sftp-client.c
            sftp-client.h sftp-server.c sftp.c sftp.h ssh-add.c ssh-agent.1
            ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh.1 ssh.c ssh_config.5
            sshconnect.c sshconnect.h sshconnect2.c sshd.8 sshd.c sshd_config
            sshd_config.5 sshlogin.c sshpty.c umac.c version.h
Removed Files:
        src/crypto/dist/ssh: auth-skey.c auth2-krb5.c includes.h moduli
            moduli.5 readpassphrase.3 readpassphrase.c readpassphrase.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ssh/auth-bsdauth.c \
    src/crypto/dist/ssh/auth-options.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ssh/auth-options.h \
    src/crypto/dist/ssh/auth2-gss.c src/crypto/dist/ssh/scp.1
cvs rdiff -r1.11 -r1.12 src/crypto/dist/ssh/auth-pam.c
cvs rdiff -r1.16 -r1.17 src/crypto/dist/ssh/auth-passwd.c \
    src/crypto/dist/ssh/dh.c
cvs rdiff -r1.12 -r0 src/crypto/dist/ssh/auth-skey.c
cvs rdiff -r1.26 -r1.27 src/crypto/dist/ssh/auth.c \
    src/crypto/dist/ssh/monitor.c src/crypto/dist/ssh/sftp-server.c
cvs rdiff -r1.21 -r1.22 src/crypto/dist/ssh/auth.h
cvs rdiff -r1.31 -r1.32 src/crypto/dist/ssh/auth1.c \
    src/crypto/dist/ssh/sshconnect2.c
cvs rdiff -r1.19 -r1.20 src/crypto/dist/ssh/auth2-chall.c \
    src/crypto/dist/ssh/monitor_wrap.c
cvs rdiff -r1.10 -r0 src/crypto/dist/ssh/auth2-krb5.c \
    src/crypto/dist/ssh/readpassphrase.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/ssh/auth2-none.c
cvs rdiff -r1.30 -r1.31 src/crypto/dist/ssh/auth2.c \
    src/crypto/dist/ssh/ssh-agent.c
cvs rdiff -r1.22 -r1.23 src/crypto/dist/ssh/canohost.c \
    src/crypto/dist/ssh/sftp.c
cvs rdiff -r1.38 -r1.39 src/crypto/dist/ssh/channels.c \
    src/crypto/dist/ssh/ssh.1
cvs rdiff -r1.32 -r1.33 src/crypto/dist/ssh/clientloop.c \
    src/crypto/dist/ssh/scp.c
cvs rdiff -r1.16 -r0 src/crypto/dist/ssh/includes.h
cvs rdiff -r1.20 -r1.21 src/crypto/dist/ssh/misc.c
cvs rdiff -r1.13 -r1.14 src/crypto/dist/ssh/misc.h
cvs rdiff -r1.7 -r0 src/crypto/dist/ssh/moduli
cvs rdiff -r1.18 -r0 src/crypto/dist/ssh/moduli.5
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ssh/monitor_fdpass.c \
    src/crypto/dist/ssh/sftp.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ssh/monitor_fdpass.h
cvs rdiff -r1.28 -r1.29 src/crypto/dist/ssh/packet.c \
    src/crypto/dist/ssh/ssh-keygen.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/ssh/packet.h
cvs rdiff -r1.33 -r1.34 src/crypto/dist/ssh/readconf.c
cvs rdiff -r1.17 -r1.18 src/crypto/dist/ssh/readconf.h \
    src/crypto/dist/ssh/sshlogin.c
cvs rdiff -r1.8 -r0 src/crypto/dist/ssh/readpassphrase.3 \
    src/crypto/dist/ssh/readpassphrase.h
cvs rdiff -r1.39 -r1.40 src/crypto/dist/ssh/servconf.c \
    src/crypto/dist/ssh/sshd.8 src/crypto/dist/ssh/version.h
cvs rdiff -r1.23 -r1.24 src/crypto/dist/ssh/servconf.h
cvs rdiff -r1.29 -r1.30 src/crypto/dist/ssh/serverloop.c \
    src/crypto/dist/ssh/sshd_config
cvs rdiff -r1.46 -r1.47 src/crypto/dist/ssh/session.c
cvs rdiff -r1.27 -r1.28 src/crypto/dist/ssh/sftp-client.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/ssh/sftp-client.h
cvs rdiff -r1.24 -r1.25 src/crypto/dist/ssh/ssh-add.c
cvs rdiff -r1.18 -r1.19 src/crypto/dist/ssh/ssh-agent.1
cvs rdiff -r1.25 -r1.26 src/crypto/dist/ssh/ssh-keyscan.c
cvs rdiff -r1.40 -r1.41 src/crypto/dist/ssh/ssh.c
cvs rdiff -r1.15 -r1.16 src/crypto/dist/ssh/ssh_config.5
cvs rdiff -r1.37 -r1.38 src/crypto/dist/ssh/sshconnect.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ssh/sshconnect.h \
    src/crypto/dist/ssh/umac.c
cvs rdiff -r1.42 -r1.43 src/crypto/dist/ssh/sshd.c
cvs rdiff -r1.14 -r1.15 src/crypto/dist/ssh/sshd_config.5
cvs rdiff -r1.12 -r1.13 src/crypto/dist/ssh/sshpty.c

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