Module Name: src
Committed By: christos
Date: Tue Sep 24 21:32:20 UTC 2024
Modified Files:
src/crypto/external/bsd/openssh/dist: auth.c channels.c channels.h
cipher.c crypto_api.h kex-names.c kex.c kex.h kexc25519.c kexgen.c
kexmlkem768x25519.c kexsntrup761x25519.c match.c monitor.c mux.c
myproposal.h nchan.c packet.c packet.h readconf.c servconf.c
servconf.h sntrup761.c srclimit.c ssh-add.c ssh-ecdsa-sk.c
ssh-ecdsa.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.c
ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh-rsa.c
ssh-sk.c ssh.1 ssh_api.c ssh_config.5 sshbuf-getput-crypto.c
sshbuf.c sshbuf.h sshconnect2.c sshd-session.c sshd.8 sshd.c
sshd_config.5 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 shlib_version
Log Message:
merge conflicts between OpenSSH-9.8 and 9.9
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/mux.c
cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.27 -r1.28 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.22 -r1.23 src/crypto/external/bsd/openssh/dist/cipher.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/crypto_api.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/kex-names.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/kex.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/kex.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/kexc25519.c \
src/crypto/external/bsd/openssh/dist/ssh-sk.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/kexgen.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssh/dist/kexmlkem768x25519.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssh/dist/kexsntrup761x25519.c \
src/crypto/external/bsd/openssh/dist/sntrup761.c \
src/crypto/external/bsd/openssh/dist/sshd-session.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/match.c
cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/myproposal.h
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/nchan.c \
src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c
cvs rdiff -u -r1.51 -r1.52 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.46 -r1.47 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.47 -r1.48 src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/srclimit.c \
src/crypto/external/bsd/openssh/dist/ssh-ecdsa-sk.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/ssh.1
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh_api.c
cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/sshbuf.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/sshbuf.h \
src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.48 -r1.49 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.53 -r1.54 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.20 -r1.21 \
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.39 -r1.40 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.37 -r1.38 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.
