CVS commit: src/crypto/external/bsd/openssh

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

Module Name:    src
Committed By:   christos
Date:           Fri Nov  8 19:18:25 UTC 2013

Modified Files:
        src/crypto/external/bsd/openssh/dist: addrmatch.c auth-chall.c
            auth-krb5.c auth-options.c auth-pam.c auth-rsa.c auth.c auth.h
            auth1.c auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-jpake.c
            auth2-kbdint.c auth2-krb5.c auth2-passwd.c auth2-pubkey.c auth2.c
            authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c buffer.h
            canohost.c channels.c channels.h cipher-3des1.c cipher-ctr-mt.c
            cipher.c cipher.h clientloop.c clientloop.h compat.c dh.c dns.c
            fmt_scaled.c fmt_scaled.h groupaccess.c gss-genr.c gss-serv-krb5.c
            gss-serv.c hostfile.c hostfile.h jpake.c kex.c kex.h kexdhc.c
            kexdhs.c kexecdh.c kexecdhc.c kexecdhs.c kexgexc.c kexgexs.c key.c
            key.h krl.c log.c log.h mac.c mac.h match.c misc.c misc.h moduli.c
            monitor.c monitor_mm.c monitor_wrap.c mux.c namespace.h packet.c
            packet.h pathnames.h progressmeter.c readconf.c readconf.h
            readpass.c roaming_client.c roaming_common.c rsa.c schnorr.c scp.1
            scp.c servconf.c servconf.h serverloop.c session.c sftp-client.c
            sftp-client.h sftp-common.c sftp-glob.c sftp-server.8 sftp-server.c
            sftp.1 sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c
            ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8
            ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.8
            ssh-pkcs11-helper.c ssh-pkcs11.c ssh-rsa.c ssh.1 ssh.c ssh_config
            ssh_config.5 sshconnect.c sshconnect1.c sshconnect2.c sshd.8 sshd.c
            sshd_config sshd_config.5 umac.c umac.h uuencode.c version.h
            xmalloc.c xmalloc.h
        src/crypto/external/bsd/openssh/lib: Makefile shlib_version
Removed Files:
        src/crypto/external/bsd/openssh/dist: cipher-ctr.c

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/addrmatch.c \
    src/crypto/external/bsd/openssh/dist/auth2-gss.c \
    src/crypto/external/bsd/openssh/dist/auth2-jpake.c \
    src/crypto/external/bsd/openssh/dist/authfd.c \
    src/crypto/external/bsd/openssh/dist/canohost.c \
    src/crypto/external/bsd/openssh/dist/compat.c \
    src/crypto/external/bsd/openssh/dist/dh.c \
    src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c \
    src/crypto/external/bsd/openssh/dist/kexdhs.c \
    src/crypto/external/bsd/openssh/dist/kexgexs.c \
    src/crypto/external/bsd/openssh/dist/log.h \
    src/crypto/external/bsd/openssh/dist/misc.h \
    src/crypto/external/bsd/openssh/dist/moduli.c \
    src/crypto/external/bsd/openssh/dist/schnorr.c \
    src/crypto/external/bsd/openssh/dist/sftp-glob.c \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.c \
    src/crypto/external/bsd/openssh/dist/ssh_config
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/auth-chall.c \
    src/crypto/external/bsd/openssh/dist/auth-pam.c \
    src/crypto/external/bsd/openssh/dist/buffer.c \
    src/crypto/external/bsd/openssh/dist/cipher-ctr-mt.c \
    src/crypto/external/bsd/openssh/dist/kexdhc.c \
    src/crypto/external/bsd/openssh/dist/kexgexc.c \
    src/crypto/external/bsd/openssh/dist/monitor_mm.c \
    src/crypto/external/bsd/openssh/dist/readpass.c \
    src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 \
    src/crypto/external/bsd/openssh/dist/sshconnect1.c \
    src/crypto/external/bsd/openssh/dist/umac.c \
    src/crypto/external/bsd/openssh/dist/umac.h
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/auth-krb5.c \
    src/crypto/external/bsd/openssh/dist/auth2-chall.c \
    src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
    src/crypto/external/bsd/openssh/dist/bufaux.c \
    src/crypto/external/bsd/openssh/dist/buffer.h \
    src/crypto/external/bsd/openssh/dist/cipher-3des1.c \
    src/crypto/external/bsd/openssh/dist/cipher.c \
    src/crypto/external/bsd/openssh/dist/cipher.h \
    src/crypto/external/bsd/openssh/dist/gss-genr.c \
    src/crypto/external/bsd/openssh/dist/gss-serv.c \
    src/crypto/external/bsd/openssh/dist/hostfile.c \
    src/crypto/external/bsd/openssh/dist/hostfile.h \
    src/crypto/external/bsd/openssh/dist/progressmeter.c \
    src/crypto/external/bsd/openssh/dist/roaming_client.c \
    src/crypto/external/bsd/openssh/dist/sftp-client.h \
    src/crypto/external/bsd/openssh/dist/sftp-common.c \
    src/crypto/external/bsd/openssh/dist/ssh-dss.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c \
    src/crypto/external/bsd/openssh/dist/ssh-rsa.c \
    src/crypto/external/bsd/openssh/dist/uuencode.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/auth-options.c \
    src/crypto/external/bsd/openssh/dist/auth.h \
    src/crypto/external/bsd/openssh/dist/kex.h \
    src/crypto/external/bsd/openssh/dist/key.h \
    src/crypto/external/bsd/openssh/dist/pathnames.h \
    src/crypto/external/bsd/openssh/dist/roaming_common.c \
    src/crypto/external/bsd/openssh/dist/scp.1 \
    src/crypto/external/bsd/openssh/dist/serverloop.c \
    src/crypto/external/bsd/openssh/dist/sftp-server.8 \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.8
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/auth-rsa.c \
    src/crypto/external/bsd/openssh/dist/auth.c \
    src/crypto/external/bsd/openssh/dist/auth1.c \
    src/crypto/external/bsd/openssh/dist/auth2.c \
    src/crypto/external/bsd/openssh/dist/authfile.c \
    src/crypto/external/bsd/openssh/dist/channels.h \
    src/crypto/external/bsd/openssh/dist/clientloop.h \
    src/crypto/external/bsd/openssh/dist/jpake.c \
    src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/mac.c \
    src/crypto/external/bsd/openssh/dist/misc.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
    src/crypto/external/bsd/openssh/dist/packet.h \
    src/crypto/external/bsd/openssh/dist/sftp-client.c \
    src/crypto/external/bsd/openssh/dist/ssh-add.c \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.1
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \
    src/crypto/external/bsd/openssh/dist/auth2-passwd.c \
    src/crypto/external/bsd/openssh/dist/bufbn.c \
    src/crypto/external/bsd/openssh/dist/bufec.c \
    src/crypto/external/bsd/openssh/dist/fmt_scaled.h \
    src/crypto/external/bsd/openssh/dist/groupaccess.c \
    src/crypto/external/bsd/openssh/dist/kexecdh.c \
    src/crypto/external/bsd/openssh/dist/kexecdhc.c \
    src/crypto/external/bsd/openssh/dist/kexecdhs.c \
    src/crypto/external/bsd/openssh/dist/krl.c \
    src/crypto/external/bsd/openssh/dist/mac.h \
    src/crypto/external/bsd/openssh/dist/match.c \
    src/crypto/external/bsd/openssh/dist/rsa.c \
    src/crypto/external/bsd/openssh/dist/xmalloc.c \
    src/crypto/external/bsd/openssh/dist/xmalloc.h
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/auth2-krb5.c \
    src/crypto/external/bsd/openssh/dist/fmt_scaled.c \
    src/crypto/external/bsd/openssh/dist/namespace.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
    src/crypto/external/bsd/openssh/dist/dns.c \
    src/crypto/external/bsd/openssh/dist/mux.c \
    src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/servconf.h \
    src/crypto/external/bsd/openssh/dist/sftp-server.c \
    src/crypto/external/bsd/openssh/dist/sftp.1 \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \
    src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/channels.c \
    src/crypto/external/bsd/openssh/dist/monitor.c \
    src/crypto/external/bsd/openssh/dist/readconf.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \
    src/crypto/external/bsd/openssh/dist/ssh_config.5 \
    src/crypto/external/bsd/openssh/dist/sshd.8 \
    src/crypto/external/bsd/openssh/dist/sshd_config
cvs rdiff -u -r1.4 -r0 src/crypto/external/bsd/openssh/dist/cipher-ctr.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/log.c \
    src/crypto/external/bsd/openssh/dist/readconf.h
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/key.c \
    src/crypto/external/bsd/openssh/dist/servconf.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.c \
    src/crypto/external/bsd/openssh/dist/ssh.c \
    src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/packet.c \
    src/crypto/external/bsd/openssh/dist/session.c \
    src/crypto/external/bsd/openssh/dist/sftp.c \
    src/crypto/external/bsd/openssh/dist/ssh-agent.c \
    src/crypto/external/bsd/openssh/dist/ssh.1 \
    src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/sshconnect2.c \
    src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/lib/shlib_version

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