diff options
| author | stsp@openbsd.org <stsp@openbsd.org> | 2018-01-23 20:00:58 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-01-24 11:59:01 +1100 |
| commit | c9c1bba06ad1c7cad8548549a68c071bd807af60 (patch) | |
| tree | 9b526823b530aea13de0ee815cb1cd8dea1e0c12 | |
| parent | a60c5dcfa2538ffc94dc5b5adb3db5b6ed905bdb (diff) | |
upstream commit
Fix a logic bug in sshd_exchange_identification which
prevented clients using major protocol version 2 from connecting to the
server. ok millert@
OpenBSD-Commit-ID: 8668dec04586e27f1c0eb039ef1feb93d80a5ee9
| -rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.502 2018/01/23 05:27:21 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.503 2018/01/23 20:00:58 stsp Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -450,7 +450,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) chop(server_version_string); debug("Local version string %.200s", server_version_string); - if (remote_major != 2 || + if (remote_major != 2 && !(remote_major == 1 && remote_minor == 99)) { s = "Protocol major versions differ.\n"; (void) atomicio(vwrite, sock_out, s, strlen(s)); |