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

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

Module Name:    src
Committed By:   christos
Date:           Wed Dec 20 17:15:21 UTC 2023

Modified Files:
        src/crypto/external/bsd/openssh/bin: Makefile.inc
        src/crypto/external/bsd/openssh/bin/ssh: Makefile
        src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent auth2.c
            authfd.c authfd.h channels.c channels.h cipher.c cipher.h
            clientloop.c kex.c kex.h log.c misc.c misc.h monitor_wrap.c mux.c
            packet.c packet.h readconf.c readconf.h scp.c servconf.c
            sftp-client.c ssh-add.1 ssh-add.c ssh-agent.c ssh-pkcs11-client.c
            ssh-pkcs11.h ssh.1 ssh.c ssh2.h ssh_config.5 sshconnect.c
            sshconnect.h sshconnect2.c sshd.c sshkey.c sshsig.c 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 conflicts between 9.5 and 9.6


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/PROTOCOL
cvs rdiff -u -r1.14 -r1.15 \
    src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
    src/crypto/external/bsd/openssh/dist/ssh2.h
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/auth2.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/authfd.c \
    src/crypto/external/bsd/openssh/dist/log.c \
    src/crypto/external/bsd/openssh/dist/misc.h
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/authfd.h \
    src/crypto/external/bsd/openssh/dist/cipher.h \
    src/crypto/external/bsd/openssh/dist/sshconnect.h
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/channels.h \
    src/crypto/external/bsd/openssh/dist/packet.h
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/cipher.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/ssh.1
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
    src/crypto/external/bsd/openssh/dist/readconf.h
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/kex.h
cvs rdiff -u -r1.34 -r1.35 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.49 -r1.50 src/crypto/external/bsd/openssh/dist/packet.c \
    src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/readconf.c \
    src/crypto/external/bsd/openssh/dist/servconf.c \
    src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/scp.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-add.1
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/ssh-agent.c \
    src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.18 -r1.19 \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h
cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/sshsig.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/xmalloc.h
cvs rdiff -u -r1.15 -r1.16 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.17 -r1.18 \
    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.35 -r1.36 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.