summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/isakmp_doi.c
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2004-06-14 09:55:43 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2004-06-14 09:55:43 +0000
commita3de7d60356b91ad4fa41498aa0d21f54e6d6e42 (patch)
treeb29ac59d68e2c5c0913bb2c2154adf4a46ba6ef9 /sbin/isakmpd/isakmp_doi.c
parent3c3a93ac7765dde3e397739f03b36a735ee304e0 (diff)
KNF, style, 80c, etc. hshoexer@ ok
Diffstat (limited to 'sbin/isakmpd/isakmp_doi.c')
-rw-r--r--sbin/isakmpd/isakmp_doi.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sbin/isakmpd/isakmp_doi.c b/sbin/isakmpd/isakmp_doi.c
index ea279b66fff..61e40c10050 100644
--- a/sbin/isakmpd/isakmp_doi.c
+++ b/sbin/isakmpd/isakmp_doi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isakmp_doi.c,v 1.20 2004/05/23 18:17:56 hshoexer Exp $ */
+/* $OpenBSD: isakmp_doi.c,v 1.21 2004/06/14 09:55:41 ho Exp $ */
/* $EOM: isakmp_doi.c,v 1.42 2000/09/12 16:29:41 ho Exp $ */
/*
@@ -50,7 +50,8 @@
#include "util.h"
#ifdef USE_DEBUG
-static int isakmp_debug_attribute(u_int16_t, u_int8_t *, u_int16_t, void *);
+static int isakmp_debug_attribute(u_int16_t, u_int8_t *, u_int16_t,
+ void *);
#endif
static void isakmp_finalize_exchange(struct message *);
static struct keystate *isakmp_get_keystate(struct message *);
@@ -60,10 +61,10 @@ static void isakmp_setup_situation(u_int8_t *);
static size_t isakmp_situation_size(void);
static u_int8_t isakmp_spi_size(u_int8_t);
static int isakmp_validate_attribute(u_int16_t, u_int8_t *, u_int16_t,
- void *);
+ void *);
static int isakmp_validate_exchange(u_int8_t);
-static int isakmp_validate_id_information(u_int8_t, u_int8_t *, u_int8_t *,
- size_t, struct exchange *);
+static int isakmp_validate_id_information(u_int8_t, u_int8_t *,
+ u_int8_t *, size_t, struct exchange *);
static int isakmp_validate_key_information(u_int8_t *, size_t);
static int isakmp_validate_notification(u_int16_t);
static int isakmp_validate_proto(u_int8_t);
@@ -231,8 +232,8 @@ isakmp_responder(struct message *msg)
case ISAKMP_EXCH_INFO:
for (p = TAILQ_FIRST(&msg->payload[ISAKMP_PAYLOAD_NOTIFY]); p;
p = TAILQ_NEXT(p, link)) {
- LOG_DBG((LOG_EXCHANGE, 10,
- "isakmp_responder: got NOTIFY of type %s, ignoring",
+ LOG_DBG((LOG_EXCHANGE, 10, "isakmp_responder: "
+ "got NOTIFY of type %s, ignoring",
constant_name(isakmp_notify_cst,
GET_ISAKMP_NOTIFY_MSG_TYPE(p->p))));
p->flags |= PL_MARK;