[openssh-commits] [openssh] 02/02: upstream: Have sftp reject "-1" in the same way as ssh(1) and

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 9e3220b585c5be19a7431ea4ff8884c137b3a81c
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Wed Feb 26 11:46:51 2020 +0000

    upstream: Have sftp reject "-1" in the same way as ssh(1) and
    
    scp(1) do instead of accepting and silently ignoring it since protocol 1
    support has been removed.  Spotted by shivakumar2696 at gmail.com, ok
    deraadt@
    
    OpenBSD-Commit-ID: b79f95559a1c993214f4ec9ae3c34caa87e9d5de
---
 sftp.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sftp.c b/sftp.c
index ff14d3c2..fc809dc6 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.197 2020/01/23 07:10:22 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.198 2020/02/26 11:46:51 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm at openbsd.org>
  *
@@ -2377,7 +2377,7 @@ main(int argc, char **argv)
 {
 	int in, out, ch, err, tmp, port = -1;
 	char *host = NULL, *user, *cp, *file2 = NULL;
-	int debug_level = 0, sshver = 2;
+	int debug_level = 0;
 	char *file1 = NULL, *sftp_server = NULL;
 	char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL;
 	const char *errstr;
@@ -2445,12 +2445,10 @@ main(int argc, char **argv)
 			debug_level++;
 			break;
 		case '1':
-			sshver = 1;
-			if (sftp_server == NULL)
-				sftp_server = _PATH_SFTP_SERVER;
+			fatal("SSH protocol v.1 is no longer supported");
 			break;
 		case '2':
-			sshver = 2;
+			/* accept silently */
 			break;
 		case 'a':
 			global_aflag = 1;
@@ -2555,7 +2553,6 @@ main(int argc, char **argv)
 			addargs(&args, "-l");
 			addargs(&args, "%s", user);
 		}
-		addargs(&args, "-oProtocol %d", sshver);
 
 		/* no subsystem if the server-spec contains a '/' */
 		if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.