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

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

Module Name:    src
Committed By:   christos
Date:           Wed Oct  5 22:39:37 UTC 2022

Modified Files:
        src/crypto/external/bsd/openssh/bin/sftp: Makefile
        src/crypto/external/bsd/openssh/bin/ssh: Makefile
        src/crypto/external/bsd/openssh/bin/sshd: Makefile
        src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent addr.c
            auth.c auth.h auth2-hostbased.c auth2-passwd.c auth2-pubkey.c
            auth2-pubkeyfile.c authfd.c authfile.c channels.c channels.h
            clientloop.c compat.c compat.h krl.c misc.c misc.h moduli.c
            monitor.c monitor_wrap.c monitor_wrap.h mux.c packet.c readconf.c
            readconf.h readpass.c scp.1 scp.c servconf.c servconf.h
            serverloop.c sftp-client.c sftp-client.h sftp-common.c
            sftp-common.h sftp-server.c sftp-usergroup.c sftp.1 sftp.c
            sk-usbhid.c ssh-add.c ssh-agent.c ssh-ed25519.c ssh-keygen.1
            ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.c
            ssh-pkcs11-helper.8 ssh-sk-helper.c ssh-sk.c ssh-xmss.c ssh.1 ssh.c
            ssh_config.5 sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf.c
            sshbuf.h sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5
            sshkey.c sshkey.h sshsig.c version.h xmss_hash.c
        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 between 9.0 and 9.1


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/PROTOCOL
cvs rdiff -u -r1.12 -r1.13 \
    src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
    src/crypto/external/bsd/openssh/dist/sftp-common.c \
    src/crypto/external/bsd/openssh/dist/sshbuf.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/addr.c
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/auth.c \
    src/crypto/external/bsd/openssh/dist/serverloop.c \
    src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/auth.h \
    src/crypto/external/bsd/openssh/dist/channels.h \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.h
cvs rdiff -u -r1.21 -r1.22 \
    src/crypto/external/bsd/openssh/dist/auth2-hostbased.c
cvs rdiff -u -r1.15 -r1.16 \
    src/crypto/external/bsd/openssh/dist/auth2-passwd.c \
    src/crypto/external/bsd/openssh/dist/compat.h \
    src/crypto/external/bsd/openssh/dist/moduli.c
cvs rdiff -u -r1.31 -r1.32 \
    src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
    src/crypto/external/bsd/openssh/dist/misc.c \
    src/crypto/external/bsd/openssh/dist/mux.c \
    src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/crypto/external/bsd/openssh/dist/auth2-pubkeyfile.c \
    src/crypto/external/bsd/openssh/dist/sftp-usergroup.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/authfd.c \
    src/crypto/external/bsd/openssh/dist/compat.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/authfile.c \
    src/crypto/external/bsd/openssh/dist/sftp.1 \
    src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/misc.h \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/monitor.c \
    src/crypto/external/bsd/openssh/dist/servconf.c \
    src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.30 -r1.31 \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.46 -r1.47 src/crypto/external/bsd/openssh/dist/packet.c \
    src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/readconf.h \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/readpass.c \
    src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/scp.1 \
    src/crypto/external/bsd/openssh/dist/servconf.h \
    src/crypto/external/bsd/openssh/dist/sftp-server.c \
    src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/sftp-client.h \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \
    src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/sftp-common.h \
    src/crypto/external/bsd/openssh/dist/sk-usbhid.c
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/ssh-agent.c \
    src/crypto/external/bsd/openssh/dist/ssh.1
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/ssh-ed25519.c
cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.10 -r1.11 \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 \
    src/crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/ssh-sk-helper.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/ssh-sk.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/ssh-xmss.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.11 -r1.12 \
    src/crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c
cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/sshsig.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/xmss_hash.c
cvs rdiff -u -r1.12 -r1.13 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.14 -r1.15 \
    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.32 -r1.33 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.