From: djm <djm@openbsd.org>
Date: Tue, 23 Jan 2018 05:12:12 +0000 (+0000)
Subject: unbreak support for clients that advertise a protocol version
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=52cc767ecaa6ae0e757a1daeb60f06a7d0e06fce;p=openbsd

unbreak support for clients that advertise a protocol version
of "1.99" (indicating both v2 and v1 support). Busted by me during
SSHv1 purge in r1.358; bz2810, ok dtucker
---

diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index c3282157068..c93e0887a67 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.500 2018/01/23 05:01:15 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.501 2018/01/23 05:12:12 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -431,7 +431,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
 	debug("Local version string %.200s", server_version_string);
 
 	if (remote_major != 2 ||
-	    (remote_major == 1 && remote_minor != 99)) {
+	    !(remote_major == 1 && remote_minor == 99)) {
 		s = "Protocol major versions differ.\n";
 		(void) atomicio(vwrite, sock_out, s, strlen(s));
 		close(sock_in);