upstream: Remove SSH_BUG_PASSWORDPAD compat bit

since it's no longer used. ok markus@

OpenBSD-Commit-ID: b92c21f56fe4b7f9a54790d6a9650725c226820b

diff --git a/compat.c b/compat.c
index 7d0e271535c19dfd3b2c028430eb5ff0fec5bcfe..3d40f1a3d4a095a6a493d86e3a254e585096a4fd 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.122 2023/02/16 07:55:15 dtucker Exp $ */
+/* $OpenBSD: compat.c,v 1.123 2023/02/16 10:10:00 dtucker Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -79,17 +79,6 @@ compat_banner(struct ssh *ssh, const char *version)
                { "1.7 SecureFX*",      SSH_OLD_SESSIONID },
                { "Cisco-1.*",          SSH_BUG_DHGEX_LARGE|
                                        SSH_BUG_HOSTKEYS },
-               { "*SSH Compatible Server*",                    /* Netscreen */
-                                       SSH_BUG_PASSWORDPAD },
-               { "*OSU_0*,"
-                 "OSU_1.0*,"
-                 "OSU_1.1*,"
-                 "OSU_1.2*,"
-                 "OSU_1.3*,"
-                 "OSU_1.4*,"
-                 "OSU_1.5alpha1*,"
-                 "OSU_1.5alpha2*,"
-                 "OSU_1.5alpha3*",     SSH_BUG_PASSWORDPAD },
                { "*SSH_Version_Mapper*",
                                        SSH_BUG_SCANNER },
                { "PuTTY_Local:*,"      /* dev versions < Sep 2014 */

diff --git a/compat.h b/compat.h
index a9937dfdb11b2b2b0e1d77cc3735911c844e1415..9abe056dd5e8e2c2bc56d2f1d3021f6b810e9779 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.h,v 1.58 2023/02/16 07:55:15 dtucker Exp $ */
+/* $OpenBSD: compat.h,v 1.59 2023/02/16 10:10:00 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
@@ -37,7 +37,7 @@
 /* #define unused              0x00000080 */
 /* #define unused              0x00000100 */
 /* #define unused              0x00000200 */
-#define SSH_BUG_PASSWORDPAD    0x00000400
+/* #define unused              0x00000400 */
 #define SSH_BUG_SCANNER                0x00000800
 #define SSH_BUG_BIGENDIANAES   0x00001000
 #define SSH_BUG_RSASIGMD5      0x00002000