summaryrefslogtreecommitdiffstats
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 d89e2317..cdb492dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
- stevesk@cvs.openbsd.org 2001/01/28 22:27:05
[authfile.c]
spelling. use sizeof vs. strlen(). ok markus@
+ - markus@cvs.openbsd.org 2001/01/28 10:15:34
+ [dispatch.c]
+ re-keying is not supported; ok deraadt@
20010126
- (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen
diff --git a/dispatch.c b/dispatch.c
index 74fcc553..a771094f 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -22,12 +22,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: dispatch.c,v 1.7 2001/01/21 19:05:49 markus Exp $");
+RCSID("$OpenBSD: dispatch.c,v 1.8 2001/01/28 10:15:34 markus Exp $");
#include "ssh1.h"
+#include "ssh2.h"
#include "log.h"
#include "dispatch.h"
#include "packet.h"
+#include "compat.h"
#define DISPATCH_MIN 0
#define DISPATCH_MAX 255
@@ -38,6 +40,8 @@ void
dispatch_protocol_error(int type, int plen, void *ctxt)
{
error("Hm, dispatch protocol error: type %d plen %d", type, plen);
+ if (compat20 && type == SSH2_MSG_KEXDH_INIT)
+ fatal("dispatch_protocol_error: rekeying is not supported");
}
void
dispatch_init(dispatch_fn *dflt)