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

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

Module Name:    src
Committed By:   christos
Date:           Mon Sep 21 21:31:01 UTC 2026

Modified Files:
        src/crypto/external/bsd/openssh/dist: PROTOCOL.agent auth.c auth.h
            auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-pubkey.c auth2.c
            authfd.c authfile.c chacha.c channels.c channels.h cipher.c
            cipher.h clientloop.c crypto_api.h digest.h ed25519.c gss-genr.c
            kex-names.c kex.c kex.h kexecdh.c kexgen.c kexmlkem768x25519.c
            libcrux_internal.h mac.c match.c misc.c monitor.c monitor_wrap.c
            monitor_wrap.h myproposal.h packet.c pathnames.h readconf.c scp.c
            servconf.c servconf.h serverloop.c session.c sftp-client.c
            sftp-server.8 sftp-server.c sftp.c sk-usbhid.c ssh-add.1 ssh-add.c
            ssh-agent.1 ssh-agent.c ssh-ed25519.c ssh-keygen.1 ssh-keygen.c
            ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh.1 ssh.c
            ssh_api.c ssh_config.5 sshbuf-io.c sshbuf.h sshconnect.c
            sshconnect.h sshconnect2.c sshd-auth.c sshd-session.c sshd.8 sshd.c
            sshd_config sshd_config.5 ssherr.c ssherr.h sshkey.c 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
Removed Files:
        src/crypto/external/bsd/openssh/dist: auth-pam.c auth-pam.h
            libcrux_mlkem768_sha3.h mlkem768.sh moduli moduli.5

Log Message:
Merge conflicts between 10.3 and 10.5


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
    src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
    src/crypto/external/bsd/openssh/dist/auth2-gss.c
cvs rdiff -u -r1.25 -r0 src/crypto/external/bsd/openssh/dist/auth-pam.c
cvs rdiff -u -r1.11 -r0 src/crypto/external/bsd/openssh/dist/auth-pam.h
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/auth.c \
    src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/auth.h \
    src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
    src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/auth2-chall.c \
    src/crypto/external/bsd/openssh/dist/ssh-add.1
cvs rdiff -u -r1.38 -r1.39 \
    src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/auth2.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/authfd.c \
    src/crypto/external/bsd/openssh/dist/kex.h \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/authfile.c \
    src/crypto/external/bsd/openssh/dist/channels.h
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/chacha.c \
    src/crypto/external/bsd/openssh/dist/ed25519.c
cvs rdiff -u -r1.48 -r1.49 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/cipher.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
    src/crypto/external/bsd/openssh/dist/myproposal.h
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/cipher.h \
    src/crypto/external/bsd/openssh/dist/gss-genr.c \
    src/crypto/external/bsd/openssh/dist/match.c
cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/session.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/crypto_api.h
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/digest.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/kex-names.c \
    src/crypto/external/bsd/openssh/dist/ssherr.h
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/kexecdh.c \
    src/crypto/external/bsd/openssh/dist/kexgen.c
cvs rdiff -u -r1.4 -r1.5 \
    src/crypto/external/bsd/openssh/dist/kexmlkem768x25519.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/crypto/external/bsd/openssh/dist/libcrux_internal.h
cvs rdiff -u -r1.3 -r0 \
    src/crypto/external/bsd/openssh/dist/libcrux_mlkem768_sha3.h \
    src/crypto/external/bsd/openssh/dist/mlkem768.sh
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/mac.c \
    src/crypto/external/bsd/openssh/dist/pathnames.h
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/misc.c
cvs rdiff -u -r1.10 -r0 src/crypto/external/bsd/openssh/dist/moduli
cvs rdiff -u -r1.6 -r0 src/crypto/external/bsd/openssh/dist/moduli.5
cvs rdiff -u -r1.51 -r1.52 src/crypto/external/bsd/openssh/dist/monitor.c \
    src/crypto/external/bsd/openssh/dist/readconf.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.57 -r1.58 src/crypto/external/bsd/openssh/dist/packet.c \
    src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.52 -r1.53 src/crypto/external/bsd/openssh/dist/servconf.c
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/servconf.h \
    src/crypto/external/bsd/openssh/dist/ssh-add.c \
    src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/sftp-server.8
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/sk-usbhid.c \
    src/crypto/external/bsd/openssh/dist/ssherr.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/ssh-agent.1
cvs rdiff -u -r1.46 -r1.47 src/crypto/external/bsd/openssh/dist/ssh-agent.c \
    src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/ssh-ed25519.c
cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \
    src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \
    src/crypto/external/bsd/openssh/dist/ssh_api.c \
    src/crypto/external/bsd/openssh/dist/sshconnect.h
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \
    src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/ssh-keysign.8 \
    src/crypto/external/bsd/openssh/dist/sshd-session.c
cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/ssh.1
cvs rdiff -u -r1.49 -r1.50 src/crypto/external/bsd/openssh/dist/ssh.c \
    src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/sshbuf-io.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.53 -r1.54 src/crypto/external/bsd/openssh/dist/sshconnect2.c \
    src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/sshd-auth.c
cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/sshd_config
cvs rdiff -u -r1.22 -r1.23 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.24 -r1.25 \
    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.49 -r1.50 src/crypto/external/bsd/openssh/lib/Makefile

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