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

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

Module Name:    src
Committed By:   christos
Date:           Thu May 28 17:05:50 UTC 2020

Modified Files:
        src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.mux
            auth-options.c auth-rhosts.c auth2-chall.c auth2-passwd.c auth2.c
            authfd.c authfile.c channels.c cipher-chachapoly.c
            cipher-chachapoly.h cipher.c clientloop.c clientloop.h
            digest-libc.c gss-serv.c hmac.c hostfile.c kex.c krl.c krl.h misc.c
            monitor.c mux.c packet.c packet.h readconf.c readconf.h scp.1 scp.c
            servconf.c servconf.h session.c sftp.1 sftp.c sk-usbhid.c ssh-add.c
            ssh-agent.c ssh-dss.c ssh-ed25519-sk.c ssh-ed25519.c ssh-keygen.1
            ssh-keygen.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh-sk.c ssh-xmss.c
            ssh.1 ssh.c ssh_config.5 sshbuf-misc.c sshbuf.c sshbuf.h
            sshconnect.c sshconnect2.c sshd.c sshd_config.5 sshkey.c sshkey.h
            sshsig.c umac.c utf8.c utf8.h version.h
        src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048
            moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192
        src/crypto/external/bsd/openssh/lib: shlib_version

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/PROTOCOL \
    src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/PROTOCOL.mux \
    src/crypto/external/bsd/openssh/dist/sshbuf-misc.c
cvs rdiff -u -r1.22 -r1.23 \
    src/crypto/external/bsd/openssh/dist/auth-options.c \
    src/crypto/external/bsd/openssh/dist/misc.c \
    src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/auth-rhosts.c \
    src/crypto/external/bsd/openssh/dist/sshbuf.c \
    src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/auth2-chall.c \
    src/crypto/external/bsd/openssh/dist/cipher.c \
    src/crypto/external/bsd/openssh/dist/clientloop.h
cvs rdiff -u -r1.12 -r1.13 \
    src/crypto/external/bsd/openssh/dist/auth2-passwd.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/auth2.c \
    src/crypto/external/bsd/openssh/dist/packet.h \
    src/crypto/external/bsd/openssh/dist/servconf.h \
    src/crypto/external/bsd/openssh/dist/sftp.1 \
    src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/authfd.c \
    src/crypto/external/bsd/openssh/dist/scp.1
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/authfile.c \
    src/crypto/external/bsd/openssh/dist/readconf.h
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/channels.c \
    src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/ssh.1 \
    src/crypto/external/bsd/openssh/dist/ssh_config.5 \
    src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssh/dist/cipher-chachapoly.h \
    src/crypto/external/bsd/openssh/dist/sk-usbhid.c \
    src/crypto/external/bsd/openssh/dist/ssh-ed25519-sk.c \
    src/crypto/external/bsd/openssh/dist/ssh-sk.c \
    src/crypto/external/bsd/openssh/dist/ssh-xmss.c
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/sftp.c \
    src/crypto/external/bsd/openssh/dist/ssh-agent.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/digest-libc.c \
    src/crypto/external/bsd/openssh/dist/hmac.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/gss-serv.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/hostfile.c \
    src/crypto/external/bsd/openssh/dist/krl.c \
    src/crypto/external/bsd/openssh/dist/ssh-dss.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/krl.h
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/monitor.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/mux.c \
    src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/readconf.c \
    src/crypto/external/bsd/openssh/dist/session.c \
    src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/servconf.c \
    src/crypto/external/bsd/openssh/dist/ssh.c \
    src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/ssh-ed25519.c
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.18 -r1.19 \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \
    src/crypto/external/bsd/openssh/dist/umac.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/sshsig.c \
    src/crypto/external/bsd/openssh/dist/utf8.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/utf8.c
cvs rdiff -u -r1.6 -r1.7 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.8 -r1.9 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192
cvs rdiff -u -r1.25 -r1.26 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.