Module Name: src Committed By: christos Date: Fri Mar 5 17:47:16 UTC 2021
Modified Files: src/crypto/external/bsd/openssh/bin/sshd: Makefile src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent addr.c addrmatch.c auth-krb5.c auth-options.c auth-passwd.c auth-rhosts.c auth.c auth.h auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c authfd.c canohost.c channels.c cipher.c clientloop.c compat.c compat.h crypto_api.h dh.c digest-openssl.c digest.h dns.c fatal.c gss-genr.c hostfile.c hostfile.h kex.c kex.h kexdh.c kexgen.c kexgexc.c kexgexs.c krl.c log.c log.h match.c misc.c misc.h monitor.c monitor_fdpass.c monitor_wrap.c monitor_wrap.h msg.c mux.c myproposal.h namespace.h nchan.c packet.c readconf.c readconf.h readpass.c sandbox-pledge.c sandbox-rlimit.c scp.1 scp.c servconf.c servconf.h serverloop.c session.c sftp-client.c sftp-client.h sftp-common.c sftp-server.c sftp.1 sftp.c sk-usbhid.c srclimit.c ssh-add.c ssh-agent.c ssh-ed25519-sk.c ssh-ed25519.c ssh-gss.h ssh-keygen.1 ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh-sk-client.c ssh-sk-helper.c ssh-sk.c ssh-xmss.c ssh.1 ssh.c ssh2.h ssh_api.c ssh_config.5 sshconnect.c sshconnect.h sshconnect2.c sshd.c sshd_config.5 sshkey-xmss.c sshkey-xmss.h sshkey.c sshkey.h sshlogin.c sshsig.c ttymodes.c version.h src/crypto/external/bsd/openssh/dist/moduli-gen: Makefile moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: Makefile shlib_version Removed Files: src/crypto/external/bsd/openssh/dist: kexsntrup4591761x25519.c sntrup4591761.c sntrup4591761.sh Log Message: merge local changes between openssh 8.4 and 8.5 To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/bin/sshd/Makefile cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/PROTOCOL \ src/crypto/external/bsd/openssh/dist/kexgexc.c \ src/crypto/external/bsd/openssh/dist/log.h \ src/crypto/external/bsd/openssh/dist/readpass.c \ src/crypto/external/bsd/openssh/dist/sshconnect.h cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \ src/crypto/external/bsd/openssh/dist/gss-genr.c \ src/crypto/external/bsd/openssh/dist/hostfile.h \ src/crypto/external/bsd/openssh/dist/msg.c cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/openssh/dist/addr.c \ src/crypto/external/bsd/openssh/dist/srclimit.c cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/addrmatch.c \ src/crypto/external/bsd/openssh/dist/auth2-passwd.c \ src/crypto/external/bsd/openssh/dist/canohost.c \ src/crypto/external/bsd/openssh/dist/compat.h \ src/crypto/external/bsd/openssh/dist/sshkey.h cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/auth-krb5.c \ src/crypto/external/bsd/openssh/dist/auth2-gss.c \ src/crypto/external/bsd/openssh/dist/match.c cvs rdiff -u -r1.24 -r1.25 \ src/crypto/external/bsd/openssh/dist/auth-options.c \ src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/auth-passwd.c \ src/crypto/external/bsd/openssh/dist/auth2-none.c \ src/crypto/external/bsd/openssh/dist/nchan.c \ src/crypto/external/bsd/openssh/dist/sftp-client.h \ src/crypto/external/bsd/openssh/dist/sftp-common.c \ src/crypto/external/bsd/openssh/dist/ssh_api.c \ src/crypto/external/bsd/openssh/dist/ttymodes.c cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/auth-rhosts.c \ src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \ src/crypto/external/bsd/openssh/dist/ssh2.h \ src/crypto/external/bsd/openssh/dist/sshlogin.c cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/auth.c \ src/crypto/external/bsd/openssh/dist/channels.c \ src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/scp.c \ src/crypto/external/bsd/openssh/dist/serverloop.c \ src/crypto/external/bsd/openssh/dist/ssh.1 \ src/crypto/external/bsd/openssh/dist/ssh_config.5 \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/auth.h \ src/crypto/external/bsd/openssh/dist/monitor_wrap.h \ src/crypto/external/bsd/openssh/dist/myproposal.h \ src/crypto/external/bsd/openssh/dist/ssh-keysign.c cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/auth2-chall.c \ src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \ src/crypto/external/bsd/openssh/dist/cipher.c \ src/crypto/external/bsd/openssh/dist/dh.c \ src/crypto/external/bsd/openssh/dist/hostfile.c \ src/crypto/external/bsd/openssh/dist/krl.c cvs rdiff -u -r1.26 -r1.27 \ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/auth2.c \ src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/scp.1 \ src/crypto/external/bsd/openssh/dist/sftp-server.c cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/sftp.c \ src/crypto/external/bsd/openssh/dist/ssh-agent.c cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/compat.c \ src/crypto/external/bsd/openssh/dist/log.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/crypto_api.h \ src/crypto/external/bsd/openssh/dist/ssh-ed25519-sk.c \ src/crypto/external/bsd/openssh/dist/ssh-sk-client.c \ src/crypto/external/bsd/openssh/dist/ssh-sk-helper.c \ src/crypto/external/bsd/openssh/dist/ssh-xmss.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssh/dist/digest-openssl.c \ src/crypto/external/bsd/openssh/dist/monitor_fdpass.c \ src/crypto/external/bsd/openssh/dist/namespace.h cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/digest.h \ src/crypto/external/bsd/openssh/dist/sandbox-pledge.c \ src/crypto/external/bsd/openssh/dist/sshkey-xmss.h cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/dns.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/fatal.c \ src/crypto/external/bsd/openssh/dist/sandbox-rlimit.c \ src/crypto/external/bsd/openssh/dist/sshkey-xmss.c cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/kex.h \ src/crypto/external/bsd/openssh/dist/kexgexs.c \ src/crypto/external/bsd/openssh/dist/misc.h \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/kexdh.c \ src/crypto/external/bsd/openssh/dist/ssh-gss.h cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/kexgen.c \ src/crypto/external/bsd/openssh/dist/sk-usbhid.c \ src/crypto/external/bsd/openssh/dist/ssh-sk.c cvs rdiff -u -r1.2 -r0 \ src/crypto/external/bsd/openssh/dist/kexsntrup4591761x25519.c \ src/crypto/external/bsd/openssh/dist/sntrup4591761.c cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/monitor.c cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \ src/crypto/external/bsd/openssh/dist/ssh-keyscan.c cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/openssh/dist/packet.c cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/readconf.c \ src/crypto/external/bsd/openssh/dist/session.c \ src/crypto/external/bsd/openssh/dist/sshd_config.5 cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/readconf.h \ src/crypto/external/bsd/openssh/dist/sftp-client.c cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/ssh.c \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/servconf.h \ src/crypto/external/bsd/openssh/dist/sftp.1 \ src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssh/dist/sntrup4591761.sh cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/ssh-ed25519.c cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/ssh-keygen.c cvs rdiff -u -r1.16 -r1.17 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/sshconnect2.c cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/sshd.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/sshsig.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssh/dist/moduli-gen/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 cvs rdiff -u -r1.10 -r1.11 \ 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.33 -r1.34 src/crypto/external/bsd/openssh/lib/Makefile cvs rdiff -u -r1.27 -r1.28 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.