diff options
| author | Damien Miller <djm@mindrot.org> | 2000-10-16 12:14:42 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-10-16 12:14:42 +1100 |
| commit | 50a41ed079629fdcd9a1d2a781b73170422fc73a (patch) | |
| tree | dbac99a364edff124412c16f079975a2e89a0389 /compat.c | |
| parent | 5993935f76e66c957f02efaa8fc0c8ff8a3f92c9 (diff) | |
- (djm) Sync with OpenBSD:
- markus@cvs.openbsd.org 2000/10/14 04:01:15
[cipher.c]
debug3
- markus@cvs.openbsd.org 2000/10/14 04:07:23
[scp.c]
remove spaces from arguments; from djm@mindrot.org
- markus@cvs.openbsd.org 2000/10/14 06:09:46
[ssh.1]
Cipher is for SSH-1 only
- markus@cvs.openbsd.org 2000/10/14 06:12:09
[servconf.c servconf.h serverloop.c session.c sshd.8]
AllowTcpForwarding; from naddy@
- markus@cvs.openbsd.org 2000/10/14 06:16:56
[auth2.c compat.c compat.h sshconnect2.c version.h]
OpenSSH_2.3; note that is is not complete, but the version number
needs to be changed for interoperability reasons
- markus@cvs.openbsd.org 2000/10/14 06:19:45
[auth-rsa.c]
do not send RSA challenge if key is not allowed by key-options; from
eivind@ThinkSec.com
- markus@cvs.openbsd.org 2000/10/15 08:14:01
[rijndael.c session.c]
typos; from stevesk@sweden.hp.com
- markus@cvs.openbsd.org 2000/10/15 08:18:31
[rijndael.c]
typo
- Copy manpages back over from OpenBSD - too tedious to wade through diffs
Diffstat (limited to 'compat.c')
| -rw-r--r-- | compat.c | 21 |
1 files changed, 13 insertions, 8 deletions
| @@ -23,7 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include "includes.h" | 25 | #include "includes.h" |
| 26 | RCSID("$OpenBSD: compat.c,v 1.24 2000/10/10 20:20:45 markus Exp $"); | 26 | RCSID("$OpenBSD: compat.c,v 1.25 2000/10/14 12:16:56 markus Exp $"); |
| 27 | 27 | ||
| 28 | #include "ssh.h" | 28 | #include "ssh.h" |
| 29 | #include "packet.h" | 29 | #include "packet.h" |
| @@ -62,13 +62,18 @@ compat_datafellows(const char *version) | |||
| 62 | char *pat; | 62 | char *pat; |
| 63 | int bugs; | 63 | int bugs; |
| 64 | } check[] = { | 64 | } check[] = { |
| 65 | {"^.*MindTerm", 0}, | 65 | { "^OpenSSH-2\\.[01]", SSH_OLD_SESSIONID }, |
| 66 | {"^2\\.1\\.0 ", SSH_BUG_SIGBLOB|SSH_BUG_HMAC}, | 66 | { "^OpenSSH_2\\.2", SSH_OLD_SESSIONID }, |
| 67 | {"^2\\.0\\.", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|SSH_BUG_PUBKEYAUTH|SSH_BUG_X11FWD}, | 67 | { "MindTerm", 0 }, |
| 68 | {"^2\\.[23]\\.0 ", SSH_BUG_HMAC|SSH_COMPAT_SESSIONID_ENCODING}, | 68 | { "^2\\.1\\.0 ", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| |
| 69 | {"^2\\.[2-9]\\.", SSH_COMPAT_SESSIONID_ENCODING}, | 69 | SSH_OLD_SESSIONID }, |
| 70 | {"^2\\.", SSH_BUG_HMAC|SSH_COMPAT_SESSIONID_ENCODING}, | 70 | { "^2\\.0\\.", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| |
| 71 | {NULL, 0} | 71 | SSH_OLD_SESSIONID| |
| 72 | SSH_BUG_PUBKEYAUTH|SSH_BUG_X11FWD }, | ||
| 73 | { "^2\\.[23]\\.0 ", SSH_BUG_HMAC}, | ||
| 74 | { "^2\\.[2-9]\\.", 0 }, | ||
| 75 | { "^2\\.", SSH_BUG_HMAC}, /* XXX fallback */ | ||
| 76 | { NULL, 0 } | ||
| 72 | }; | 77 | }; |
| 73 | /* process table, return first match */ | 78 | /* process table, return first match */ |
| 74 | for (i = 0; check[i].pat; i++) { | 79 | for (i = 0; check[i].pat; i++) { |