mention sntrup761x25519-sha512 in manpages

Spotted by Colin Watson
support sntrup761x25519-sha512 alias
2025-08-13 09:16:34 +10:00 · 2025-08-11 15:36:27 +10:00 · 2022-04-01 23:58:56 +11:00 · 2022-03-11 18:48:07 +11:00 · 2022-03-08 20:08:11 +11:00 · 2022-03-01 14:39:05 +11:00
49 changed files with 287 additions and 676 deletions
@@ -121,7 +121,7 @@ sftp-common.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-c
 sftp-glob.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h sftp.h sftp-common.h sftp-client.h openbsd-compat/glob.h
 sftp-realpath.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
 sftp-server-main.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h sftp.h misc.h xmalloc.h
-sftp-server.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h atomicio.h xmalloc.h sshbuf.h ssherr.h log.h misc.h match.h uidswap.h sftp.h sftp-common.h
+sftp-server.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h sshbuf.h ssherr.h log.h misc.h match.h uidswap.h sftp.h sftp-common.h
 sftp.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h log.h ssherr.h pathnames.h misc.h utf8.h sftp.h sshbuf.h sftp-common.h sftp-client.h openbsd-compat/glob.h
 sk-usbhid.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
 sntrup761.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
@@ -38,13 +38,13 @@ case "$config" in
 	CC="clang-12"
 	# clang's implicit-fallthrough requires that the code be annotated with
 	# __attribute__((fallthrough)) and does not understand /* FALLTHROUGH */
-	CFLAGS="-Wall -Wextra -O2 -Wno-error=implicit-fallthrough -Wno-error=unused-parameter"
+	CFLAGS="-Wall -Wextra -O2 -Wno-error=implicit-fallthrough"
 	CONFIGFLAGS="--with-pam --with-Werror"
 	;;
    gcc-11-Werror)
 	CC="gcc"
 	# -Wnoformat-truncation in gcc 7.3.1 20180130 fails on fmt_scaled
-	CFLAGS="-Wall -Wextra -O2 -Wno-format-truncation -Wimplicit-fallthrough=4 -Wno-unused-parameter"
+	CFLAGS="-Wall -Wextra -Wno-format-truncation -O2 -Wimplicit-fallthrough=4"
 	CONFIGFLAGS="--with-pam --with-Werror"
 	;;
    clang*|gcc*)
@@ -145,23 +145,10 @@ case "$config" in
 esac

 case "${TARGET_HOST}" in
-    aix*)
-	# These are slow real or virtual machines so skip the slowest tests
-	# (which tend to be thw ones that transfer lots of data) so that the
-	# test run does not time out.
-	# The agent-restrict test fails due to some quoting issue when run
-	# with sh or ksh so specify bash for now.
-	TEST_TARGET="t-exec TEST_SHELL=bash"
-	SKIP_LTESTS="rekey sftp"
-	;;
    dfly58*|dfly60*)
 	# scp 3-way connection hangs on these so skip until sorted.
 	SKIP_LTESTS=scp3
 	;;
-    fbsd6)
-	# Native linker is not great with PIC so OpenSSL is built w/out.
-	CONFIGFLAGS="${CONFIGFLAGS} --disable-security-key"
-	;;
    hurd)
 	SKIP_LTESTS="forwarding multiplex proxy-connect hostkey-agent agent-ptrace"
 	;;
@@ -186,10 +173,6 @@ case "${TARGET_HOST}" in
 	# SHA256 functions in sha2.h conflict with OpenSSL's breaking sk-dummy
 	CONFIGFLAGS="${CONFIGFLAGS} --without-hardening --disable-security-key"
 	;;
-    openwrt-*)
-	CONFIGFLAGS="${CONFIGFLAGS} --without-openssl --without-zlib"
-	TEST_TARGET="t-exec"
-	;;
    sol10|sol11)
 	# sol10 VM is 32bit and the unit tests are slow.
 	# sol11 has 4 test configs so skip unit tests to speed up.
@@ -80,7 +80,7 @@ for TARGET in $TARGETS; do
        INSTALL_LIBRESSL=$(echo ${TARGET} | cut -f2 -d-)
        case ${INSTALL_LIBRESSL} in
          master) ;;
-          *) INSTALL_LIBRESSL="$(echo ${TARGET} | cut -f2 -d-)" ;;
+          *) INSTALL_LIBRESSL="v$(echo ${TARGET} | cut -f2 -d-)" ;;
        esac
        PACKAGES="${PACKAGES} putty-tools"
       ;;
@@ -122,20 +122,11 @@ if [ ! -z "${INSTALL_OPENSSL}" ]; then
 fi

 if [ ! -z "${INSTALL_LIBRESSL}" ]; then
-    if [ "${INSTALL_LIBRESSL}" = "master" ]; then
-        (mkdir -p ${HOME}/libressl && cd ${HOME}/libressl &&
-         git clone https://github.com/libressl-portable/portable.git &&
-         cd ${HOME}/libressl/portable &&
-         git checkout ${INSTALL_LIBRESSL} &&
-         sh update.sh && sh autogen.sh &&
-         ./configure --prefix=/opt/libressl &&
-         make -j2 && sudo make install)
-    else
-        LIBRESSL_URLBASE=https://cdn.openbsd.org/pub/OpenBSD/LibreSSL
-        (cd ${HOME} &&
-         wget ${LIBRESSL_URLBASE}/libressl-${INSTALL_LIBRESSL}.tar.gz &&
-         tar xfz libressl-${INSTALL_LIBRESSL}.tar.gz &&
-         cd libressl-${INSTALL_LIBRESSL} &&
-         ./configure --prefix=/opt/libressl && make -j2 && sudo make install)
-    fi
+    (mkdir -p ${HOME}/libressl && cd ${HOME}/libressl &&
+     git clone https://github.com/libressl-portable/portable.git &&
+     cd ${HOME}/libressl/portable &&
+     git checkout ${INSTALL_LIBRESSL} &&
+     sh update.sh && sh autogen.sh &&
+     ./configure --prefix=/opt/libressl &&
+     make -j2 && sudo make install)
 fi
@@ -2,11 +2,9 @@ name: C/C++ CI

 on:
  push:
-    branches: [ master, ci, V_9_0 ]
-    paths: [ '**.c', '**.h', '**.m4', '**.sh', '**.yml', 'Makefile.in', 'configure.ac' ]
+    branches: [ master, ci ]
  pull_request:
    branches: [ master ]
-    paths: [ '**.c', '**.h', '**.m4', '**.sh', '**.yml', 'Makefile.in', 'configure.ac' ]

 jobs:
  ci:
@@ -48,7 +46,6 @@ jobs:
          - { os: ubuntu-latest, configs: libressl-3.2.6 }
          - { os: ubuntu-latest, configs: libressl-3.3.4 }
          - { os: ubuntu-latest, configs: libressl-3.4.1 }
-          - { os: ubuntu-latest, configs: libressl-3.5.0 }
          - { os: ubuntu-latest, configs: openssl-master }
          - { os: ubuntu-latest, configs: openssl-noec }
          - { os: ubuntu-latest, configs: openssl-1.0.1 }
@@ -57,9 +54,7 @@ jobs:
          - { os: ubuntu-latest, configs: openssl-1.1.0h }
          - { os: ubuntu-latest, configs: openssl-1.1.1 }
          - { os: ubuntu-latest, configs: openssl-1.1.1k }
-          - { os: ubuntu-latest, configs: openssl-1.1.1m }
          - { os: ubuntu-latest, configs: openssl-3.0.0 }
-          - { os: ubuntu-latest, configs: openssl-3.0.1 }
          - { os: ubuntu-latest, configs: openssl-1.1.1_stable } # stable branch
          - { os: ubuntu-latest, configs: openssl-3.0 }          # stable branch
          - { os: ubuntu-18.04, configs: pam }
@@ -2,8 +2,7 @@ name: C/C++ CI self-hosted

 on:
  push:
-    branches: [ master, ci, V_9_0 ]
-    paths: [ '**.c', '**.h', '**.m4', '**.sh', '**.yml', 'Makefile.in', 'configure.ac' ]
+    branches: [ master, ci ]

 jobs:
  selfhosted:
@@ -17,11 +16,9 @@ jobs:
      # default config.  "os" corresponds to a label associated with the worker.
      matrix:
        os:
-          - aix51
          - ARM64
          - alpine
          - bbone
-          - debian-i386
          - dfly30
          - dfly48
          - dfly58
@@ -43,8 +40,6 @@ jobs:
          - obsd70
          - obsdsnap
          - openindiana
-          - openwrt-mips
-          - openwrt-mipsel
          # - rocky84
          - sol10
          - sol11
@@ -54,7 +49,6 @@ jobs:
        # Then we include any extra configs we want to test for specific VMs.
        include:
          - { os: ARM64,  configs: pam }
-          - { os: debian-i386, configs: pam }
          - { os: dfly30, configs: without-openssl}
          - { os: dfly48, configs: pam }
          - { os: dfly58, configs: pam }
@@ -93,7 +87,7 @@ jobs:
      run: vmrun make
    - name: make tests
      run: vmrun ./.github/run_test.sh ${{ matrix.configs }}
-      timeout-minutes: 600
+      timeout-minutes: 300
    - name: save logs
      if: failure()
      uses: actions/upload-artifact@v2
@@ -3,7 +3,6 @@ name: Upstream self-hosted
 on:
  push:
    branches: [ master, ci ]
-    paths: [ '**.c', '**.h' ]

 jobs:
  selfhosted:
@@ -1,4 +1,5 @@
-SHELL=@SH@
+# uncomment if you run a non bourne compatible shell. Ie. csh
+#SHELL = @SH@

 AUTORECONF=autoreconf

@@ -687,7 +688,7 @@ SK_DUMMY_LIBRARY=@SK_DUMMY_LIBRARY@
 	$(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@

 regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(PICFLAG) -shared -o $@ $(SK_DUMMY_OBJS) \
+	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \
 	    -L. -Lopenbsd-compat -lopenbsd-compat $(LDFLAGS_NOPIE) $(LIBS)

 regress-binaries: regress-prep $(LIBCOMPAT) \
@@ -492,7 +492,7 @@ This request asks the server to call fsync(2) on an open file handle.
 	string		"[email protected]"
 	string		handle

-On receiving this request, a server will call fsync(handle_fd) and will
+One receiving this request, a server will call fsync(handle_fd) and will
 respond with a SSH_FXP_STATUS message.

 This extension is advertised in the SSH_FXP_VERSION hello with version
@@ -576,43 +576,6 @@ Its reply is the same format as that of SSH2_FXP_REALPATH.
 This extension is advertised in the SSH_FXP_VERSION hello with version
 "1".

-4.10. sftp: Extension request "copy-data"
-
-This request asks the server to copy data from one open file handle and
-write it to a different open file handle.  This avoids needing to transfer
-the data across the network twice (a download followed by an upload).
-
-	byte		SSH_FXP_EXTENDED
-	uint32		id
-	string		"copy-data"
-	string		read-from-handle
-	uint64		read-from-offset
-	uint64		read-data-length
-	string		write-to-handle
-	uint64		write-to-offset
-
-The server will copy read-data-length bytes starting from
-read-from-offset from the read-from-handle and write them to
-write-to-handle starting from write-to-offset, and then respond with a
-SSH_FXP_STATUS message.
-
-It's equivalent to issuing a series of SSH_FXP_READ requests on
-read-from-handle and a series of requests of SSH_FXP_WRITE on
-write-to-handle.
-
-If read-from-handle and write-to-handle are the same, the server will
-fail the request and respond with a SSH_FX_INVALID_PARAMETER message.
-
-If read-data-length is 0, then the server will read data from the
-read-from-handle until EOF is reached.
-
-This extension is advertised in the SSH_FXP_VERSION hello with version
-"1".
-
-This request is identical to the "copy-data" request documented in:
-
-https://tools.ietf.org/html/draft-ietf-secsh-filexfer-extensions-00#section-7
-
 5. Miscellaneous changes

 5.1 Public key format
@@ -649,4 +612,4 @@ master instance and later clients.
 OpenSSH extends the usual agent protocol. These changes are documented
 in the PROTOCOL.agent file.

-$OpenBSD: PROTOCOL,v 1.44 2022/03/31 03:05:49 djm Exp $
+$OpenBSD: PROTOCOL,v 1.43 2021/12/19 22:15:42 djm Exp $
@@ -1,4 +1,4 @@
-See https://www.openssh.com/releasenotes.html#9.0p1 for the release notes.
+See https://www.openssh.com/releasenotes.html#8.9p1 for the release notes.

 Please read https://www.openssh.com/report.html for bug reporting
 instructions and note that we do not use Github for bug reporting or
@@ -101,18 +101,62 @@ int
 allowed_user(struct ssh *ssh, struct passwd * pw)
 {
 	struct stat st;
-	const char *hostname = NULL, *ipaddr = NULL;
+	const char *hostname = NULL, *ipaddr = NULL, *passwd = NULL;
 	u_int i;
 	int r;
+#ifdef USE_SHADOW
+	struct spwd *spw = NULL;
+#endif

 	/* Shouldn't be called if pw is NULL, but better safe than sorry... */
 	if (!pw || !pw->pw_name)
 		return 0;

-	if (!options.use_pam && platform_locked_account(pw)) {
-		logit("User %.100s not allowed because account is locked",
-		    pw->pw_name);
+#ifdef USE_SHADOW
+	if (!options.use_pam)
+		spw = getspnam(pw->pw_name);
+#ifdef HAS_SHADOW_EXPIRE
+	if (!options.use_pam && spw != NULL && auth_shadow_acctexpired(spw))
 		return 0;
+#endif /* HAS_SHADOW_EXPIRE */
+#endif /* USE_SHADOW */
+
+	/* grab passwd field for locked account check */
+	passwd = pw->pw_passwd;
+#ifdef USE_SHADOW
+	if (spw != NULL)
+#ifdef USE_LIBIAF
+		passwd = get_iaf_password(pw);
+#else
+		passwd = spw->sp_pwdp;
+#endif /* USE_LIBIAF */
+#endif
+
+	/* check for locked account */
+	if (!options.use_pam && passwd && *passwd) {
+		int locked = 0;
+
+#ifdef LOCKED_PASSWD_STRING
+		if (strcmp(passwd, LOCKED_PASSWD_STRING) == 0)
+			 locked = 1;
+#endif
+#ifdef LOCKED_PASSWD_PREFIX
+		if (strncmp(passwd, LOCKED_PASSWD_PREFIX,
+		    strlen(LOCKED_PASSWD_PREFIX)) == 0)
+			 locked = 1;
+#endif
+#ifdef LOCKED_PASSWD_SUBSTR
+		if (strstr(passwd, LOCKED_PASSWD_SUBSTR))
+			locked = 1;
+#endif
+#ifdef USE_LIBIAF
+		free((void *) passwd);
+#endif /* USE_LIBIAF */
+		if (locked) {
+			logit("User %.100s not allowed because account is locked",
+			    pw->pw_name);
+			return 0;
+		}
 	}

 	/*
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.113 2022/02/27 01:33:59 naddy Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.112 2021/12/19 22:12:30 djm Exp $ */
 /*
 * Copyright (c) 2000 Markus Friedl.  All rights reserved.
 *
@@ -166,8 +166,8 @@ userauth_pubkey(struct ssh *ssh, const char *method)
 		goto done;
 	}
 	if (match_pattern_list(pkalg, options.pubkey_accepted_algos, 0) != 1) {
-		logit_f("signature algorithm %s not in "
-		    "PubkeyAcceptedAlgorithms", pkalg);
+		logit_f("key type %s not in PubkeyAcceptedAlgorithms",
+		    sshkey_ssh_name(key));
 		goto done;
 	}
 	if ((r = sshkey_check_cert_sigtype(key,
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.416 2022/04/11 22:52:08 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.413 2022/02/17 10:58:27 djm Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -432,25 +432,21 @@ channel_close_fd(struct ssh *ssh, Channel *c, int *fdp)
 		c->io_want &= ~SSH_CHAN_IO_RFD;
 		c->io_ready &= ~SSH_CHAN_IO_RFD;
 		c->rfd = -1;
-		c->pfds[0] = -1;
 	}
 	if (*fdp == c->wfd) {
 		c->io_want &= ~SSH_CHAN_IO_WFD;
 		c->io_ready &= ~SSH_CHAN_IO_WFD;
 		c->wfd = -1;
-		c->pfds[1] = -1;
 	}
 	if (*fdp == c->efd) {
 		c->io_want &= ~SSH_CHAN_IO_EFD;
 		c->io_ready &= ~SSH_CHAN_IO_EFD;
 		c->efd = -1;
-		c->pfds[2] = -1;
 	}
 	if (*fdp == c->sock) {
 		c->io_want &= ~SSH_CHAN_IO_SOCK;
 		c->io_ready &= ~SSH_CHAN_IO_SOCK;
 		c->sock = -1;
-		c->pfds[3] = -1;
 	}

 	ret = close(fd);
@@ -2479,13 +2475,10 @@ dump_channel_poll(const char *func, const char *what, Channel *c,
    u_int pollfd_offset, struct pollfd *pfd)
 {
 #ifdef DEBUG_CHANNEL_POLL
-	debug3("%s: channel %d: %s r%d w%d e%d s%d c->pfds [ %d %d %d %d ] "
-	    "io_want 0x%02x io_ready 0x%02x pfd[%u].fd=%d "
-	    "pfd.ev 0x%02x pfd.rev 0x%02x", func, c->self, what,
-	    c->rfd, c->wfd, c->efd, c->sock,
-	    c->pfds[0], c->pfds[1], c->pfds[2], c->pfds[3],
-	    c->io_want, c->io_ready,
-	    pollfd_offset, pfd->fd, pfd->events, pfd->revents);
+	debug3_f("channel %d: rfd r%d w%d e%d s%d "
+	    "pfd[%u].fd=%d want 0x%02x ev 0x%02x ready 0x%02x rev 0x%02x",
+	    c->self, c->rfd, c->wfd, c->efd, c->sock, pollfd_offset, pfd->fd,
+	    c->io_want, pfd->events, c->io_ready, pfd->revents);
 #endif
 }

@@ -2494,7 +2487,7 @@ static void
 channel_prepare_pollfd(Channel *c, u_int *next_pollfd,
    struct pollfd *pfd, u_int npfd)
 {
-	u_int ev, p = *next_pollfd;
+	u_int p = *next_pollfd;

 	if (c == NULL)
 		return;
@@ -2503,7 +2496,7 @@ channel_prepare_pollfd(Channel *c, u_int *next_pollfd,
 		fatal_f("channel %d: bad pfd offset %u (max %u)",
 		    c->self, p, npfd);
 	}
-	c->pfds[0] = c->pfds[1] = c->pfds[2] = c->pfds[3] = -1;
+	c->pollfd_offset = -1;
 	/*
 	 * prepare c->rfd
 	 *
@@ -2512,82 +2505,69 @@ channel_prepare_pollfd(Channel *c, u_int *next_pollfd,
 	 * IO too.
 	 */
 	if (c->rfd != -1) {
-		ev = 0;
+		if (c->pollfd_offset == -1)
+			c->pollfd_offset = p;
+		pfd[p].fd = c->rfd;
+		pfd[p].events = 0;
 		if ((c->io_want & SSH_CHAN_IO_RFD) != 0)
-			ev |= POLLIN;
+			pfd[p].events |= POLLIN;
 		/* rfd == wfd */
-		if (c->wfd == c->rfd) {
-			if ((c->io_want & SSH_CHAN_IO_WFD) != 0)
-				ev |= POLLOUT;
-		}
+		if (c->wfd == c->rfd &&
+		    (c->io_want & SSH_CHAN_IO_WFD) != 0)
+			pfd[p].events |= POLLOUT;
 		/* rfd == efd */
-		if (c->efd == c->rfd) {
-			if ((c->io_want & SSH_CHAN_IO_EFD_R) != 0)
-				ev |= POLLIN;
-			if ((c->io_want & SSH_CHAN_IO_EFD_W) != 0)
-				ev |= POLLOUT;
-		}
+		if (c->efd == c->rfd &&
+		    (c->io_want & SSH_CHAN_IO_EFD_R) != 0)
+			pfd[p].events |= POLLIN;
+		if (c->efd == c->rfd &&
+		    (c->io_want & SSH_CHAN_IO_EFD_W) != 0)
+			pfd[p].events |= POLLOUT;
 		/* rfd == sock */
-		if (c->sock == c->rfd) {
-			if ((c->io_want & SSH_CHAN_IO_SOCK_R) != 0)
-				ev |= POLLIN;
-			if ((c->io_want & SSH_CHAN_IO_SOCK_W) != 0)
-				ev |= POLLOUT;
-		}
-		/* Pack a pfd entry if any event armed for this fd */
-		if (ev != 0) {
-			c->pfds[0] = p;
-			pfd[p].fd = c->rfd;
-			pfd[p].events = ev;
-			dump_channel_poll(__func__, "rfd", c, p, &pfd[p]);
-			p++;
-		}
+		if (c->sock == c->rfd &&
+		    (c->io_want & SSH_CHAN_IO_SOCK_R) != 0)
+			pfd[p].events |= POLLIN;
+		if (c->sock == c->rfd &&
+		    (c->io_want & SSH_CHAN_IO_SOCK_W) != 0)
+			pfd[p].events |= POLLOUT;
+		dump_channel_poll(__func__, "rfd", c, p, &pfd[p]);
+		p++;
 	}
-	/* prepare c->wfd if wanting IO and not already handled above */
+	/* prepare c->wfd (if not already handled above) */
 	if (c->wfd != -1 && c->rfd != c->wfd) {
-		ev = 0;
-		if ((c->io_want & SSH_CHAN_IO_WFD))
-			ev |= POLLOUT;
-		/* Pack a pfd entry if any event armed for this fd */
-		if (ev != 0) {
-			c->pfds[1] = p;
-			pfd[p].fd = c->wfd;
-			pfd[p].events = ev;
-			dump_channel_poll(__func__, "wfd", c, p, &pfd[p]);
-			p++;
-		}
+		if (c->pollfd_offset == -1)
+			c->pollfd_offset = p;
+		pfd[p].fd = c->wfd;
+		pfd[p].events = 0;
+		if ((c->io_want & SSH_CHAN_IO_WFD) != 0)
+			pfd[p].events = POLLOUT;
+		dump_channel_poll(__func__, "wfd", c, p, &pfd[p]);
+		p++;
 	}
-	/* prepare c->efd if wanting IO and not already handled above */
+	/* prepare c->efd (if not already handled above) */
 	if (c->efd != -1 && c->rfd != c->efd) {
-		ev = 0;
+		if (c->pollfd_offset == -1)
+			c->pollfd_offset = p;
+		pfd[p].fd = c->efd;
+		pfd[p].events = 0;
 		if ((c->io_want & SSH_CHAN_IO_EFD_R) != 0)
-			ev |= POLLIN;
+			pfd[p].events |= POLLIN;
 		if ((c->io_want & SSH_CHAN_IO_EFD_W) != 0)
-			ev |= POLLOUT;
-		/* Pack a pfd entry if any event armed for this fd */
-		if (ev != 0) {
-			c->pfds[2] = p;
-			pfd[p].fd = c->efd;
-			pfd[p].events = ev;
-			dump_channel_poll(__func__, "efd", c, p, &pfd[p]);
-			p++;
-		}
+			pfd[p].events |= POLLOUT;
+		dump_channel_poll(__func__, "efd", c, p, &pfd[p]);
+		p++;
 	}
-	/* prepare c->sock if wanting IO and not already handled above */
+	/* prepare c->sock (if not already handled above) */
 	if (c->sock != -1 && c->rfd != c->sock) {
-		ev = 0;
+		if (c->pollfd_offset == -1)
+			c->pollfd_offset = p;
+		pfd[p].fd = c->sock;
+		pfd[p].events = 0;
 		if ((c->io_want & SSH_CHAN_IO_SOCK_R) != 0)
-			ev |= POLLIN;
+			pfd[p].events |= POLLIN;
 		if ((c->io_want & SSH_CHAN_IO_SOCK_W) != 0)
-			ev |= POLLOUT;
-		/* Pack a pfd entry if any event armed for this fd */
-		if (ev != 0) {
-			c->pfds[3] = p;
-			pfd[p].fd = c->sock;
-			pfd[p].events = 0;
-			dump_channel_poll(__func__, "sock", c, p, &pfd[p]);
-			p++;
-		}
+			pfd[p].events |= POLLOUT;
+		dump_channel_poll(__func__, "sock", c, p, &pfd[p]);
+		p++;
 	}
 	*next_pollfd = p;
 }
@@ -2601,12 +2581,7 @@ channel_prepare_poll(struct ssh *ssh, struct pollfd **pfdp, u_int *npfd_allocp,
 	u_int i, oalloc, p, npfd = npfd_reserved;

 	channel_before_prepare_io(ssh); /* might create a new channel */
-	/* clear out I/O flags from last poll */
-	for (i = 0; i < sc->channels_alloc; i++) {
-		if (sc->channels[i] == NULL)
-			continue;
-		sc->channels[i]->io_want = sc->channels[i]->io_ready = 0;
-	}
+
 	/* Allocate 4x pollfd for each channel (rfd, wfd, efd, sock) */
 	if (sc->channels_alloc >= (INT_MAX / 4) - npfd_reserved)
 		fatal_f("too many channels"); /* shouldn't happen */
@@ -2639,15 +2614,13 @@ channel_prepare_poll(struct ssh *ssh, struct pollfd **pfdp, u_int *npfd_allocp,
 }

 static void
-fd_ready(Channel *c, int p, struct pollfd *pfds, u_int npfd, int fd,
+fd_ready(Channel *c, u_int p, struct pollfd *pfds, int fd,
    const char *what, u_int revents_mask, u_int ready)
 {
 	struct pollfd *pfd = &pfds[p];

 	if (fd == -1)
 		return;
-	if (p == -1 || (u_int)p >= npfd)
-		fatal_f("channel %d: bad pfd %d (max %u)", c->self, p, npfd);
 	dump_channel_poll(__func__, what, c, p, pfd);
 	if (pfd->fd != fd) {
 		fatal("channel %d: inconsistent %s fd=%d pollfd[%u].fd %d "
@@ -2670,12 +2643,11 @@ void
 channel_after_poll(struct ssh *ssh, struct pollfd *pfd, u_int npfd)
 {
 	struct ssh_channels *sc = ssh->chanctxt;
-	u_int i;
-	int p;
+	u_int i, p;
 	Channel *c;

 #ifdef DEBUG_CHANNEL_POLL
-	for (p = 0; p < (int)npfd; p++) {
+	for (p = 0; p < npfd; p++) {
 		if (pfd[p].revents == 0)
 			continue;
 		debug_f("pfd[%u].fd %d rev 0x%04x",
@@ -2686,8 +2658,13 @@ channel_after_poll(struct ssh *ssh, struct pollfd *pfd, u_int npfd)
 	/* Convert pollfd into c->io_ready */
 	for (i = 0; i < sc->channels_alloc; i++) {
 		c = sc->channels[i];
-		if (c == NULL)
+		if (c == NULL || c->pollfd_offset < 0)
 			continue;
+		if ((u_int)c->pollfd_offset >= npfd) {
+			/* shouldn't happen */
+			fatal_f("channel %d: (before) bad pfd %u (max %u)",
+			    c->self, c->pollfd_offset, npfd);
+		}
 		/* if rfd is shared with efd/sock then wfd should be too */
 		if (c->rfd != -1 && c->wfd != -1 && c->rfd != c->wfd &&
 		    (c->rfd == c->efd || c->rfd == c->sock)) {
@@ -2696,52 +2673,56 @@ channel_after_poll(struct ssh *ssh, struct pollfd *pfd, u_int npfd)
 			    c->self, c->rfd, c->wfd, c->efd, c->sock);
 		}
 		c->io_ready = 0;
+		p = c->pollfd_offset;
 		/* rfd, potentially shared with wfd, efd and sock */
-		if (c->rfd != -1 && (p = c->pfds[0]) != -1) {
-			fd_ready(c, p, pfd, npfd, c->rfd,
-			    "rfd", POLLIN, SSH_CHAN_IO_RFD);
+		if (c->rfd != -1) {
+			fd_ready(c, p, pfd, c->rfd, "rfd", POLLIN,
+			    SSH_CHAN_IO_RFD);
 			if (c->rfd == c->wfd) {
-				fd_ready(c, p, pfd, npfd, c->wfd,
-				    "wfd/r", POLLOUT, SSH_CHAN_IO_WFD);
+				fd_ready(c, p, pfd, c->wfd, "wfd/r", POLLOUT,
+				    SSH_CHAN_IO_WFD);
 			}
 			if (c->rfd == c->efd) {
-				fd_ready(c, p, pfd, npfd, c->efd,
-				    "efdr/r", POLLIN, SSH_CHAN_IO_EFD_R);
-				fd_ready(c, p, pfd, npfd, c->efd,
-				    "efdw/r", POLLOUT, SSH_CHAN_IO_EFD_W);
+				fd_ready(c, p, pfd, c->efd, "efdr/r", POLLIN,
+				    SSH_CHAN_IO_EFD_R);
+				fd_ready(c, p, pfd, c->efd, "efdw/r", POLLOUT,
+				    SSH_CHAN_IO_EFD_W);
 			}
 			if (c->rfd == c->sock) {
-				fd_ready(c, p, pfd, npfd, c->sock,
-				    "sockr/r", POLLIN, SSH_CHAN_IO_SOCK_R);
-				fd_ready(c, p, pfd, npfd, c->sock,
-				    "sockw/r", POLLOUT, SSH_CHAN_IO_SOCK_W);
+				fd_ready(c, p, pfd, c->sock, "sockr/r", POLLIN,
+				    SSH_CHAN_IO_SOCK_R);
+				fd_ready(c, p, pfd, c->sock, "sockw/r", POLLOUT,
+				    SSH_CHAN_IO_SOCK_W);
 			}
-			dump_channel_poll(__func__, "rfd", c, p, pfd);
+			p++;
 		}
 		/* wfd */
-		if (c->wfd != -1 && c->wfd != c->rfd &&
-		    (p = c->pfds[1]) != -1) {
-			fd_ready(c, p, pfd, npfd, c->wfd,
-			    "wfd", POLLOUT, SSH_CHAN_IO_WFD);
-			dump_channel_poll(__func__, "wfd", c, p, pfd);
+		if (c->wfd != -1 && c->wfd != c->rfd) {
+			fd_ready(c, p, pfd, c->wfd, "wfd", POLLOUT,
+			    SSH_CHAN_IO_WFD);
+			p++;
 		}
 		/* efd */
-		if (c->efd != -1 && c->efd != c->rfd &&
-		    (p = c->pfds[2]) != -1) {
-			fd_ready(c, p, pfd, npfd, c->efd,
-			    "efdr", POLLIN, SSH_CHAN_IO_EFD_R);
-			fd_ready(c, p, pfd, npfd, c->efd,
-			    "efdw", POLLOUT, SSH_CHAN_IO_EFD_W);
-			dump_channel_poll(__func__, "efd", c, p, pfd);
+		if (c->efd != -1 && c->efd != c->rfd) {
+			fd_ready(c, p, pfd, c->efd, "efdr", POLLIN,
+			    SSH_CHAN_IO_EFD_R);
+			fd_ready(c, p, pfd, c->efd, "efdw", POLLOUT,
+			    SSH_CHAN_IO_EFD_W);
+			p++;
 		}
 		/* sock */
-		if (c->sock != -1 && c->sock != c->rfd &&
-		    (p = c->pfds[3]) != -1) {
-			fd_ready(c, p, pfd, npfd, c->sock,
-			    "sockr", POLLIN, SSH_CHAN_IO_SOCK_R);
-			fd_ready(c, p, pfd, npfd, c->sock,
-			    "sockw", POLLOUT, SSH_CHAN_IO_SOCK_W);
-			dump_channel_poll(__func__, "sock", c, p, pfd);
+		if (c->sock != -1 && c->sock != c->rfd) {
+			fd_ready(c, p, pfd, c->sock, "sockr", POLLIN,
+			    SSH_CHAN_IO_SOCK_R);
+			fd_ready(c, p, pfd, c->sock, "sockw", POLLOUT,
+			    SSH_CHAN_IO_SOCK_W);
+			p++;
+		}
+
+		if (p > npfd) {
+			/* shouldn't happen */
+			fatal_f("channel %d: (after) bad pfd %u (max %u)",
+			    c->self, c->pollfd_offset, npfd);
 		}
 	}
 	channel_handler(ssh, CHAN_POST, NULL);
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.142 2022/03/30 21:10:25 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.141 2022/01/22 00:49:34 djm Exp $ */

 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -138,7 +138,7 @@ struct Channel {
 	int     sock;		/* sock fd */
 	u_int	io_want;	/* bitmask of SSH_CHAN_IO_* */
 	u_int	io_ready;	/* bitmask of SSH_CHAN_IO_* */
-	int	pfds[4];	/* pollfd entries for rfd/wfd/efd/sock */
+	int	pollfd_offset;	/* base offset into pollfd array (or -1) */
 	int     ctl_chan;	/* control channel (multiplexed connections) */
 	int     isatty;		/* rfd is a tty */
 #ifdef _AIX
@@ -48,8 +48,6 @@ AC_PATH_PROG([SED], [sed])
 AC_PATH_PROG([TEST_MINUS_S_SH], [bash])
 AC_PATH_PROG([TEST_MINUS_S_SH], [ksh])
 AC_PATH_PROG([TEST_MINUS_S_SH], [sh])
-AC_PATH_PROG([SH], [bash])
-AC_PATH_PROG([SH], [ksh])
 AC_PATH_PROG([SH], [sh])
 AC_PATH_PROG([GROFF], [groff])
 AC_PATH_PROG([NROFF], [nroff awf])
@@ -1878,7 +1876,6 @@ AC_CHECK_FUNCS([ \
 	inet_ntoa \
 	inet_ntop \
 	innetgr \
-	killpg \
 	llabs \
 	localtime_r \
 	login_getcapbool \
@@ -2095,12 +2092,6 @@ AC_CHECK_DECLS([O_NONBLOCK], , ,
 #endif
 	])

-AC_CHECK_DECLS([ftruncate], , ,
-	[
-#include <sys/types.h>
-#include <unistd.h>
-	])
-
 AC_CHECK_DECLS([readv, writev], , , [
 #include <sys/types.h>
 #include <sys/uio.h>
@@ -1,4 +1,4 @@
-%global ver 9.0p1
+%global ver 8.9p1
 %global rel 1%{?dist}

 # OpenSSH privilege separation requires a user & group ID
@@ -13,7 +13,7 @@

 Summary:	OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name:		openssh
-Version:	9.0p1
+Version:	8.9p1
 URL:		https://www.openssh.com/
 Release:	1
 Source0:	openssh-%{version}.tar.gz
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.175 2022/03/20 08:51:21 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.174 2022/02/11 00:43:56 dtucker Exp $ */
 /*
 * Copyright (c) 2000 Markus Friedl.  All rights reserved.
 * Copyright (c) 2005-2020 Damien Miller.  All rights reserved.
@@ -1069,21 +1069,16 @@ addargs(arglist *args, char *fmt, ...)
 	r = vasprintf(&cp, fmt, ap);
 	va_end(ap);
 	if (r == -1)
-		fatal_f("argument too long");
+		fatal("addargs: argument too long");

 	nalloc = args->nalloc;
 	if (args->list == NULL) {
 		nalloc = 32;
 		args->num = 0;
-	} else if (args->num > (256 * 1024))
-		fatal_f("too many arguments");
-	else if (args->num >= args->nalloc)
-		fatal_f("arglist corrupt");
-	else if (args->num+2 >= nalloc)
+	} else if (args->num+2 >= nalloc)
 		nalloc *= 2;

-	args->list = xrecallocarray(args->list, args->nalloc,
-	    nalloc, sizeof(char *));
+	args->list = xrecallocarray(args->list, args->nalloc, nalloc, sizeof(char *));
 	args->nalloc = nalloc;
 	args->list[args->num++] = cp;
 	args->list[args->num] = NULL;
@@ -1100,12 +1095,10 @@ replacearg(arglist *args, u_int which, char *fmt, ...)
 	r = vasprintf(&cp, fmt, ap);
 	va_end(ap);
 	if (r == -1)
-		fatal_f("argument too long");
-	if (args->list == NULL || args->num >= args->nalloc)
-		fatal_f("arglist corrupt");
+		fatal("replacearg: argument too long");

 	if (which >= args->num)
-		fatal_f("tried to replace invalid arg %d >= %d",
+		fatal("replacearg: tried to replace invalid arg %d >= %d",
 		    which, args->num);
 	free(args->list[which]);
 	args->list[which] = cp;
@@ -1116,15 +1109,13 @@ freeargs(arglist *args)
 {
 	u_int i;

-	if (args == NULL)
-		return;
-	if (args->list != NULL && args->num < args->nalloc) {
+	if (args->list != NULL) {
 		for (i = 0; i < args->num; i++)
 			free(args->list[i]);
 		free(args->list);
+		args->nalloc = args->num = 0;
+		args->list = NULL;
 	}
-	args->nalloc = args->num = 0;
-	args->list = NULL;
 }

 /*
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.232 2022/02/25 02:09:27 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.231 2022/01/28 06:18:42 guenther Exp $ */
 /*
 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -709,6 +709,7 @@ mm_answer_sign(struct ssh *ssh, int sock, struct sshbuf *m)
 int
 mm_answer_pwnamallow(struct ssh *ssh, int sock, struct sshbuf *m)
 {
+	char *username;
 	struct passwd *pwent;
 	int r, allowed = 0;
 	u_int i;
@@ -718,12 +719,14 @@ mm_answer_pwnamallow(struct ssh *ssh, int sock, struct sshbuf *m)
 	if (authctxt->attempt++ != 0)
 		fatal_f("multiple attempts for getpwnam");

-	if ((r = sshbuf_get_cstring(m, &authctxt->user, NULL)) != 0)
+	if ((r = sshbuf_get_cstring(m, &username, NULL)) != 0)
 		fatal_fr(r, "parse");

-	pwent = getpwnamallow(ssh, authctxt->user);
+	pwent = getpwnamallow(ssh, username);

-	setproctitle("%s [priv]", pwent ? authctxt->user : "unknown");
+	authctxt->user = xstrdup(username);
+	setproctitle("%s [priv]", pwent ? username : "unknown");
+	free(username);

 	sshbuf_reset(m);

@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.71 2022/03/30 21:13:23 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.70 2021/11/10 06:29:25 djm Exp $ */

 /*
 * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,13 +25,13 @@
 */

 #define KEX_SERVER_KEX	\
-	"sntrup761x25519-sha512," \
-	"[email protected]," \
 	"curve25519-sha256," \
 	"[email protected]," \
 	"ecdh-sha2-nistp256," \
 	"ecdh-sha2-nistp384," \
 	"ecdh-sha2-nistp521," \
+	"sntrup761x25519-sha512," \
+	"[email protected]," \
 	"diffie-hellman-group-exchange-sha256," \
 	"diffie-hellman-group16-sha512," \
 	"diffie-hellman-group18-sha512," \
@@ -79,7 +79,7 @@ _rs_init(u_char *buf, size_t n)
 {
 	if (n < KEYSZ + IVSZ)
 		return;
-	chacha_keysetup(&rs, buf, KEYSZ * 8);
+	chacha_keysetup(&rs, buf, KEYSZ * 8, 0);
 	chacha_ivsetup(&rs, buf + KEYSZ);
 }

@@ -107,7 +107,7 @@ const char *strerror(int e)
 #endif

 #ifndef HAVE_UTIMES
-int utimes(const char *filename, struct timeval *tvp)
+int utimes(char *filename, struct timeval *tvp)
 {
 	struct utimbuf ub;

@@ -412,14 +412,6 @@ getsid(pid_t pid)
 }
 #endif

-#ifndef HAVE_KILLPG
-int
-killpg(pid_t pgrp, int sig)
-{
-	return kill(pgrp, sig);
-}
-#endif
-
 #ifdef FFLUSH_NULL_BUG
 #undef fflush
 int _ssh_compat_fflush(FILE *f)
@@ -62,7 +62,7 @@ struct timeval {
 }
 #endif /* HAVE_STRUCT_TIMEVAL */

-int utimes(const char *, struct timeval *);
+int utimes(char *, struct timeval *);
 #endif /* HAVE_UTIMES */

 #ifndef AT_FDCWD
@@ -1,12 +1,10 @@
-/* OPENBSD ORIGINAL: lib/libc/crypt/chacha_private.h */
-
 /*
 chacha-merged.c version 20080118
 D. J. Bernstein
 Public domain.
 */

-/* $OpenBSD: chacha_private.h,v 1.3 2022/02/28 21:56:29 dtucker Exp $ */
+/* $OpenBSD: chacha_private.h,v 1.2 2013/10/04 07:02:27 djm Exp $ */

 typedef unsigned char u8;
 typedef unsigned int u32;
@@ -54,7 +52,7 @@ static const char sigma[16] = "expand 32-byte k";
 static const char tau[16] = "expand 16-byte k";

 static void
-chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits)
+chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits,u32 ivbits)
 {
  const char *constants;

@@ -89,7 +89,7 @@ struct __res_state _res;

 #ifndef GETSHORT
 #define GETSHORT(s, cp) { \
-	u_char *t_cp = (u_char *)(cp); \
+	register u_char *t_cp = (u_char *)(cp); \
 	(s) = ((u_int16_t)t_cp[0] << 8) \
 	    | ((u_int16_t)t_cp[1]) \
 	    ; \
@@ -99,7 +99,7 @@ struct __res_state _res;

 #ifndef GETLONG
 #define GETLONG(l, cp) { \
-	u_char *t_cp = (u_char *)(cp); \
+	register u_char *t_cp = (u_char *)(cp); \
 	(l) = ((u_int32_t)t_cp[0] << 24) \
 	    | ((u_int32_t)t_cp[1] << 16) \
 	    | ((u_int32_t)t_cp[2] << 8) \
@@ -109,35 +109,36 @@ struct __res_state _res;
 }
 #endif

-/*
- * If the system doesn't have _getshort/_getlong or that are not exactly what
- * we need then use local replacements, avoiding name collisions.
- */
-#if !defined(HAVE__GETSHORT) || !defined(HAVE__GETLONG) || \
-    !defined(HAVE_DECL__GETSHORT) || HAVE_DECL__GETSHORT == 0 || \
-    !defined(HAVE_DECL__GETLONG) || HAVE_DECL__GETLONG == 0
-#define _getshort(x) (_ssh_compat_getshort(x))
-#define _getlong(x) (_ssh_compat_getlong(x))
 /*
 * Routines to insert/extract short/long's.
 */
+
+#ifndef HAVE__GETSHORT
 static u_int16_t
-_getshort(const u_char *msgp)
+_getshort(msgp)
+	register const u_char *msgp;
 {
-	u_int16_t u;
+	register u_int16_t u;

 	GETSHORT(u, msgp);
 	return (u);
 }
+#elif defined(HAVE_DECL__GETSHORT) && (HAVE_DECL__GETSHORT == 0)
+u_int16_t _getshort(register const u_char *);
+#endif

+#ifndef HAVE__GETLONG
 static u_int32_t
-_getlong(const u_char *msgp)
+_getlong(msgp)
+	register const u_char *msgp;
 {
-	u_int32_t u;
+	register u_int32_t u;

 	GETLONG(u, msgp);
 	return (u);
 }
+#elif defined(HAVE_DECL__GETLONG) && (HAVE_DECL__GETLONG == 0)
+u_int32_t _getlong(register const u_char *);
 #endif

 /* ************** */
@@ -65,10 +65,6 @@ int bindresvport_sa(int sd, struct sockaddr *sa);
 void closefrom(int);
 #endif

-#if defined(HAVE_DECL_FTRUNCATE) && HAVE_DECL_FTRUNCATE == 0
-int ftruncate(int filedes, off_t length);
-#endif
-
 #ifndef HAVE_GETLINE
 #include <stdio.h>
 ssize_t getline(char **, size_t *, FILE *);
@@ -82,10 +78,6 @@ int getpagesize(void);
 char *getcwd(char *pt, size_t size);
 #endif

-#ifndef HAVE_KILLPG
-int killpg(pid_t, int);
-#endif
-
 #if defined(HAVE_DECL_MEMMEM) && HAVE_DECL_MEMMEM == 0
 void *memmem(const void *, size_t, const void *, size_t);
 #endif
@@ -18,7 +18,6 @@

 #include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>

 #include "log.h"
@@ -198,53 +197,3 @@ platform_krb5_get_principal_name(const char *pw_name)
 	return NULL;
 #endif
 }
-
-/* returns 1 if account is locked */
-int
-platform_locked_account(struct passwd *pw)
-{
-	int locked = 0;
-	char *passwd = pw->pw_passwd;
-#ifdef USE_SHADOW
-	struct spwd *spw = NULL;
-#ifdef USE_LIBIAF
-	char *iaf_passwd = NULL;
-#endif
-
-	spw = getspnam(pw->pw_name);
-#ifdef HAS_SHADOW_EXPIRE
-	if (spw != NULL && auth_shadow_acctexpired(spw))
-		return 1;
-#endif /* HAS_SHADOW_EXPIRE */
-
-	if (spw != NULL)
-#ifdef USE_LIBIAF
-		iaf_passwd = passwd = get_iaf_password(pw);
-#else
-		passwd = spw->sp_pwdp;
-#endif /* USE_LIBIAF */
-#endif
-
-	/* check for locked account */
-	if (passwd && *passwd) {
-#ifdef LOCKED_PASSWD_STRING
-		if (strcmp(passwd, LOCKED_PASSWD_STRING) == 0)
-			locked = 1;
-#endif
-#ifdef LOCKED_PASSWD_PREFIX
-		if (strncmp(passwd, LOCKED_PASSWD_PREFIX,
-		    strlen(LOCKED_PASSWD_PREFIX)) == 0)
-			locked = 1;
-#endif
-#ifdef LOCKED_PASSWD_SUBSTR
-		if (strstr(passwd, LOCKED_PASSWD_SUBSTR))
-			locked = 1;
-#endif
-	}
-#ifdef USE_LIBIAF
-	if (iaf_passwd != NULL)
-		freezero(iaf_passwd, strlen(iaf_passwd));
-#endif /* USE_LIBIAF */
-
-	return locked;
-}
@@ -28,7 +28,6 @@ void platform_setusercontext(struct passwd *);
 void platform_setusercontext_post_groups(struct passwd *);
 char *platform_get_krb5_client(const char *);
 char *platform_krb5_get_principal_name(const char *);
-int platform_locked_account(struct passwd *);
 int platform_sys_dir_uid(uid_t);
 void platform_disable_tracing(int);

@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.108 2022/02/23 21:21:16 djm Exp $
+.\" $OpenBSD: scp.1,v 1.107 2022/02/10 04:12:38 djm Exp $
 .\"
-.Dd $Mdocdate: February 23 2022 $
+.Dd $Mdocdate: February 10 2022 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -76,9 +76,7 @@ The options are as follows:
 Copies between two remote hosts are transferred through the local host.
 Without this option the data is copied directly between the two remote
 hosts.
-Note that, when using the legacy SCP protocol (via the
-.Fl O
-flag), this option
+Note that, when using the original SCP protocol (the default), this option
 selects batch mode for the second host as
 .Nm
 cannot ask for passwords or passphrases for both hosts.
@@ -111,7 +109,7 @@ This option is directly passed to
 .Xr ssh 1 .
 .It Fl D Ar sftp_server_path
 When using the SFTP protocol support via
-.Fl M ,
+.Fl s ,
 connect directly to a local SFTP server program rather than a
 remote one via
 .Xr ssh 1 .
@@ -143,12 +141,13 @@ This option is directly passed to
 .It Fl l Ar limit
 Limits the used bandwidth, specified in Kbit/s.
 .It Fl O
-Use the legacy SCP protocol for file transfers instead of the SFTP protocol.
+Use the original SCP protocol for file transfers instead of the SFTP protocol.
 Forcing the use of the SCP protocol may be necessary for servers that do
 not implement SFTP, for backwards-compatibility for particular filename
 wildcard patterns and for expanding paths with a
 .Sq ~
 prefix for older SFTP servers.
+This mode is the default.
 .It Fl o Ar ssh_option
 Can be used to pass options to
 .Nm ssh
@@ -258,6 +257,8 @@ to use for the encrypted connection.
 The program must understand
 .Xr ssh 1
 options.
+.It Fl s
+Use the SFTP protocol for transfers rather than the original scp protocol.
 .It Fl T
 Disable strict filename checking.
 By default when copying files from a remote host to a local directory
@@ -294,17 +295,12 @@ debugging connection, authentication, and configuration problems.
 is based on the rcp program in
 .Bx
 source code from the Regents of the University of California.
-.Pp
-Since OpenSSH 8.8,
-.Nm
-has use the SFTP protocol for transfers by default.
 .Sh AUTHORS
 .An Timo Rinne Aq Mt [email protected]
 .An Tatu Ylonen Aq Mt [email protected]
 .Sh CAVEATS
-The legacy SCP protocol (selected by the
-.Fl O
-flag) requires execution of the remote user's shell to perform
+The original SCP protocol (used by default) requires execution of the
+remote user's shell to perform
 .Xr glob 3
 pattern matching.
 This requires careful quoting of any characters that have special meaning to
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.247 2022/03/20 08:52:17 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.245 2022/02/10 04:12:38 djm Exp $ */
 /*
 * scp - secure remote copy.  This is basically patched BSD rcp which
 * uses ssh to do the data transfer (instead of using rcmd).
@@ -449,7 +449,7 @@ main(int argc, char **argv)
 	const char *errstr;
 	extern char *optarg;
 	extern int optind;
-	enum scp_mode_e mode = MODE_SFTP;
+	enum scp_mode_e mode = MODE_SCP;
 	char *sftp_direct = NULL;

 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
@@ -968,7 +968,7 @@ do_sftp_connect(char *host, char *user, int port, char *sftp_direct,
 			return NULL;

 	} else {
-		freeargs(&args);
+		args.list = NULL;
 		addargs(&args, "sftp-server");
 		if (do_cmd(sftp_direct, host, NULL, -1, 0, "sftp",
 		    reminp, remoutp, pidp) < 0)
@@ -1,5 +1,5 @@

-/* $OpenBSD: servconf.c,v 1.384 2022/03/18 04:04:11 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.383 2022/02/08 08:59:12 dtucker Exp $ */
 /*
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
 *                    All rights reserved
@@ -2520,7 +2520,7 @@ parse_server_match_config(ServerOptions *options,

 	initialize_server_options(&mo);
 	parse_server_config(&mo, "reprocess config", cfg, includes,
-	    connectinfo, 0);
+	    connectinfo);
 	copy_set_server_options(options, &mo, 0);
 }

@@ -2698,13 +2698,12 @@ parse_server_config_depth(ServerOptions *options, const char *filename,
 void
 parse_server_config(ServerOptions *options, const char *filename,
    struct sshbuf *conf, struct include_list *includes,
-    struct connection_info *connectinfo, int reexec)
+    struct connection_info *connectinfo)
 {
 	int active = connectinfo ? 0 : 1;
 	parse_server_config_depth(options, filename, conf, includes,
 	    connectinfo, (connectinfo ? SSHCFG_MATCH_ONLY : 0), &active, 0);
-	if (!reexec)
-		process_queued_listen_addrs(options);
+	process_queued_listen_addrs(options);
 }

 static const char *
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.156 2022/03/18 04:04:11 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.155 2021/07/02 05:11:21 dtucker Exp $ */

 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -297,7 +297,7 @@ int	 process_server_config_line(ServerOptions *, char *, const char *, int,
 void	 process_permitopen(struct ssh *ssh, ServerOptions *options);
 void	 load_server_config(const char *, struct sshbuf *);
 void	 parse_server_config(ServerOptions *, const char *, struct sshbuf *,
-	    struct include_list *includes, struct connection_info *, int);
+	    struct include_list *includes, struct connection_info *);
 void	 parse_server_match_config(ServerOptions *,
 	    struct include_list *includes, struct connection_info *);
 int	 parse_server_match_testspec(struct connection_info *, char *);
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.162 2022/03/31 03:07:03 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.161 2022/01/17 21:41:04 djm Exp $ */
 /*
 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
 *
@@ -103,7 +103,6 @@ struct sftp_conn {
 #define SFTP_EXT_LSETSTAT	0x00000020
 #define SFTP_EXT_LIMITS		0x00000040
 #define SFTP_EXT_PATH_EXPAND	0x00000080
-#define SFTP_EXT_COPY_DATA	0x00000100
 	u_int exts;
 	u_int64_t limit_kbps;
 	struct bwlimit bwlimit_in, bwlimit_out;
@@ -535,10 +534,6 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests,
 		    strcmp((char *)value, "1") == 0) {
 			ret->exts |= SFTP_EXT_PATH_EXPAND;
 			known = 1;
-		} else if (strcmp(name, "copy-data") == 0 &&
-		    strcmp((char *)value, "1") == 0) {
-			ret->exts |= SFTP_EXT_COPY_DATA;
-			known = 1;
 		}
 		if (known) {
 			debug2("Server supports extension \"%s\" revision %s",
@@ -1083,121 +1078,6 @@ do_expand_path(struct sftp_conn *conn, const char *path)
 	return do_realpath_expand(conn, path, 1);
 }

-int
-do_copy(struct sftp_conn *conn, const char *oldpath, const char *newpath)
-{
-	Attrib junk, *a;
-	struct sshbuf *msg;
-	u_char *old_handle, *new_handle;
-	u_int mode, status, id;
-	size_t old_handle_len, new_handle_len;
-	int r;
-
-	/* Return if the extension is not supported */
-	if ((conn->exts & SFTP_EXT_COPY_DATA) == 0) {
-		error("Server does not support copy-data extension");
-		return -1;
-	}
-
-	/* Make sure the file exists, and we can copy its perms */
-	if ((a = do_stat(conn, oldpath, 0)) == NULL)
-		return -1;
-
-	/* Do not preserve set[ug]id here, as we do not preserve ownership */
-	if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
-		mode = a->perm & 0777;
-
-		if (!S_ISREG(a->perm)) {
-			error("Cannot copy non-regular file: %s", oldpath);
-			return -1;
-		}
-	} else {
-		/* NB: The user's umask will apply to this */
-		mode = 0666;
-	}
-
-	/* Set up the new perms for the new file */
-	attrib_clear(a);
-	a->perm = mode;
-	a->flags |= SSH2_FILEXFER_ATTR_PERMISSIONS;
-
-	if ((msg = sshbuf_new()) == NULL)
-		fatal("%s: sshbuf_new failed", __func__);
-
-	attrib_clear(&junk); /* Send empty attributes */
-
-	/* Open the old file for reading */
-	id = conn->msg_id++;
-	if ((r = sshbuf_put_u8(msg, SSH2_FXP_OPEN)) != 0 ||
-	    (r = sshbuf_put_u32(msg, id)) != 0 ||
-	    (r = sshbuf_put_cstring(msg, oldpath)) != 0 ||
-	    (r = sshbuf_put_u32(msg, SSH2_FXF_READ)) != 0 ||
-	    (r = encode_attrib(msg, &junk)) != 0)
-		fatal("%s: buffer error: %s", __func__, ssh_err(r));
-	send_msg(conn, msg);
-	debug3("Sent message SSH2_FXP_OPEN I:%u P:%s", id, oldpath);
-
-	sshbuf_reset(msg);
-
-	old_handle = get_handle(conn, id, &old_handle_len,
-	    "remote open(\"%s\")", oldpath);
-	if (old_handle == NULL) {
-		sshbuf_free(msg);
-		return -1;
-	}
-
-	/* Open the new file for writing */
-	id = conn->msg_id++;
-	if ((r = sshbuf_put_u8(msg, SSH2_FXP_OPEN)) != 0 ||
-	    (r = sshbuf_put_u32(msg, id)) != 0 ||
-	    (r = sshbuf_put_cstring(msg, newpath)) != 0 ||
-	    (r = sshbuf_put_u32(msg, SSH2_FXF_WRITE|SSH2_FXF_CREAT|
-	    SSH2_FXF_TRUNC)) != 0 ||
-	    (r = encode_attrib(msg, a)) != 0)
-		fatal("%s: buffer error: %s", __func__, ssh_err(r));
-	send_msg(conn, msg);
-	debug3("Sent message SSH2_FXP_OPEN I:%u P:%s", id, newpath);
-
-	sshbuf_reset(msg);
-
-	new_handle = get_handle(conn, id, &new_handle_len,
-	    "remote open(\"%s\")", newpath);
-	if (new_handle == NULL) {
-		sshbuf_free(msg);
-		free(old_handle);
-		return -1;
-	}
-
-	/* Copy the file data */
-	id = conn->msg_id++;
-	if ((r = sshbuf_put_u8(msg, SSH2_FXP_EXTENDED)) != 0 ||
-	    (r = sshbuf_put_u32(msg, id)) != 0 ||
-	    (r = sshbuf_put_cstring(msg, "copy-data")) != 0 ||
-	    (r = sshbuf_put_string(msg, old_handle, old_handle_len)) != 0 ||
-	    (r = sshbuf_put_u64(msg, 0)) != 0 ||
-	    (r = sshbuf_put_u64(msg, 0)) != 0 ||
-	    (r = sshbuf_put_string(msg, new_handle, new_handle_len)) != 0 ||
-	    (r = sshbuf_put_u64(msg, 0)) != 0)
-		fatal("%s: buffer error: %s", __func__, ssh_err(r));
-	send_msg(conn, msg);
-	debug3("Sent message copy-data \"%s\" 0 0 -> \"%s\" 0",
-	       oldpath, newpath);
-
-	status = get_status(conn, id);
-	if (status != SSH2_FX_OK)
-		error("Couldn't copy file \"%s\" to \"%s\": %s", oldpath,
-		    newpath, fx2txt(status));
-
-	/* Clean up everything */
-	sshbuf_free(msg);
-	do_close(conn, old_handle, old_handle_len);
-	do_close(conn, new_handle, new_handle_len);
-	free(old_handle);
-	free(new_handle);
-
-	return status == SSH2_FX_OK ? 0 : -1;
-}
-
 int
 do_rename(struct sftp_conn *conn, const char *oldpath, const char *newpath,
    int force_legacy)
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.h,v 1.36 2022/03/31 03:07:03 djm Exp $ */
+/* $OpenBSD: sftp-client.h,v 1.35 2022/01/01 01:55:30 jsg Exp $ */

 /*
 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
@@ -125,9 +125,6 @@ int do_statvfs(struct sftp_conn *, const char *, struct sftp_statvfs *, int);
 /* Rename 'oldpath' to 'newpath' */
 int do_rename(struct sftp_conn *, const char *, const char *, int);

-/* Copy 'oldpath' to 'newpath' */
-int do_copy(struct sftp_conn *, const char *, const char *);
-
 /* Link 'oldpath' to 'newpath' */
 int do_hardlink(struct sftp_conn *, const char *, const char *);

@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-glob.c,v 1.30 2022/02/25 09:46:24 dtucker Exp $ */
+/* $OpenBSD: sftp-glob.c,v 1.29 2019/11/13 04:47:52 deraadt Exp $ */
 /*
 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
 *
@@ -51,7 +51,7 @@ fudge_opendir(const char *path)

 	r = xcalloc(1, sizeof(*r));

-	if (do_readdir(cur.conn, path, &r->dir)) {
+	if (do_readdir(cur.conn, (char *)path, &r->dir)) {
 		free(r);
 		return(NULL);
 	}
@@ -112,7 +112,7 @@ fudge_lstat(const char *path, struct stat *st)
 {
 	Attrib *a;

-	if (!(a = do_lstat(cur.conn, path, 1)))
+	if (!(a = do_lstat(cur.conn, (char *)path, 1)))
 		return(-1);

 	attrib_to_stat(a, st);
@@ -125,7 +125,7 @@ fudge_stat(const char *path, struct stat *st)
 {
 	Attrib *a;

-	if (!(a = do_stat(cur.conn, path, 1)))
+	if (!(a = do_stat(cur.conn, (char *)path, 1)))
 		return(-1);

 	attrib_to_stat(a, st);
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.140 2022/03/31 03:05:49 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.139 2022/02/01 23:32:51 djm Exp $ */
 /*
 * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
 *
@@ -44,7 +44,6 @@
 #include <unistd.h>
 #include <stdarg.h>

-#include "atomicio.h"
 #include "xmalloc.h"
 #include "sshbuf.h"
 #include "ssherr.h"
@@ -120,7 +119,6 @@ static void process_extended_fsync(u_int32_t id);
 static void process_extended_lsetstat(u_int32_t id);
 static void process_extended_limits(u_int32_t id);
 static void process_extended_expand(u_int32_t id);
-static void process_extended_copy_data(u_int32_t id);
 static void process_extended(u_int32_t id);

 struct sftp_handler {
@@ -166,7 +164,6 @@ static const struct sftp_handler extended_handlers[] = {
 	{ "limits", "[email protected]", 0, process_extended_limits, 0 },
 	{ "expand-path", "[email protected]", 0,
 	    process_extended_expand, 0 },
-	{ "copy-data", "copy-data", 0, process_extended_copy_data, 1 },
 	{ NULL, NULL, 0, NULL, 0 }
 };

@@ -723,7 +720,6 @@ process_init(void)
 	compose_extension(msg, "[email protected]", "1");
 	compose_extension(msg, "[email protected]", "1");
 	compose_extension(msg, "[email protected]", "1");
-	compose_extension(msg, "copy-data", "1");

 	send_msg(msg);
 	sshbuf_free(msg);
@@ -1596,94 +1592,6 @@ process_extended_expand(u_int32_t id)
 	free(path);
 }

-static void
-process_extended_copy_data(u_int32_t id)
-{
-	u_char buf[64*1024];
-	int read_handle, read_fd, write_handle, write_fd;
-	u_int64_t len, read_off, read_len, write_off;
-	int r, copy_until_eof, status = SSH2_FX_OP_UNSUPPORTED;
-	size_t ret;
-
-	if ((r = get_handle(iqueue, &read_handle)) != 0 ||
-	    (r = sshbuf_get_u64(iqueue, &read_off)) != 0 ||
-	    (r = sshbuf_get_u64(iqueue, &read_len)) != 0 ||
-	    (r = get_handle(iqueue, &write_handle)) != 0 ||
-	    (r = sshbuf_get_u64(iqueue, &write_off)) != 0)
-		fatal("%s: buffer error: %s", __func__, ssh_err(r));
-
-	debug("request %u: copy-data from \"%s\" (handle %d) off %llu len %llu "
-	    "to \"%s\" (handle %d) off %llu",
-	    id, handle_to_name(read_handle), read_handle,
-	    (unsigned long long)read_off, (unsigned long long)read_len,
-	    handle_to_name(write_handle), write_handle,
-	    (unsigned long long)write_off);
-
-	/* For read length of 0, we read until EOF. */
-	if (read_len == 0) {
-		read_len = (u_int64_t)-1 - read_off;
-		copy_until_eof = 1;
-	} else
-		copy_until_eof = 0;
-
-	read_fd = handle_to_fd(read_handle);
-	write_fd = handle_to_fd(write_handle);
-
-	/* Disallow reading & writing to the same handle or same path or dirs */
-	if (read_handle == write_handle || read_fd < 0 || write_fd < 0 ||
-	    !strcmp(handle_to_name(read_handle), handle_to_name(write_handle))) {
-		status = SSH2_FX_FAILURE;
-		goto out;
-	}
-
-	if (lseek(read_fd, read_off, SEEK_SET) < 0) {
-		status = errno_to_portable(errno);
-		error("%s: read_seek failed", __func__);
-		goto out;
-	}
-
-	if ((handle_to_flags(write_handle) & O_APPEND) == 0 &&
-	    lseek(write_fd, write_off, SEEK_SET) < 0) {
-		status = errno_to_portable(errno);
-		error("%s: write_seek failed", __func__);
-		goto out;
-	}
-
-	/* Process the request in chunks. */
-	while (read_len > 0 || copy_until_eof) {
-		len = MINIMUM(sizeof(buf), read_len);
-		read_len -= len;
-
-		ret = atomicio(read, read_fd, buf, len);
-		if (ret == 0 && errno == EPIPE) {
-			status = copy_until_eof ? SSH2_FX_OK : SSH2_FX_EOF;
-			break;
-		} else if (ret == 0) {
-			status = errno_to_portable(errno);
-			error("%s: read failed: %s", __func__, strerror(errno));
-			break;
-		}
-		len = ret;
-		handle_update_read(read_handle, len);
-
-		ret = atomicio(vwrite, write_fd, buf, len);
-		if (ret != len) {
-			status = errno_to_portable(errno);
-			error("%s: write failed: %llu != %llu: %s", __func__,
-			    (unsigned long long)ret, (unsigned long long)len,
-			    strerror(errno));
-			break;
-		}
-		handle_update_write(write_handle, len);
-	}
-
-	if (read_len == 0)
-		status = SSH2_FX_OK;
-
- out:
-	send_status(id, status);
-}
-
 static void
 process_extended(u_int32_t id)
 {
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.140 2022/03/31 17:27:27 naddy Exp $
+.\" $OpenBSD: sftp.1,v 1.138 2021/07/02 05:11:21 dtucker Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: July 2 2021 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -126,7 +126,7 @@ Batch mode reads a series of commands from an input
 .Ar batchfile
 instead of
 .Em stdin .
-Since it lacks user interaction, it should be used in conjunction with
+Since it lacks user interaction it should be used in conjunction with
 non-interactive authentication to obviate the need to enter a password
 at connection time (see
 .Xr sshd 8
@@ -144,7 +144,7 @@ will abort if any of the following
 commands fail:
 .Ic get , put , reget , reput , rename , ln ,
 .Ic rm , mkdir , chdir , ls ,
-.Ic lchdir , copy , cp , chmod , chown ,
+.Ic lchdir , chmod , chown ,
 .Ic chgrp , lpwd , df , symlink ,
 and
 .Ic lmkdir .
@@ -400,18 +400,6 @@ If the
 flag is specified, then symlinks will not be followed.
 Note that this is only supported by servers that implement
 the "[email protected]" extension.
-.It Ic copy Ar oldpath Ar newpath
-Copy remote file from
-.Ar oldpath
-to
-.Ar newpath .
-.Pp
-Note that this is only supported by servers that implement the "copy-data"
-extension.
-.It Ic cp Ar oldpath Ar newpath
-Alias to
-.Ic copy
-command.
 .It Xo Ic df
 .Op Fl hi
 .Op Ar path
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.214 2022/03/31 03:07:03 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.212 2021/09/11 09:05:50 schwarze Exp $ */
 /*
 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
 *
@@ -137,7 +137,6 @@ enum sftp_command {
 	I_CHGRP,
 	I_CHMOD,
 	I_CHOWN,
-	I_COPY,
 	I_DF,
 	I_GET,
 	I_HELP,
@@ -181,8 +180,6 @@ static const struct CMD cmds[] = {
 	{ "chgrp",	I_CHGRP,	REMOTE	},
 	{ "chmod",	I_CHMOD,	REMOTE	},
 	{ "chown",	I_CHOWN,	REMOTE	},
-	{ "copy",	I_COPY,		REMOTE	},
-	{ "cp",		I_COPY,		REMOTE	},
 	{ "df",		I_DF,		REMOTE	},
 	{ "dir",	I_LS,		REMOTE	},
 	{ "exit",	I_QUIT,		NOARGS	},
@@ -289,8 +286,6 @@ help(void)
 	    "chgrp [-h] grp path                Change group of file 'path' to 'grp'\n"
 	    "chmod [-h] mode path               Change permissions of file 'path' to 'mode'\n"
 	    "chown [-h] own path                Change owner of file 'path' to 'own'\n"
-	    "copy oldpath newpath               Copy remote file\n"
-	    "cp oldpath newpath                 Copy remote file\n"
 	    "df [-hi] [path]                    Display statistics for current directory or\n"
 	    "                                   filesystem containing 'path'\n"
 	    "exit                               Quit sftp\n"
@@ -1374,10 +1369,6 @@ parse_args(const char **cpp, int *ignore_errors, int *disable_echo, int *aflag,
 		if ((optidx = parse_link_flags(cmd, argv, argc, sflag)) == -1)
 			return -1;
 		goto parse_two_paths;
-	case I_COPY:
-		if ((optidx = parse_no_flags(cmd, argv, argc)) == -1)
-			return -1;
-		goto parse_two_paths;
 	case I_RENAME:
 		if ((optidx = parse_rename_flags(cmd, argv, argc, lflag)) == -1)
 			return -1;
@@ -1545,11 +1536,6 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
 		err = process_put(conn, path1, path2, *pwd, pflag,
 		    rflag, aflag, fflag);
 		break;
-	case I_COPY:
-		path1 = make_absolute(path1, *pwd);
-		path2 = make_absolute(path2, *pwd);
-		err = do_copy(conn, path1, path2);
-		break;
 	case I_RENAME:
 		path1 = make_absolute(path1, *pwd);
 		path2 = make_absolute(path2, *pwd);
@@ -2286,6 +2272,7 @@ static void
 connect_to_server(char *path, char **args, int *in, int *out)
 {
 	int c_in, c_out;
+
 #ifdef USE_PIPES
 	int pin[2], pout[2];

@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.73 2022/03/31 17:27:27 naddy Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.72 2020/06/22 05:52:05 djm Exp $
 .\"
 .\" Author: Tatu Ylonen <[email protected]>
 .\" Copyright (c) 1995 Tatu Ylonen <[email protected]>, Espoo, Finland
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: June 22 2020 $
 .Dt SSH-AGENT 1
 .Os
 .Sh NAME
@@ -82,12 +82,12 @@ This is the default if
 looks like it's a csh style of shell.
 .It Fl D
 Foreground mode.
-When this option is specified,
+When this option is specified
 .Nm
 will not fork.
 .It Fl d
 Debug mode.
-When this option is specified,
+When this option is specified
 .Nm
 will not fork and will write debug information to standard error.
 .It Fl E Ar fingerprint_hash
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.450 2022/03/18 02:32:22 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.448 2022/02/01 23:32:51 djm Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3538,13 +3538,6 @@ main(int argc, char **argv)
 			return sig_sign(identity_file, cert_principals,
 			    argc, argv, opts, nopts);
 		} else if (strncmp(sign_op, "check-novalidate", 16) == 0) {
-			/* NB. cert_principals is actually namespace, via -n */
-			if (cert_principals == NULL ||
-			    *cert_principals == '\0') {
-				error("Too few arguments for check-novalidate: "
-				    "missing namespace");
-				exit(1);
-			}
 			if (ca_key_path == NULL) {
 				error("Too few arguments for check-novalidate: "
 				    "missing signature file");
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keysign.8,v 1.17 2022/03/31 17:27:27 naddy Exp $
+.\" $OpenBSD: ssh-keysign.8,v 1.16 2019/11/30 07:07:59 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Markus Friedl.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: November 30 2019 $
 .Dt SSH-KEYSIGN 8
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ must be set-uid root if host-based authentication is used.
 .It Pa /etc/ssh/ssh_host_ecdsa_key-cert.pub
 .It Pa /etc/ssh/ssh_host_ed25519_key-cert.pub
 .It Pa /etc/ssh/ssh_host_rsa_key-cert.pub
-If these files exist, they are assumed to contain public certificate
+If these files exist they are assumed to contain public certificate
 information corresponding with the private keys above.
 .El
 .Sh SEE ALSO
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.430 2022/03/31 17:27:27 naddy Exp $
-.Dd $Mdocdate: March 31 2022 $
+.\" $OpenBSD: ssh.1,v 1.429 2022/02/06 00:29:03 jsg Exp $
+.Dd $Mdocdate: February 6 2022 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -705,7 +705,7 @@ argument is
 the listen port will be dynamically allocated on the server and reported
 to the client at run time.
 When used together with
-.Ic -O forward ,
+.Ic -O forward
 the allocated port will be printed to the standard output.
 .Pp
 .It Fl S Ar ctl_path
@@ -1045,7 +1045,7 @@ the user a normal shell as an interactive session.
 All communication with
 the remote command or shell will be automatically encrypted.
 .Pp
-If an interactive session is requested,
+If an interactive session is requested
 .Nm
 by default will only request a pseudo-terminal (pty) for interactive
 sessions when the client has one.
@@ -1055,7 +1055,7 @@ and
 .Fl t
 can be used to override this behaviour.
 .Pp
-If a pseudo-terminal has been allocated, the
+If a pseudo-terminal has been allocated the
 user may use the escape characters noted below.
 .Pp
 If no pseudo-terminal has been allocated,
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.574 2022/03/30 04:33:09 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.573 2022/02/08 08:59:12 dtucker Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -696,7 +696,7 @@ main(int ac, char **av)

 again:
 	while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
-	    "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) { /* HUZdhjruz */
+	    "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
 		switch (opt) {
 		case '1':
 			fatal("SSH protocol v.1 is no longer supported");
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.371 2022/03/31 17:58:44 naddy Exp $
-.Dd $Mdocdate: March 31 2022 $
+.\" $OpenBSD: ssh_config.5,v 1.369 2022/02/15 05:13:36 djm Exp $
+.Dd $Mdocdate: February 15 2022 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -435,7 +435,7 @@ directives will add to the list of certificates used for
 authentication.
 .It Cm CheckHostIP
 If set to
-.Cm yes ,
+.Cm yes
 .Xr ssh 1
 will additionally check the host IP address in the
 .Pa known_hosts
@@ -1165,10 +1165,10 @@ character, then the specified algorithms will be placed at the head of the
 default set.
 The default is:
 .Bd -literal -offset indent
-sntrup761x25519-sha512,
-[email protected],
 curve25519-sha256,[email protected],
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
+sntrup761x25519-sha512,
+[email protected],
 diffie-hellman-group-exchange-sha256,
 diffie-hellman-group16-sha512,
 diffie-hellman-group18-sha512,
@@ -1582,7 +1582,7 @@ If forwarding to a specific destination then the second argument must be
 or a Unix domain socket path,
 otherwise if no destination argument is specified then the remote forwarding
 will be established as a SOCKS proxy.
-When acting as a SOCKS proxy, the destination of the connection can be
+When acting as a SOCKS proxy the destination of the connection can be
 restricted by
 .Cm PermitRemoteOpen .
 .Pp
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.318 2022/03/31 17:27:27 naddy Exp $
-.Dd $Mdocdate: March 31 2022 $
+.\" $OpenBSD: sshd.8,v 1.317 2021/09/10 11:38:38 dtucker Exp $
+.Dd $Mdocdate: September 10 2021 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -650,7 +650,7 @@ Enable all restrictions, i.e. disable port, agent and X11 forwarding,
 as well as disabling PTY allocation
 and execution of
 .Pa ~/.ssh/rc .
-If any future restriction capabilities are added to authorized_keys files,
+If any future restriction capabilities are added to authorized_keys files
 they will be included in this set.
 .It Cm tunnel="n"
 Force a
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.585 2022/03/18 04:04:11 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.584 2022/03/01 01:59:19 djm Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1749,7 +1749,7 @@ main(int ac, char **av)
 		load_server_config(config_file_name, cfg);

 	parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name,
-	    cfg, &includes, NULL, rexeced_flag);
+	    cfg, &includes, NULL);

 #ifdef WITH_OPENSSL
 	if (options.moduli_file != NULL)
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.340 2022/03/31 17:58:44 naddy Exp $
-.Dd $Mdocdate: March 31 2022 $
+.\" $OpenBSD: sshd_config.5,v 1.339 2021/12/04 00:05:39 naddy Exp $
+.Dd $Mdocdate: December 4 2021 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -963,10 +963,10 @@ [email protected]
 .Pp
 The default is:
 .Bd -literal -offset indent
-sntrup761x25519-sha512,
-[email protected],
 curve25519-sha256,[email protected],
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
+sntrup761x25519-sha512,
+[email protected],
 diffie-hellman-group-exchange-sha256,
 diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
 diffie-hellman-group14-sha256
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshsig.c,v 1.29 2022/03/30 04:27:51 djm Exp $ */
+/* $OpenBSD: sshsig.c,v 1.28 2022/02/01 23:34:47 djm Exp $ */
 /*
 * Copyright (c) 2019 Google LLC
 *
@@ -739,7 +739,7 @@ parse_principals_key_and_options(const char *path, u_long linenum, char *line,
 		return SSH_ERR_KEY_NOT_FOUND; /* blank or all-comment line */

 	/* format: identity[,identity...] [option[,option...]] key */
-	if ((tmp = strdelimw(&cp)) == NULL || cp == NULL) {
+	if ((tmp = strdelimw(&cp)) == NULL) {
 		error("%s:%lu: invalid line", path, linenum);
 		r = SSH_ERR_INVALID_FORMAT;
 		goto out;
@@ -777,11 +777,6 @@ parse_principals_key_and_options(const char *path, u_long linenum, char *line,
 			r = SSH_ERR_INVALID_FORMAT;
 			goto out;
 		}
-		if (cp == NULL || *cp == '\0') {
-			error("%s:%lu: missing key", path, linenum);
-			r = SSH_ERR_INVALID_FORMAT;
-			goto out;
-		}
 		*cp++ = '\0';
 		skip_space(&cp);
 		if (sshkey_read(key, &cp) != 0) {
@@ -1,6 +1,6 @@
-/* $OpenBSD: version.h,v 1.94 2022/04/04 22:45:25 djm Exp $ */
+/* $OpenBSD: version.h,v 1.93 2022/02/23 11:07:09 djm Exp $ */

-#define SSH_VERSION	"OpenSSH_9.0"
+#define SSH_VERSION	"OpenSSH_8.9"

 #define SSH_PORTABLE	"p1"
 #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.37 2022/03/13 23:27:54 cheloha Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.36 2019/11/12 22:32:48 djm Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -91,7 +91,8 @@ xstrdup(const char *str)

 	len = strlen(str) + 1;
 	cp = xmalloc(len);
-	return memcpy(cp, str, len);
+	strlcpy(cp, str, len);
+	return cp;
 }

 int
Author	SHA1	Message	Date
Damien Miller	b738f18f4b	mention sntrup761x25519-sha512 in manpages Spotted by Colin Watson	2025-08-13 09:16:34 +10:00
Damien Miller	ffdbae4c02	support sntrup761x25519-sha512 alias OpenSSH 8.9 supports the [email protected] key agreement algorithm. As part of standardisation, this algorithm has been assigned the name sntrup761x25519-sha512. This commit enables the existing algorithm under this new name.	2025-08-11 15:36:27 +10:00
Darren Tucker	bc04f2674a	Only return events from ppoll that were requested. If the underlying system's select() returns bits that were not in the request set, our ppoll() implementation can return revents for events not requested, which can apparently cause a hang. Only return revents for activity in the requested event set. bz#3416, analysis and fix by yaroslav.kuzmin at vmssoftware com, ok djm@	2022-04-01 23:58:56 +11:00
Darren Tucker	5880200867	Resync fmt_scaled. with OpenBSD. Fixes underflow reported in bz#3401.	2022-03-11 18:48:07 +11:00
Darren Tucker	244f640711	Default to not using sandbox when cross compiling. On most systems poll(2) does not work when the number of FDs is reduced with setrlimit, so assume it doesn't when cross compiling and we can't run the test. bz#3398.	2022-03-08 20:08:11 +11:00
[email protected]	238ac091dd	upstream: pack pollfd array before server_accept_loop() ppoll() call, and terminate sshd if ppoll() returns errno==EINVAL avoids spin in ppoll when MaxStartups > RLIMIT_NOFILE, reported by Daniel Micay feedback/ok deraadt OpenBSD-Commit-ID: dbab1c24993ac977ec24d83283b8b7528f7c2c15	2022-03-01 14:39:05 +11:00
Darren Tucker	995cf19fbe	Allow ppoll_time64 in seccomp sandbox. Should fix sandbox violations on (some? at least i386 and armhf) 32bit Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at debian.org via bz#3396.	2022-02-26 14:14:40 +11:00
Colin Watson	6c4a67ece3	Improve detection of -fzero-call-used-regs=all support GCC doesn't tell us whether this option is supported unless it runs into the situation where it would need to emit corresponding code.	2022-02-25 11:28:45 +11:00
[email protected]	2ebf478107	upstream: free(3) wants stdlib.h OpenBSD-Commit-ID: 227a8c70a95b4428c49e46863c9ef4bd318a3b8a	2022-02-24 08:24:35 +11:00