From: dtucker <dtucker@openbsd.org>
Date: Thu, 16 Feb 2023 07:55:15 +0000 (+0000)
Subject: Remove SSH_BUG_IGNOREMSG compat flag since it's only applicable to SSH1
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=04444b3a4cd55867f808eadfc03caffb82a2aebc;p=openbsd

Remove SSH_BUG_IGNOREMSG compat flag since it's only applicable to SSH1
and thus no longer used.  ok markus@ "kill it with fire" djm@
---

diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c
index 38c7aaa6219..09e5cc9563b 100644
--- a/usr.bin/ssh/compat.c
+++ b/usr.bin/ssh/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.121 2023/02/02 12:10:05 djm Exp $ */
+/* $OpenBSD: compat.c,v 1.122 2023/02/16 07:55:15 dtucker Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -75,13 +75,6 @@ compat_banner(struct ssh *ssh, const char *version)
 		{ "3.0.*",		SSH_BUG_DEBUG },
 		{ "3.0 SecureCRT*",	SSH_OLD_SESSIONID },
 		{ "1.7 SecureFX*",	SSH_OLD_SESSIONID },
-		{ "1.2.18*,"
-		  "1.2.19*,"
-		  "1.2.20*,"
-		  "1.2.21*,"
-		  "1.2.22*",		SSH_BUG_IGNOREMSG },
-		{ "1.3.2*",		/* F-Secure */
-					SSH_BUG_IGNOREMSG },
 		{ "Cisco-1.*",		SSH_BUG_DHGEX_LARGE|
 					SSH_BUG_HOSTKEYS },
 		{ "*SSH Compatible Server*",			/* Netscreen */
diff --git a/usr.bin/ssh/compat.h b/usr.bin/ssh/compat.h
index 167409b2bd3..a9937dfdb11 100644
--- a/usr.bin/ssh/compat.h
+++ b/usr.bin/ssh/compat.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.h,v 1.57 2021/06/06 03:40:39 djm Exp $ */
+/* $OpenBSD: compat.h,v 1.58 2023/02/16 07:55:15 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
@@ -35,7 +35,7 @@
 /* #define unused		0x00000020 */
 #define SSH_BUG_DEBUG		0x00000040
 /* #define unused		0x00000080 */
-#define SSH_BUG_IGNOREMSG	0x00000100
+/* #define unused		0x00000100 */
 /* #define unused		0x00000200 */
 #define SSH_BUG_PASSWORDPAD	0x00000400
 #define SSH_BUG_SCANNER		0x00000800