diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-30 09:59:47 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-30 09:59:47 +0000 |
| commit | 2f2ba2a6236426bdb827c93502161789fe6dffd5 (patch) | |
| tree | 346899746ecdf279674845607264b0616eff8755 /sbin/isakmpd/message.c | |
| parent | 79a07e8c3db4997f6adaf940a08446f2eef36079 (diff) | |
Merge with EOM 1.140
author: niklas
Also check that the exchange to be upgraded is phase 1
Diffstat (limited to 'sbin/isakmpd/message.c')
| -rw-r--r-- | sbin/isakmpd/message.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c index 9f6f0c14cad..ff630e7c72b 100644 --- a/sbin/isakmpd/message.c +++ b/sbin/isakmpd/message.c @@ -1,5 +1,5 @@ -/* $OpenBSD: message.c,v 1.24 2000/01/30 09:47:55 niklas Exp $ */ -/* $EOM: message.c,v 1.139 2000/01/30 09:52:00 niklas Exp $ */ +/* $OpenBSD: message.c,v 1.25 2000/01/30 09:59:46 niklas Exp $ */ +/* $EOM: message.c,v 1.140 2000/01/30 10:04:08 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -868,7 +868,7 @@ message_recv (struct message *msg) { msg->exchange = exchange_lookup_from_icookie (buf + ISAKMP_HDR_ICOOKIE_OFF); - if (msg->exchange + if (msg->exchange && msg->exchange->phase == 1 && && zero_test (msg->exchange->cookies + ISAKMP_HDR_RCOOKIE_OFF, ISAKMP_HDR_RCOOKIE_LEN)) exchange_upgrade_p1 (msg); |