4 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d695e045..f5520129a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20001207
+ - (bal) OpenSSH CVS updates:
+   - markus@cvs.openbsd.org 2000/12/06 22:58:14 
+     [compat.c compat.h packet.c]
+     disable debug messages for ssh.com/f-secure 2.0.1x, 2.1.0
+
 20001206
  - (bal) OpenSSH CVS updates:
    - markus@cvs.openbsd.org 2000/12/05 20:34:09
diff --git a/compat.c b/compat.c
index b4e99a928..291cfc743 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.30 2000/12/03 11:29:04 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.31 2000/12/06 22:58:14 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -65,13 +65,14 @@ compat_datafellows(const char *version)
                 { "^OpenSSH[-_]2\\.[012]",      SSH_OLD_SESSIONID },
                 { "MindTerm",           0 },
                 { "^2\\.1\\.0",         SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
-                                        SSH_OLD_SESSIONID },
+                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG },
                 { "^2\\.0\\.1[3-9]",    SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
-                                        SSH_OLD_SESSIONID|
+                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                         SSH_BUG_PKSERVICE|SSH_BUG_X11FWD },
                 { "^2\\.0\\.",          SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
-                                        SSH_OLD_SESSIONID|SSH_BUG_PKAUTH|
-                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD },
+                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
+                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
+                                        SSH_BUG_PKAUTH },
                 { "^2\\.[23]\\.0",      SSH_BUG_HMAC},
                 { "^2\\.[2-9]\\.",      0 },
                 { "^2\\.4$",            SSH_OLD_SESSIONID}, /* Van Dyke */
diff --git a/compat.h b/compat.h
index 86e471506..cf97c7d28 100644
--- a/compat.h
+++ b/compat.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: compat.h,v 1.12 2000/12/03 11:15:03 markus Exp $"); */
+/* RCSID("$OpenBSD: compat.h,v 1.13 2000/12/06 22:58:15 markus Exp $"); */
 
 #ifndef COMPAT_H
 #define COMPAT_H
@@ -37,6 +37,7 @@
 #define SSH_BUG_X11FWD          0x08
 #define SSH_OLD_SESSIONID       0x10
 #define SSH_BUG_PKAUTH          0x20
+#define SSH_BUG_DEBUG           0x40
 
 void    enable_compat13(void);
 void    enable_compat20(void);
diff --git a/packet.c b/packet.c
index 8c9374fca..3e8ab2383 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.38 2000/10/12 14:21:12 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.39 2000/12/06 22:58:15 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -1101,6 +1101,9 @@ packet_send_debug(const char *fmt,...)
         char buf[1024];
         va_list args;
 
+        if (compat20 && (datafellows & SSH_BUG_DEBUG))
+                return;
+
         va_start(args, fmt);
         vsnprintf(buf, sizeof(buf), fmt, args);
         va_end(args);