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

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

Module Name:    src
Committed By:   christos
Date:           Mon Jul  8 22:33:45 UTC 2024

Modified Files:
        src/crypto/external/bsd/openssh: openssh2netbsd
        src/crypto/external/bsd/openssh/bin/sshd: Makefile
        src/crypto/external/bsd/openssh/dist: PROTOCOL.agent addr.c auth-pam.c
            auth-pam.h auth-rhosts.c auth.c auth.h auth2-gss.c
            auth2-hostbased.c auth2-kbdint.c auth2-krb5.c auth2-methods.c
            auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c channels.c
            channels.h cipher.c clientloop.c clientloop.h includes.h
            kex-names.c kex.c kex.h kexgexs.c log.c log.h misc.c misc.h
            monitor.c monitor.h monitor_wrap.c monitor_wrap.h msg.c packet.c
            packet.h pathnames.h readconf.c readpass.c scp.c servconf.c
            servconf.h serverloop.c session.c sftp-client.c sftp-server.c
            sftp.c srclimit.c ssh-add.1 ssh-gss.h ssh-keygen.1 ssh-keyscan.1
            ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-pkcs11.c ssh.1
            ssh_api.c ssh_config.5 sshbuf.h sshconnect.c sshconnect.h
            sshconnect2.c sshd-session.c sshd.8 sshd.c sshd_config.5 sshkey.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: Makefile shlib_version
        src/crypto/external/bsd/openssh/libexec: Makefile

Log Message:
resolve conflicts between 9.7 and 9.8


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/openssh2netbsd
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.16 -r1.17 \
    src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
    src/crypto/external/bsd/openssh/dist/auth-rhosts.c \
    src/crypto/external/bsd/openssh/dist/auth2-passwd.c \
    src/crypto/external/bsd/openssh/dist/ssh_api.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/addr.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/auth-pam.c \
    src/crypto/external/bsd/openssh/dist/cipher.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/auth-pam.h \
    src/crypto/external/bsd/openssh/dist/auth2-krb5.c \
    src/crypto/external/bsd/openssh/dist/ssh-gss.h
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/auth.c \
    src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/auth.h \
    src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
    src/crypto/external/bsd/openssh/dist/kexgexs.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.h
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/auth2-gss.c \
    src/crypto/external/bsd/openssh/dist/log.h \
    src/crypto/external/bsd/openssh/dist/sshconnect.h
cvs rdiff -u -r1.15 -r1.16 \
    src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \
    src/crypto/external/bsd/openssh/dist/pathnames.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/crypto/external/bsd/openssh/dist/auth2-methods.c \
    src/crypto/external/bsd/openssh/dist/kex-names.c \
    src/crypto/external/bsd/openssh/dist/sshd-session.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/auth2-none.c \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.8
cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/auth2.c \
    src/crypto/external/bsd/openssh/dist/servconf.h \
    src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/channels.c \
    src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/channels.h \
    src/crypto/external/bsd/openssh/dist/packet.h \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/clientloop.h \
    src/crypto/external/bsd/openssh/dist/readpass.c \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.1
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/includes.h
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/serverloop.c \
    src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/kex.h \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/log.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/misc.c
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/misc.h
cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/monitor.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/monitor.h
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/msg.c
cvs rdiff -u -r1.50 -r1.51 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/readconf.c \
    src/crypto/external/bsd/openssh/dist/servconf.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/session.c \
    src/crypto/external/bsd/openssh/dist/ssh.1
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/srclimit.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/ssh-add.1 \
    src/crypto/external/bsd/openssh/dist/sshbuf.h \
    src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.47 -r1.48 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.51 -r1.52 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.46 -r1.47 src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.17 -r1.18 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.19 -r1.20 \
    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.38 -r1.39 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/lib/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/libexec/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.