summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--compat.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b65e663a0..1b203ac87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - markus@cvs.openbsd.org 2002/03/06 00:23:27 6 - markus@cvs.openbsd.org 2002/03/06 00:23:27
7 [compat.c dh.c] 7 [compat.c dh.c]
8 undo 8 undo
9 - markus@cvs.openbsd.org 2002/03/06 00:24:39
10 [compat.c]
11 compat.c
9 12
1020020305 1320020305
11 - stevesk@cvs.openbsd.org 2002/03/02 09:34:42 14 - stevesk@cvs.openbsd.org 2002/03/02 09:34:42
@@ -7807,4 +7810,4 @@
7807 - Wrote replacements for strlcpy and mkdtemp 7810 - Wrote replacements for strlcpy and mkdtemp
7808 - Released 1.0pre1 7811 - Released 1.0pre1
7809 7812
7810$Id: ChangeLog,v 1.1910 2002/03/07 01:58:42 djm Exp $ 7813$Id: ChangeLog,v 1.1911 2002/03/07 01:59:02 djm Exp $
diff --git a/compat.c b/compat.c
index 906547079..74d5ed85e 100644
--- a/compat.c
+++ b/compat.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. 2 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: compat.c,v 1.60 2002/03/06 00:23:27 markus Exp $"); 26RCSID("$OpenBSD: compat.c,v 1.61 2002/03/06 00:24:39 markus Exp $");
27 27
28#include "buffer.h" 28#include "buffer.h"
29#include "packet.h" 29#include "packet.h"
@@ -73,8 +73,8 @@ compat_datafellows(const char *version)
73 { "OpenSSH_2.5.0*," 73 { "OpenSSH_2.5.0*,"
74 "OpenSSH_2.5.1*," 74 "OpenSSH_2.5.1*,"
75 "OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY }, 75 "OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY },
76 { "OpenSSH_2.5.3*", 76 { "OpenSSH_2.5.3*", SSH_BUG_NOREKEY },
77 SSH_BUG_NOREKEY }, 77 { "Sun_SSH_1.0*", SSH_BUG_NOREKEY },
78 { "OpenSSH*", 0 }, 78 { "OpenSSH*", 0 },
79 { "*MindTerm*", 0 }, 79 { "*MindTerm*", 0 },
80 { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| 80 { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|