upstream commit

Drop compatibility hacks for some ancient SSH
implementations, including ssh.com <=2.* and OpenSSH <= 3.*.

These versions were all released in or before 2001 and predate the
final SSH RFCs. The hacks in question aren't necessary for RFC-
compliant SSH implementations.

ok markus@

OpenBSD-Commit-ID: 4be81c67db57647f907f4e881fb9341448606138

1 files changed, 8 insertions, 13 deletions

diff --git a/monitor.c b/monitor.c
index b0227eee1..89c8c958a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.177 2017/12/21 00:00:28 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.178 2018/01/23 05:27:21 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1255,18 +1255,13 @@ monitor_valid_userblob(u_char *data, u_int datalen)
         free(userstyle);
         free(cp);
         buffer_skip_string(&b);
-        if (datafellows & SSH_BUG_PKAUTH) {
-                if (!buffer_get_char(&b))
-                        fail++;
-        } else {
-                cp = buffer_get_cstring(&b, NULL);
-                if (strcmp("publickey", cp) != 0)
-                        fail++;
-                free(cp);
-                if (!buffer_get_char(&b))
-                        fail++;
-                buffer_skip_string(&b);
-        }
+        cp = buffer_get_cstring(&b, NULL);
+        if (strcmp("publickey", cp) != 0)
+                fail++;
+        free(cp);
+        if (!buffer_get_char(&b))
+                fail++;
+        buffer_skip_string(&b);
         buffer_skip_string(&b);
         if (buffer_len(&b) != 0)
                 fail++;