- (bal) Sync with OpenBSD:
- markus@cvs.openbsd.org 2000/10/31 9:31:58
[compat.c]
handle all old openssh versions
- markus@cvs.openbsd.org 2000/10/31 13:1853
[deattack.c]
so that large packets do not wrap "n"; from netbsd
- (bal) rijndel.c - fix up RCSID to match OpenBSD tree
diff --git a/ChangeLog b/ChangeLog
index dc436d8..3e9e55e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+20001105
+ - (bal) Sync with OpenBSD:
+ - markus@cvs.openbsd.org 2000/10/31 9:31:58
+ [compat.c]
+ handle all old openssh versions
+ - markus@cvs.openbsd.org 2000/10/31 13:1853
+ [deattack.c]
+ so that large packets do not wrap "n"; from netbsd
+ - (bal) rijndel.c - fix up RCSID to match OpenBSD tree
+
20001029
- (stevesk) Fix typo in auth.c: USE_PAM not PAM
- (stevesk) Create contrib/cygwin/ directory; patch from
diff --git a/compat.c b/compat.c
index a4e05eb..362c3cb 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.26 2000/10/26 18:38:28 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.27 2000/10/31 09:31:58 markus Exp $");
#include "ssh.h"
#include "packet.h"
@@ -62,8 +62,7 @@
char *pat;
int bugs;
} check[] = {
- { "^OpenSSH-2\\.[01]", SSH_OLD_SESSIONID },
- { "^OpenSSH_2\\.2", SSH_OLD_SESSIONID },
+ { "^OpenSSH[-_]2\\.[012]", SSH_OLD_SESSIONID },
{ "MindTerm", 0 },
{ "^2\\.1\\.0 ", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
SSH_OLD_SESSIONID },
diff --git a/deattack.c b/deattack.c
index 74a46c0..df1d224 100644
--- a/deattack.c
+++ b/deattack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: deattack.c,v 1.9 2000/09/07 20:27:51 deraadt Exp $ */
+/* $OpenBSD: deattack.c,v 1.10 2000/10/31 13:18:53 markus Exp $ */
/*
* Cryptographic attack detector for ssh - source code
@@ -85,7 +85,7 @@
detect_attack(unsigned char *buf, u_int32_t len, unsigned char *IV)
{
static u_int16_t *h = (u_int16_t *) NULL;
- static u_int16_t n = HASH_MINSIZE / HASH_ENTRYSIZE;
+ static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE;
register u_int32_t i, j;
u_int32_t l;
register unsigned char *c;
diff --git a/rijndael.c b/rijndael.c
index 737007e..9637380 100644
--- a/rijndael.c
+++ b/rijndael.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rijndael.c,v 1.1 2000/10/13 18:59:14 markus Exp $ */
+/* $OpenBSD: rijndael.c,v 1.2 2000/10/15 14:14:01 markus Exp $ */
/* This is an independent implementation of the encryption algorithm: */
/* */