diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2003-08-08 08:47:00 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2003-08-08 08:47:00 +0000 |
| commit | 76f930123a070f9cacf50c8d395178e366619a61 (patch) | |
| tree | 2ebd4cd6db383a567eaba5b5d8ccb1ac9a60099a /sbin/isakmpd/ipsec.c | |
| parent | 2b99a3e3e559e5c31cdfb26655fd55e1821cc2b4 (diff) | |
Be more careful when using constant_lookup() in messages. Pointed out by
Jean-Francois Dive, although I opted for a slightly different patch.
Diffstat (limited to 'sbin/isakmpd/ipsec.c')
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index e929038a235..0745276c6ce 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.78 2003/07/25 08:31:16 markus Exp $ */ +/* $OpenBSD: ipsec.c,v 1.79 2003/08/08 08:46:59 ho Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -1056,6 +1056,7 @@ ipsec_responder (struct message *msg) struct exchange *exchange = msg->exchange; int (**script) (struct message *) = 0; struct payload *p; + char *tag; u_int16_t type; /* Check that a new exchange is coherent with the IKE rules. */ @@ -1094,13 +1095,14 @@ ipsec_responder (struct message *msg) for (p = TAILQ_FIRST (&msg->payload[ISAKMP_PAYLOAD_NOTIFY]); p; p = TAILQ_NEXT (p, link)) { - type = GET_ISAKMP_NOTIFY_MSG_TYPE (p->p); + type = GET_ISAKMP_NOTIFY_MSG_TYPE (p->p); + tag = constant_lookup (isakmp_notify_cst, type); LOG_DBG ((LOG_EXCHANGE, 10, "ipsec_responder: got NOTIFY of type %s", - constant_lookup (isakmp_notify_cst, type))); + tag ? tag : "<unknown>")); - if (type == ISAKMP_NOTIFY_INVALID_SPI) - ipsec_invalid_spi (msg, p); + if (type == ISAKMP_NOTIFY_INVALID_SPI) + ipsec_invalid_spi (msg, p); p->flags |= PL_MARK; } |