diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-09 00:35:42 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-09 00:35:42 +0000 |
commit | 48bd7c118a25b950842864c7eb87ef666cbc342d (patch) | |
tree | b678668f292f8a8bb5e00b9b8f89d86370a8e11f /compat.c | |
parent | 99a0563fd59e1d3e1b79a1a9dd38ce9f6b5059ee (diff) |
- (bal) OpenBSD Sync
- markus@cvs.openbsd.org 2001/01/08 22:29:05
[auth2.c compat.c compat.h servconf.c servconf.h sshd.8
sshd_config version.h]
implement option 'Banner /etc/issue.net' for ssh2, move version to
2.3.1 (needed for bugcompat detection, 2.3.0 would fail if Banner
is enabled).
- markus@cvs.openbsd.org 2001/01/08 22:03:23
[channels.c ssh-keyscan.c]
O_NDELAY -> O_NONBLOCK; thanks stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/08 21:55:41
[sshconnect1.c]
more cleanups and fixes from stevesk@pobox.com:
1) try_agent_authentication() for loop will overwrite key just
allocated with key_new(); don't alloc
2) call ssh_close_authentication_connection() before exit
try_agent_authentication()
3) free mem on bad passphrase in try_rsa_authentication()
- markus@cvs.openbsd.org 2001/01/08 21:48:17
[kex.c]
missing free; thanks stevesk@pobox.com
Diffstat (limited to 'compat.c')
-rw-r--r-- | compat.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: compat.c,v 1.32 2000/12/09 23:51:11 provos Exp $"); | 26 | RCSID("$OpenBSD: compat.c,v 1.33 2001/01/08 22:29:05 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "packet.h" | 29 | #include "packet.h" |
@@ -62,7 +62,10 @@ compat_datafellows(const char *version) | |||
62 | char *pat; | 62 | char *pat; |
63 | int bugs; | 63 | int bugs; |
64 | } check[] = { | 64 | } check[] = { |
65 | { "^OpenSSH[-_]2\\.[012]", SSH_OLD_SESSIONID }, | 65 | { "^OpenSSH[-_]2\\.[012]", |
66 | SSH_OLD_SESSIONID|SSH_BUG_BANNER }, | ||
67 | { "^OpenSSH_2\\.3\\.0", SSH_BUG_BANNER }, | ||
68 | { "^OpenSSH", 0 }, | ||
66 | { "MindTerm", 0 }, | 69 | { "MindTerm", 0 }, |
67 | { "^2\\.1\\.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| | 70 | { "^2\\.1\\.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| |
68 | SSH_OLD_SESSIONID|SSH_BUG_DEBUG }, | 71 | SSH_OLD_SESSIONID|SSH_BUG_DEBUG }, |