Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7758B84FB4 for ; Wed, 26 Jul 2023 17:58:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id SXU8dDpEOsx3 for ; Wed, 26 Jul 2023 17:58:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7E3FC84F55 for ; Wed, 26 Jul 2023 17:58:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 77B14FBDB; Wed, 26 Jul 2023 17:58:17 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Wed, 26 Jul 2023 13:58:17 -0400 From: "Christos Zoulas" Subject: CVS commit: src/crypto/external/bsd/openssh To: source-changes@NetBSD.org Approved: for-source-only Reply-To: christos@netbsd.org X-Mailer: log_accum Message-Id: <20230726175817.77B14FBDB@cvs.NetBSD.org> Module Name: src Committed By: christos Date: Wed Jul 26 17:58:16 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/dist: PROTOCOL addr.c auth-rhosts.c auth.c auth2-hostbased.c auth2-none.c auth2-pubkey.c auth2-pubkeyfile.c auth2.c authfd.c authfile.c canohost.c channels.c channels.h clientloop.c compat.c compat.h crypto_api.h dispatch.c dns.c dns.h ed25519.c hostfile.c kex.c kex.h kexgexs.c krl.c misc.c misc.h moduli.c monitor.c monitor_wrap.c mux.c packet.c progressmeter.c readconf.c readconf.h scp.1 scp.c servconf.c servconf.h serverloop.c session.c session.h sftp-client.c sftp-glob.c sftp-server.c sftp.1 sftp.c sntrup761.c ssh-add.c ssh-agent.1 ssh-agent.c ssh-dss.c ssh-ecdsa-sk.c ssh-ecdsa.c ssh-ed25519-sk.c ssh-ed25519.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-pkcs11.c ssh-rsa.c ssh-sk-helper.c ssh-xmss.c ssh.1 ssh.c ssh_api.c ssh_config.5 sshbuf.c sshbuf.h sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5 sshkey-xmss.c sshkey-xmss.h sshkey.c sshkey.h umac.c 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 Removed Files: src/crypto/external/bsd/openssh/dist: fe25519.c fe25519.h ge25519.c ge25519.h ge25519_base.data sc25519.c sc25519.h verify.c Log Message: Merge changes between OpenSSH-9.1 and OpenSSH-9.3 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/PROTOCOL cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/addr.c \ 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/sshkey-xmss.h cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/auth-rhosts.c cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/auth.c \ src/crypto/external/bsd/openssh/dist/serverloop.c \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.22 -r1.23 \ src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \ src/crypto/external/bsd/openssh/dist/dns.c \ src/crypto/external/bsd/openssh/dist/hostfile.c cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth2-none.c \ src/crypto/external/bsd/openssh/dist/progressmeter.c \ src/crypto/external/bsd/openssh/dist/sftp-glob.c \ src/crypto/external/bsd/openssh/dist/ssh_api.c \ src/crypto/external/bsd/openssh/dist/sshbuf.c cvs rdiff -u -r1.32 -r1.33 \ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \ 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.2 -r1.3 \ src/crypto/external/bsd/openssh/dist/auth2-pubkeyfile.c \ src/crypto/external/bsd/openssh/dist/sntrup761.c cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/auth2.c cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/compat.c cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/authfile.c \ src/crypto/external/bsd/openssh/dist/sftp.1 \ src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/canohost.c \ src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/channels.c cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/channels.h cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/scp.c \ src/crypto/external/bsd/openssh/dist/session.c \ src/crypto/external/bsd/openssh/dist/sftp.c cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/compat.h \ src/crypto/external/bsd/openssh/dist/moduli.c cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/dispatch.c cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/dns.h cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/ed25519.c \ src/crypto/external/bsd/openssh/dist/ssh-xmss.c cvs rdiff -u -r1.5 -r0 src/crypto/external/bsd/openssh/dist/fe25519.c \ src/crypto/external/bsd/openssh/dist/ge25519.c \ src/crypto/external/bsd/openssh/dist/sc25519.c \ src/crypto/external/bsd/openssh/dist/verify.c cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/openssh/dist/fe25519.h \ src/crypto/external/bsd/openssh/dist/ge25519.h \ src/crypto/external/bsd/openssh/dist/sc25519.h cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssh/dist/ge25519_base.data cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/kex.h \ src/crypto/external/bsd/openssh/dist/kexgexs.c \ src/crypto/external/bsd/openssh/dist/krl.c \ src/crypto/external/bsd/openssh/dist/umac.c cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/misc.h \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/monitor.c \ src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.47 -r1.48 src/crypto/external/bsd/openssh/dist/packet.c \ src/crypto/external/bsd/openssh/dist/sshd.c cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/readconf.c cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/readconf.h \ src/crypto/external/bsd/openssh/dist/ssh-keyscan.c cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/scp.1 \ src/crypto/external/bsd/openssh/dist/servconf.h \ src/crypto/external/bsd/openssh/dist/sftp-server.c \ src/crypto/external/bsd/openssh/dist/sshd.8 cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/session.h \ src/crypto/external/bsd/openssh/dist/ssh-ed25519.c cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-agent.1 \ src/crypto/external/bsd/openssh/dist/ssh-dss.c \ src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \ src/crypto/external/bsd/openssh/dist/sshkey.h cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/ssh-agent.c \ src/crypto/external/bsd/openssh/dist/ssh.1 cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/ssh-ecdsa-sk.c cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/ssh-keygen.c cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/ssh-rsa.c \ src/crypto/external/bsd/openssh/dist/sshbuf.h cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/ssh-sk-helper.c cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/openssh/dist/ssh.c cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/ssh_config.5 cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/sshconnect2.c cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/sshd_config.5 cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/sshkey-xmss.c cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 cvs rdiff -u -r1.15 -r1.16 \ 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.36 -r1.37 src/crypto/external/bsd/openssh/lib/Makefile cvs rdiff -u -r1.33 -r1.34 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.