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

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

Module Name:    src
Committed By:   christos
Date:           Wed Oct 25 20:19:58 UTC 2023

Modified Files:
        src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent addr.c
            auth-options.c auth-pam.c auth-pam.h auth2-gss.c auth2-pubkey.c
            auth2.c canohost.c chacha.c channels.c channels.h
            cipher-chachapoly-libcrypto.c cipher-chachapoly.c clientloop.c
            kex.c kex.h kexgexs.c krl.c krl.h match.c misc.c misc.h moduli.5
            monitor.c monitor_wrap.c mux.c packet.c packet.h poly1305.c
            progressmeter.c readconf.c readconf.h scp.c servconf.c servconf.h
            serverloop.c session.c sftp-client.c sftp-client.h sftp-common.c
            sftp-glob.c sftp-server.c sftp-usergroup.c sftp.c sk-usbhid.c
            ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c
            ssh-keyscan.c ssh-pkcs11-client.c ssh-pkcs11.c ssh-sk.c ssh.1 ssh.c
            ssh2.h ssh_config ssh_config.5 sshconnect2.c sshd.8 sshd_config.5
            sshkey.c sshkey.h sshsig.c 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
Removed Files:
        src/crypto/external/bsd/openssh/dist: moduli

Log Message:
Merge conflicts between 9.3 and 9.5


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/PROTOCOL
cvs rdiff -u -r1.13 -r1.14 \
    src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
    src/crypto/external/bsd/openssh/dist/sftp-common.c \
    src/crypto/external/bsd/openssh/dist/ssh2.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/addr.c \
    src/crypto/external/bsd/openssh/dist/chacha.c \
    src/crypto/external/bsd/openssh/dist/krl.h \
    src/crypto/external/bsd/openssh/dist/moduli.5 \
    src/crypto/external/bsd/openssh/dist/poly1305.c
cvs rdiff -u -r1.28 -r1.29 \
    src/crypto/external/bsd/openssh/dist/auth-options.c \
    src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/auth-pam.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/auth-pam.h
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/auth2-gss.c
cvs rdiff -u -r1.33 -r1.34 \
    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 \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/auth2.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/canohost.c \
    src/crypto/external/bsd/openssh/dist/match.c \
    src/crypto/external/bsd/openssh/dist/ssh_config
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/channels.h \
    src/crypto/external/bsd/openssh/dist/packet.h
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c \
    src/crypto/external/bsd/openssh/dist/sftp-usergroup.c
cvs rdiff -u -r1.6 -r1.7 \
    src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/session.c \
    src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/kex.h \
    src/crypto/external/bsd/openssh/dist/kexgexs.c \
    src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/misc.h \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.8 -r0 src/crypto/external/bsd/openssh/dist/moduli
cvs rdiff -u -r1.42 -r1.43 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.48 -r1.49 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.14 -r1.15 \
    src/crypto/external/bsd/openssh/dist/progressmeter.c \
    src/crypto/external/bsd/openssh/dist/sftp-glob.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/readconf.c \
    src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/readconf.h \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/scp.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/servconf.h \
    src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/sftp-client.h \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/sk-usbhid.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/ssh-agent.1 \
    src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/ssh-agent.c
cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/ssh-sk.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/ssh.1
cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/sshd.8 \
    src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/sshsig.c
cvs rdiff -u -r1.14 -r1.15 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.16 -r1.17 \
    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.34 -r1.35 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.