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

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

Module Name:    src
Committed By:   christos
Date:           Mon Apr 19 14:40:16 UTC 2021

Modified Files:
        src/crypto/external/bsd/openssh/dist: addrmatch.c auth-krb5.c
            auth-options.c auth.c auth2-pubkey.c auth2.c chacha.h channels.c
            channels.h cipher.c clientloop.c dh.c dh.h hostfile.c kex.c
            kexgen.c log.c log.h misc.c misc.h monitor.c monitor_wrap.c
            monitor_wrap.h mux.c packet.c readconf.c scp.c servconf.c
            servconf.h serverloop.c session.c sftp-client.c sftp-client.h
            sftp-server.c sftp.c srclimit.c ssh-add.c ssh-agent.c ssh-keygen.c
            ssh-sk-client.c ssh.c ssh_api.c ssh_config.5 sshconnect.c
            sshconnect2.c sshd.8 sshd.c sshd_config.5 sshkey-xmss.c
            sshkey-xmss.h sshkey.c umac.c utf8.h version.h xmalloc.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 local changes between 8.5 and 8.6


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/addrmatch.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/auth-krb5.c
cvs rdiff -u -r1.25 -r1.26 \
    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.29 -r1.30 src/crypto/external/bsd/openssh/dist/auth.c \
    src/crypto/external/bsd/openssh/dist/channels.c \
    src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
    src/crypto/external/bsd/openssh/dist/serverloop.c \
    src/crypto/external/bsd/openssh/dist/ssh_config.5 \
    src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.27 -r1.28 \
    src/crypto/external/bsd/openssh/dist/auth2-pubkey.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/auth2.c \
    src/crypto/external/bsd/openssh/dist/sftp-server.c \
    src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/chacha.h \
    src/crypto/external/bsd/openssh/dist/srclimit.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/channels.h
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/cipher.c \
    src/crypto/external/bsd/openssh/dist/dh.c \
    src/crypto/external/bsd/openssh/dist/hostfile.c \
    src/crypto/external/bsd/openssh/dist/umac.c
cvs rdiff -u -r1.31 -r1.32 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.12 -r1.13 src/crypto/external/bsd/openssh/dist/dh.h \
    src/crypto/external/bsd/openssh/dist/sftp-client.h \
    src/crypto/external/bsd/openssh/dist/ssh_api.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/kexgen.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/log.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/log.h
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/misc.h
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/monitor.c
cvs rdiff -u -r1.21 -r1.22 \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.h
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/mux.c
cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.33 -r1.34 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.30 -r1.31 src/crypto/external/bsd/openssh/dist/scp.c
cvs rdiff -u -r1.35 -r1.36 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.24 -r1.25 src/crypto/external/bsd/openssh/dist/servconf.h \
    src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/ssh-sk-client.c \
    src/crypto/external/bsd/openssh/dist/utf8.h
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/sshkey-xmss.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/sshkey-xmss.h
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/xmalloc.h
cvs rdiff -u -r1.9 -r1.10 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.11 -r1.12 \
    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.28 -r1.29 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.