diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | dispatch.c | 6 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20010612 | ||
2 | - markus@cvs.openbsd.org 2001/06/10 11:29:20 | ||
3 | [dispatch.c] | ||
4 | we support rekeying | ||
5 | protocol errors are fatal. | ||
6 | |||
1 | 20010611 | 7 | 20010611 |
2 | - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller | 8 | - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller |
3 | <markm@swoon.net> | 9 | <markm@swoon.net> |
@@ -5602,4 +5608,4 @@ | |||
5602 | - Wrote replacements for strlcpy and mkdtemp | 5608 | - Wrote replacements for strlcpy and mkdtemp |
5603 | - Released 1.0pre1 | 5609 | - Released 1.0pre1 |
5604 | 5610 | ||
5605 | $Id: ChangeLog,v 1.1276 2001/06/10 17:43:35 mouring Exp $ | 5611 | $Id: ChangeLog,v 1.1277 2001/06/12 00:12:56 mouring Exp $ |
diff --git a/dispatch.c b/dispatch.c index 7168d1c74..64873d53a 100644 --- a/dispatch.c +++ b/dispatch.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: dispatch.c,v 1.10 2001/02/18 18:33:53 markus Exp $"); | 25 | RCSID("$OpenBSD: dispatch.c,v 1.11 2001/06/10 11:29:20 markus Exp $"); |
26 | 26 | ||
27 | #include "ssh1.h" | 27 | #include "ssh1.h" |
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
@@ -39,9 +39,7 @@ dispatch_fn *dispatch[DISPATCH_MAX]; | |||
39 | void | 39 | void |
40 | dispatch_protocol_error(int type, int plen, void *ctxt) | 40 | dispatch_protocol_error(int type, int plen, void *ctxt) |
41 | { | 41 | { |
42 | error("Hm, dispatch protocol error: type %d plen %d", type, plen); | 42 | fatal("dispatch_protocol_error: type %d plen %d", type, plen); |
43 | if (compat20 && type == SSH2_MSG_KEXINIT) | ||
44 | fatal("dispatch_protocol_error: rekeying is not supported"); | ||
45 | } | 43 | } |
46 | void | 44 | void |
47 | dispatch_init(dispatch_fn *dflt) | 45 | dispatch_init(dispatch_fn *dflt) |