summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--dispatch.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d89e2317e..cdb492dcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - stevesk@cvs.openbsd.org 2001/01/28 22:27:05 12 - stevesk@cvs.openbsd.org 2001/01/28 22:27:05
13 [authfile.c] 13 [authfile.c]
14 spelling. use sizeof vs. strlen(). ok markus@ 14 spelling. use sizeof vs. strlen(). ok markus@
15 - markus@cvs.openbsd.org 2001/01/28 10:15:34
16 [dispatch.c]
17 re-keying is not supported; ok deraadt@
15 18
1620010126 1920010126
17 - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen 20 - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen
diff --git a/dispatch.c b/dispatch.c
index 74fcc553c..a771094fe 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -22,12 +22,14 @@
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"
25RCSID("$OpenBSD: dispatch.c,v 1.7 2001/01/21 19:05:49 markus Exp $"); 25RCSID("$OpenBSD: dispatch.c,v 1.8 2001/01/28 10:15:34 markus Exp $");
26 26
27#include "ssh1.h" 27#include "ssh1.h"
28#include "ssh2.h"
28#include "log.h" 29#include "log.h"
29#include "dispatch.h" 30#include "dispatch.h"
30#include "packet.h" 31#include "packet.h"
32#include "compat.h"
31 33
32#define DISPATCH_MIN 0 34#define DISPATCH_MIN 0
33#define DISPATCH_MAX 255 35#define DISPATCH_MAX 255
@@ -38,6 +40,8 @@ void
38dispatch_protocol_error(int type, int plen, void *ctxt) 40dispatch_protocol_error(int type, int plen, void *ctxt)
39{ 41{
40 error("Hm, dispatch protocol error: type %d plen %d", type, plen); 42 error("Hm, dispatch protocol error: type %d plen %d", type, plen);
43 if (compat20 && type == SSH2_MSG_KEXDH_INIT)
44 fatal("dispatch_protocol_error: rekeying is not supported");
41} 45}
42void 46void
43dispatch_init(dispatch_fn *dflt) 47dispatch_init(dispatch_fn *dflt)