From 32b320222b62aef45122f24943a04b0bf2ff97f1 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker@openbsd.org>
Date: Thu, 16 Feb 2023 10:10:00 +0000
Subject: [PATCH] Remove SSH_BUG_PASSWORDPAD compat bit since it's no longer
 used. ok markus@

---
 usr.bin/ssh/compat.c | 13 +------------
 usr.bin/ssh/compat.h |  4 ++--
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c
index 09e5cc9563b..4a580070beb 100644
--- a/usr.bin/ssh/compat.c
+++ b/usr.bin/ssh/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.
  *
@@ -77,17 +77,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/usr.bin/ssh/compat.h b/usr.bin/ssh/compat.h
index a9937dfdb11..9abe056dd5e 100644
--- a/usr.bin/ssh/compat.h
+++ b/usr.bin/ssh/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
-- 
2.20.1