CVS commit: src/crypto/dist/ssh

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

Module Name:    src
Committed By:   christos
Date:           Tue Dec 18 02:35:33 UTC 2007

Modified Files:
        src/crypto/dist/ssh: atomicio.c auth-pam.c auth2.c bufbn.c channels.c
            channels.h clientloop.c clientloop.h gss-genr.c gss-serv.c kex.c
            kex.h key.c log.c mac.c mac.h monitor.c monitor_wrap.c myproposal.h
            packet.c readconf.c scp.1 scp.c servconf.c sftp-server.8
            sftp-server.c sftp.1 ssh-add.1 ssh-agent.1 ssh-agent.c ssh-gss.h
            ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh.1 ssh.c ssh_config
            ssh_config.5 sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5
            umac.c version.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 src/crypto/dist/ssh/atomicio.c \
    src/crypto/dist/ssh/auth-pam.c src/crypto/dist/ssh/log.c \
    src/crypto/dist/ssh/mac.c
cvs rdiff -r1.29 -r1.30 src/crypto/dist/ssh/auth2.c \
    src/crypto/dist/ssh/ssh-agent.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/ssh/bufbn.c src/crypto/dist/ssh/kex.h \
    src/crypto/dist/ssh/myproposal.h src/crypto/dist/ssh/scp.1
cvs rdiff -r1.36 -r1.37 src/crypto/dist/ssh/channels.c
cvs rdiff -r1.15 -r1.16 src/crypto/dist/ssh/channels.h \
    src/crypto/dist/ssh/ssh-keyscan.1
cvs rdiff -r1.31 -r1.32 src/crypto/dist/ssh/clientloop.c \
    src/crypto/dist/ssh/scp.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/ssh/clientloop.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/ssh/gss-genr.c \
    src/crypto/dist/ssh/gss-serv.c src/crypto/dist/ssh/mac.h
cvs rdiff -r1.22 -r1.23 src/crypto/dist/ssh/kex.c
cvs rdiff -r1.25 -r1.26 src/crypto/dist/ssh/key.c \
    src/crypto/dist/ssh/monitor.c src/crypto/dist/ssh/sftp-server.c
cvs rdiff -r1.18 -r1.19 src/crypto/dist/ssh/monitor_wrap.c
cvs rdiff -r1.27 -r1.28 src/crypto/dist/ssh/packet.c
cvs rdiff -r1.32 -r1.33 src/crypto/dist/ssh/readconf.c
cvs rdiff -r1.38 -r1.39 src/crypto/dist/ssh/servconf.c \
    src/crypto/dist/ssh/ssh.c src/crypto/dist/ssh/version.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ssh/sftp-server.8 \
    src/crypto/dist/ssh/ssh-gss.h
cvs rdiff -r1.14 -r1.15 src/crypto/dist/ssh/sftp.1 \
    src/crypto/dist/ssh/ssh-add.1 src/crypto/dist/ssh/ssh_config.5
cvs rdiff -r1.17 -r1.18 src/crypto/dist/ssh/ssh-agent.1
cvs rdiff -r1.19 -r1.20 src/crypto/dist/ssh/ssh-keygen.1
cvs rdiff -r1.5 -r1.6 src/crypto/dist/ssh/ssh-keysign.8
cvs rdiff -r1.37 -r1.38 src/crypto/dist/ssh/ssh.1 src/crypto/dist/ssh/sshd.8
cvs rdiff -r1.12 -r1.13 src/crypto/dist/ssh/ssh_config \
    src/crypto/dist/ssh/sshd_config.5
cvs rdiff -r1.30 -r1.31 src/crypto/dist/ssh/sshconnect2.c
cvs rdiff -r1.41 -r1.42 src/crypto/dist/ssh/sshd.c
cvs rdiff -r1.26 -r1.27 src/crypto/dist/ssh/sshd_config
cvs rdiff -r1.1.1.1 -r1.2 src/crypto/dist/ssh/umac.c

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