- jakob@cvs.openbsd.org 2001/08/02 16:14:05

[openssh.git] / compat.c

diff --git a/compat.c b/compat.c
index 4dfab90cedacc73a37cdb64da0a4ee6d716f2286..77bba28a277cb6e1998a05396e7f5a5051308932 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.43 2001/04/04 15:50:55 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.51 2001/06/25 08:25:37 markus Exp $");
 
 #ifdef HAVE_LIBPCRE
 #  include <pcreposix.h>
@@ -69,30 +69,42 @@ compat_datafellows(const char *version)
        } check[] = {
                { "^OpenSSH[-_]2\\.[012]",
                                        SSH_OLD_SESSIONID|SSH_BUG_BANNER|
-                                       SSH_OLD_DHGEX },
+                                       SSH_OLD_DHGEX|SSH_BUG_NOREKEY },
                { "^OpenSSH_2\\.3\\.0", SSH_BUG_BANNER|SSH_BUG_BIGENDIANAES|
-                                       SSH_OLD_DHGEX},
+                                       SSH_OLD_DHGEX|SSH_BUG_NOREKEY},
+               { "^OpenSSH_2\\.3\\.",  SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
+                                       SSH_BUG_NOREKEY},
                { "^OpenSSH_2\\.5\\.[01]p1",
-                                       SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX },
+                                       SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
+                                       SSH_BUG_NOREKEY },
                { "^OpenSSH_2\\.5\\.[012]",
-                                       SSH_OLD_DHGEX },
+                                       SSH_OLD_DHGEX|SSH_BUG_NOREKEY },
+               { "^OpenSSH_2\\.5\\.3",
+                                       SSH_BUG_NOREKEY },
                { "^OpenSSH",           0 },
                { "MindTerm",           0 },
                { "^2\\.1\\.0",         SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
-                                       SSH_BUG_RSASIGMD5 },
+                                       SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE },
                { "^2\\.1 ",            SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
-                                       SSH_BUG_RSASIGMD5 },
+                                       SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE },
                { "^2\\.0\\.1[3-9]",    SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
-                                       SSH_BUG_PKOK|SSH_BUG_RSASIGMD5 },
+                                       SSH_BUG_PKOK|SSH_BUG_RSASIGMD5|
+                                       SSH_BUG_HBSERVICE|SSH_BUG_OPENFAILURE },
+               { "^2\\.0\\.1[1-2]",    SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
+                                       SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
+                                       SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
+                                       SSH_BUG_PKAUTH|SSH_BUG_PKOK|
+                                       SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE },
                { "^2\\.0\\.",          SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
                                        SSH_BUG_PKAUTH|SSH_BUG_PKOK|
-                                       SSH_BUG_RSASIGMD5 },
+                                       SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE|
+                                       SSH_BUG_DERIVEKEY },
                { "^2\\.[23]\\.0",      SSH_BUG_HMAC|SSH_BUG_RSASIGMD5 },
                { "^2\\.3\\.",          SSH_BUG_RSASIGMD5 },
                { "^2\\.[2-9]\\.",      0 },