diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | compat.c | 5 | ||||
-rw-r--r-- | deattack.c | 4 | ||||
-rw-r--r-- | rijndael.c | 2 |
4 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,13 @@ | |||
1 | 20001105 | ||
2 | - (bal) Sync with OpenBSD: | ||
3 | - markus@cvs.openbsd.org 2000/10/31 9:31:58 | ||
4 | [compat.c] | ||
5 | handle all old openssh versions | ||
6 | - markus@cvs.openbsd.org 2000/10/31 13:1853 | ||
7 | [deattack.c] | ||
8 | so that large packets do not wrap "n"; from netbsd | ||
9 | - (bal) rijndel.c - fix up RCSID to match OpenBSD tree | ||
10 | |||
1 | 20001029 | 11 | 20001029 |
2 | - (stevesk) Fix typo in auth.c: USE_PAM not PAM | 12 | - (stevesk) Fix typo in auth.c: USE_PAM not PAM |
3 | - (stevesk) Create contrib/cygwin/ directory; patch from | 13 | - (stevesk) Create contrib/cygwin/ directory; patch from |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: compat.c,v 1.26 2000/10/26 18:38:28 markus Exp $"); | 26 | RCSID("$OpenBSD: compat.c,v 1.27 2000/10/31 09:31:58 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "packet.h" | 29 | #include "packet.h" |
@@ -62,8 +62,7 @@ compat_datafellows(const char *version) | |||
62 | char *pat; | 62 | char *pat; |
63 | int bugs; | 63 | int bugs; |
64 | } check[] = { | 64 | } check[] = { |
65 | { "^OpenSSH-2\\.[01]", SSH_OLD_SESSIONID }, | 65 | { "^OpenSSH[-_]2\\.[012]", SSH_OLD_SESSIONID }, |
66 | { "^OpenSSH_2\\.2", SSH_OLD_SESSIONID }, | ||
67 | { "MindTerm", 0 }, | 66 | { "MindTerm", 0 }, |
68 | { "^2\\.1\\.0 ", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| | 67 | { "^2\\.1\\.0 ", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| |
69 | SSH_OLD_SESSIONID }, | 68 | SSH_OLD_SESSIONID }, |
diff --git a/deattack.c b/deattack.c index 74a46c0e7..df1d22409 100644 --- a/deattack.c +++ b/deattack.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: deattack.c,v 1.9 2000/09/07 20:27:51 deraadt Exp $ */ | 1 | /* $OpenBSD: deattack.c,v 1.10 2000/10/31 13:18:53 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Cryptographic attack detector for ssh - source code | 4 | * Cryptographic attack detector for ssh - source code |
@@ -85,7 +85,7 @@ int | |||
85 | detect_attack(unsigned char *buf, u_int32_t len, unsigned char *IV) | 85 | detect_attack(unsigned char *buf, u_int32_t len, unsigned char *IV) |
86 | { | 86 | { |
87 | static u_int16_t *h = (u_int16_t *) NULL; | 87 | static u_int16_t *h = (u_int16_t *) NULL; |
88 | static u_int16_t n = HASH_MINSIZE / HASH_ENTRYSIZE; | 88 | static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE; |
89 | register u_int32_t i, j; | 89 | register u_int32_t i, j; |
90 | u_int32_t l; | 90 | u_int32_t l; |
91 | register unsigned char *c; | 91 | register unsigned char *c; |
diff --git a/rijndael.c b/rijndael.c index 737007ec8..963738030 100644 --- a/rijndael.c +++ b/rijndael.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rijndael.c,v 1.1 2000/10/13 18:59:14 markus Exp $ */ | 1 | /* $OpenBSD: rijndael.c,v 1.2 2000/10/15 14:14:01 markus Exp $ */ |
2 | 2 | ||
3 | /* This is an independent implementation of the encryption algorithm: */ | 3 | /* This is an independent implementation of the encryption algorithm: */ |
4 | /* */ | 4 | /* */ |