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

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

Module Name:    src
Committed By:   christos
Date:           Fri Jul  3 01:00:00 UTC 2015

Modified Files:
        src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent
            auth-options.c auth-pam.c auth.c auth.h auth1.c auth2-hostbased.c
            auth2-pubkey.c authfd.c authfile.c channels.c channels.h
            clientloop.c compat.c compat.h dh.c dh.h digest-libc.c dispatch.c
            dns.h groupaccess.c gss-serv.c hmac.c hostfile.c kex.c kexc25519.c
            kexc25519s.c kexgexc.c kexgexs.c krl.c match.c match.h misc.c
            monitor.c monitor_wrap.c monitor_wrap.h mux.c myproposal.h
            opacket.c packet.c readconf.c scp.c servconf.c servconf.h session.c
            sftp-client.c sftp-client.h sftp-server.c ssh-add.1 ssh-add.c
            ssh-agent.1 ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c
            ssh-pkcs11.c ssh-rsa.c ssh.1 ssh.c ssh_config.5 sshbuf-misc.c
            sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5
            sshkey.c uidswap.c uuencode.c version.h xmalloc.c xmalloc.h
        src/crypto/external/bsd/openssh/lib: shlib_version
Added Files:
        src/crypto/external/bsd/openssh: openssh2netbsd
Removed Files:
        src/crypto/external/bsd/openssh/dist: openssh2netbsd
        src/crypto/external/bsd/openssh/dist/moduli-gen: moduli moduli.1024

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssh/openssh2netbsd
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/PROTOCOL \
    src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
    src/crypto/external/bsd/openssh/dist/dispatch.c \
    src/crypto/external/bsd/openssh/dist/groupaccess.c \
    src/crypto/external/bsd/openssh/dist/krl.c \
    src/crypto/external/bsd/openssh/dist/match.c \
    src/crypto/external/bsd/openssh/dist/match.h \
    src/crypto/external/bsd/openssh/dist/xmalloc.c \
    src/crypto/external/bsd/openssh/dist/xmalloc.h
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/auth-options.c \
    src/crypto/external/bsd/openssh/dist/ssh-add.1
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/auth-pam.c \
    src/crypto/external/bsd/openssh/dist/compat.h \
    src/crypto/external/bsd/openssh/dist/dns.h \
    src/crypto/external/bsd/openssh/dist/kexgexc.c
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/auth.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/auth.h \
    src/crypto/external/bsd/openssh/dist/authfile.c \
    src/crypto/external/bsd/openssh/dist/channels.h \
    src/crypto/external/bsd/openssh/dist/compat.c \
    src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/misc.c \
    src/crypto/external/bsd/openssh/dist/myproposal.h \
    src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/auth1.c \
    src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.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/sshconnect.c
cvs rdiff -u -r1.7 -r1.8 \
    src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
    src/crypto/external/bsd/openssh/dist/gss-serv.c \
    src/crypto/external/bsd/openssh/dist/hostfile.c \
    src/crypto/external/bsd/openssh/dist/sftp-client.h \
    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.8 -r1.9 src/crypto/external/bsd/openssh/dist/authfd.c \
    src/crypto/external/bsd/openssh/dist/dh.c \
    src/crypto/external/bsd/openssh/dist/kexgexs.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
    src/crypto/external/bsd/openssh/dist/ssh-agent.1 \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/channels.c \
    src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/readconf.c \
    src/crypto/external/bsd/openssh/dist/sftp-client.c \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \
    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 -r1.5 src/crypto/external/bsd/openssh/dist/dh.h \
    src/crypto/external/bsd/openssh/dist/uidswap.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/digest-libc.c \
    src/crypto/external/bsd/openssh/dist/hmac.c \
    src/crypto/external/bsd/openssh/dist/kexc25519.c \
    src/crypto/external/bsd/openssh/dist/kexc25519s.c \
    src/crypto/external/bsd/openssh/dist/sshbuf-misc.c \
    src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/monitor.c \
    src/crypto/external/bsd/openssh/dist/session.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.2 -r1.3 src/crypto/external/bsd/openssh/dist/opacket.c
cvs rdiff -u -r1.6 -r0 src/crypto/external/bsd/openssh/dist/openssh2netbsd
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/packet.c \
    src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/servconf.c \
    src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/ssh-keygen.c \
    src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.1024
cvs rdiff -u -r1.13 -r1.14 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.