summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/isakmpd/conf.c4
-rw-r--r--sbin/isakmpd/exchange.c6
-rw-r--r--sbin/isakmpd/ike_phase_1.c30
-rw-r--r--sbin/isakmpd/ike_quick_mode.c18
-rw-r--r--sbin/isakmpd/ipsec.c12
-rw-r--r--sbin/isakmpd/isakmp_cfg.c6
-rw-r--r--sbin/isakmpd/message.c6
-rw-r--r--sbin/isakmpd/pf_key_v2.c20
-rw-r--r--sbin/isakmpd/transport.c10
-rw-r--r--sbin/isakmpd/udp.c4
10 files changed, 58 insertions, 58 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index e1a72f54052..fe3b51eea01 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.67 2004/05/14 08:42:56 hshoexer Exp $ */
+/* $OpenBSD: conf.c,v 1.68 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */
/*
@@ -1026,7 +1026,7 @@ struct dumper {
};
static void
-conf_report_dump(struct dumper * node)
+conf_report_dump(struct dumper *node)
{
/* Recursive, cleanup when we're done. */
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c
index ff7b00806e0..c28c855448a 100644
--- a/sbin/isakmpd/exchange.c
+++ b/sbin/isakmpd/exchange.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exchange.c,v 1.94 2004/05/06 10:40:34 ho Exp $ */
+/* $OpenBSD: exchange.c,v 1.95 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */
/*
@@ -201,7 +201,7 @@ exchange_script(struct exchange *exchange)
* 0 if it succeeds and the script is not finished and 1 if it's ready.
*/
static int
-exchange_validate(struct message * msg)
+exchange_validate(struct message *msg)
{
struct exchange *exchange = msg->exchange;
int16_t *pc = exchange->exch_pc;
@@ -1603,7 +1603,7 @@ exchange_free_aca_list(struct exchange *exchange)
/* Obtain certificates from acceptable certification authority. */
int
-exchange_add_certs(struct message * msg)
+exchange_add_certs(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct certreq_aca *aca;
diff --git a/sbin/isakmpd/ike_phase_1.c b/sbin/isakmpd/ike_phase_1.c
index 4670a410c28..26073877aba 100644
--- a/sbin/isakmpd/ike_phase_1.c
+++ b/sbin/isakmpd/ike_phase_1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ike_phase_1.c,v 1.47 2004/06/06 13:05:40 ho Exp $ */
+/* $OpenBSD: ike_phase_1.c,v 1.48 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: ike_phase_1.c,v 1.31 2000/12/11 23:47:56 niklas Exp $ */
/*
@@ -383,7 +383,7 @@ bail_out:
/* Figure out what transform the responder chose. */
int
-ike_phase_1_initiator_recv_SA(struct message * msg)
+ike_phase_1_initiator_recv_SA(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct sa *sa = TAILQ_FIRST(&exchange->sa_list);
@@ -427,7 +427,7 @@ ike_phase_1_initiator_recv_SA(struct message * msg)
/* Send our public DH value and a nonce to the responder. */
int
-ike_phase_1_initiator_send_KE_NONCE(struct message * msg)
+ike_phase_1_initiator_send_KE_NONCE(struct message *msg)
{
struct ipsec_exch *ie = msg->exchange->data;
@@ -439,7 +439,7 @@ ike_phase_1_initiator_send_KE_NONCE(struct message * msg)
/* Accept responder's public DH value and nonce. */
int
-ike_phase_1_initiator_recv_KE_NONCE(struct message * msg)
+ike_phase_1_initiator_recv_KE_NONCE(struct message *msg)
{
if (ike_phase_1_recv_KE_NONCE(msg))
return -1;
@@ -452,7 +452,7 @@ ike_phase_1_initiator_recv_KE_NONCE(struct message * msg)
* handle.
*/
int
-ike_phase_1_responder_recv_SA(struct message * msg)
+ike_phase_1_responder_recv_SA(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct sa *sa = TAILQ_FIRST(&exchange->sa_list);
@@ -508,7 +508,7 @@ ike_phase_1_responder_recv_SA(struct message * msg)
/* Reply with the transform we chose. */
int
-ike_phase_1_responder_send_SA(struct message * msg)
+ike_phase_1_responder_send_SA(struct message *msg)
{
/* Add the SA payload with the transform that was chosen. */
return message_add_sa_payload(msg);
@@ -516,7 +516,7 @@ ike_phase_1_responder_send_SA(struct message * msg)
/* Send our public DH value and a nonce to the peer. */
int
-ike_phase_1_send_KE_NONCE(struct message * msg, size_t nonce_sz)
+ike_phase_1_send_KE_NONCE(struct message *msg, size_t nonce_sz)
{
/* Public DH key. */
if (ipsec_gen_g_x(msg)) {
@@ -538,7 +538,7 @@ ike_phase_1_send_KE_NONCE(struct message * msg, size_t nonce_sz)
/* Receive our peer's public DH value and nonce. */
int
-ike_phase_1_recv_KE_NONCE(struct message * msg)
+ike_phase_1_recv_KE_NONCE(struct message *msg)
{
/* Copy out the initiator's DH public value. */
if (ipsec_save_g_x(msg)) {
@@ -564,7 +564,7 @@ ike_phase_1_recv_KE_NONCE(struct message * msg)
* thus speeding up exchanges.
*/
int
-ike_phase_1_post_exchange_KE_NONCE(struct message * msg)
+ike_phase_1_post_exchange_KE_NONCE(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct ipsec_exch *ie = exchange->data;
@@ -739,7 +739,7 @@ ike_phase_1_post_exchange_KE_NONCE(struct message * msg)
}
int
-ike_phase_1_responder_send_ID_AUTH(struct message * msg)
+ike_phase_1_responder_send_ID_AUTH(struct message *msg)
{
if (ike_phase_1_send_ID(msg))
return -1;
@@ -748,7 +748,7 @@ ike_phase_1_responder_send_ID_AUTH(struct message * msg)
}
int
-ike_phase_1_send_ID(struct message * msg)
+ike_phase_1_send_ID(struct message *msg)
{
struct exchange *exchange = msg->exchange;
u_int8_t *buf;
@@ -842,7 +842,7 @@ ike_phase_1_send_ID(struct message * msg)
}
int
-ike_phase_1_send_AUTH(struct message * msg)
+ike_phase_1_send_AUTH(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct ipsec_exch *ie = exchange->data;
@@ -865,7 +865,7 @@ ike_phase_1_send_AUTH(struct message * msg)
/* Receive ID and HASH and check that the exchange has been consistent. */
int
-ike_phase_1_recv_ID_AUTH(struct message * msg)
+ike_phase_1_recv_ID_AUTH(struct message *msg)
{
if (ike_phase_1_recv_ID(msg))
return -1;
@@ -875,7 +875,7 @@ ike_phase_1_recv_ID_AUTH(struct message * msg)
/* Receive ID. */
int
-ike_phase_1_recv_ID(struct message * msg)
+ike_phase_1_recv_ID(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct payload *payload;
@@ -986,7 +986,7 @@ ike_phase_1_recv_ID(struct message * msg)
/* Receive HASH and check that the exchange has been consistent. */
int
-ike_phase_1_recv_AUTH(struct message * msg)
+ike_phase_1_recv_AUTH(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct ipsec_exch *ie = exchange->data;
diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c
index 768ebef3f86..52264f5e648 100644
--- a/sbin/isakmpd/ike_quick_mode.c
+++ b/sbin/isakmpd/ike_quick_mode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ike_quick_mode.c,v 1.78 2004/04/28 20:20:31 hshoexer Exp $ */
+/* $OpenBSD: ike_quick_mode.c,v 1.79 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: ike_quick_mode.c,v 1.139 2001/01/26 10:43:17 niklas Exp $ */
/*
@@ -387,7 +387,7 @@ policydone:
* XXX Split this huge function up and look for common code with main mode.
*/
static int
-initiator_send_HASH_SA_NONCE(struct message * msg)
+initiator_send_HASH_SA_NONCE(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct doi *doi = exchange->doi;
@@ -961,7 +961,7 @@ bail_out:
/* Figure out what transform the responder chose. */
static int
-initiator_recv_HASH_SA_NONCE(struct message * msg)
+initiator_recv_HASH_SA_NONCE(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct ipsec_exch *ie = exchange->data;
@@ -1192,7 +1192,7 @@ initiator_recv_HASH_SA_NONCE(struct message * msg)
}
static int
-initiator_send_HASH(struct message * msg)
+initiator_send_HASH(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct ipsec_exch *ie = exchange->data;
@@ -1249,7 +1249,7 @@ initiator_send_HASH(struct message * msg)
}
static void
-post_quick_mode(struct message * msg)
+post_quick_mode(struct message *msg)
{
struct sa *isakmp_sa = msg->isakmp_sa;
struct ipsec_sa *isa = isakmp_sa->data;
@@ -1364,7 +1364,7 @@ post_quick_mode(struct message * msg)
* XXX Describe in more detail.
*/
static int
-responder_recv_HASH_SA_NONCE(struct message * msg)
+responder_recv_HASH_SA_NONCE(struct message *msg)
{
struct payload *hashp, *kep, *idp;
struct sa *sa;
@@ -1659,7 +1659,7 @@ cleanup:
/* Reply with the transform we chose. */
static int
-responder_send_HASH_SA_NONCE(struct message * msg)
+responder_send_HASH_SA_NONCE(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct ipsec_exch *ie = exchange->data;
@@ -1778,7 +1778,7 @@ responder_send_HASH_SA_NONCE(struct message * msg)
}
static void
-gen_g_xy(struct message * msg)
+gen_g_xy(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct ipsec_exch *ie = exchange->data;
@@ -1798,7 +1798,7 @@ gen_g_xy(struct message * msg)
}
static int
-responder_recv_HASH(struct message * msg)
+responder_recv_HASH(struct message *msg)
{
struct exchange *exchange = msg->exchange;
struct sa *isakmp_sa = msg->isakmp_sa;
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c
index 9956787cea0..1b6f6f2d448 100644
--- a/sbin/isakmpd/ipsec.c
+++ b/sbin/isakmpd/ipsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec.c,v 1.91 2004/05/23 18:17:56 hshoexer Exp $ */
+/* $OpenBSD: ipsec.c,v 1.92 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */
/*
@@ -91,8 +91,8 @@ struct contact {
int contact_cnt = 0, contact_limit = 0;
static int addr_cmp(const void *, const void *);
-static int ipsec_add_contact(struct message * msg);
-static int ipsec_contacted(struct message * msg);
+static int ipsec_add_contact(struct message *);
+static int ipsec_contacted(struct message *);
#ifdef USE_DEBUG
static int ipsec_debug_attribute(u_int16_t, u_int8_t *, u_int16_t, void *);
#endif
@@ -230,7 +230,7 @@ ipsec_sa_check(struct sa *sa, void *v_arg)
/* Find an SA with a "name" of DST, SPI & PROTO. */
struct sa *
-ipsec_sa_lookup(struct sockaddr * dst, u_int32_t spi, u_int8_t proto)
+ipsec_sa_lookup(struct sockaddr *dst, u_int32_t spi, u_int8_t proto)
{
struct dst_spi_proto_arg arg;
@@ -246,7 +246,7 @@ ipsec_sa_lookup(struct sockaddr * dst, u_int32_t spi, u_int8_t proto)
* XXX At some point other selectors will matter here too.
*/
static int
-ipsec_sa_check_flow(struct sa * sa, void *v_arg)
+ipsec_sa_check_flow(struct sa *sa, void *v_arg)
{
struct sa *sa2 = v_arg;
struct ipsec_sa *isa = sa->data, *isa2 = sa2->data;
@@ -689,7 +689,7 @@ ipsec_init(void)
/* Given a message MSG, return a suitable IV (or rather keystate). */
static struct keystate *
-ipsec_get_keystate(struct message * msg)
+ipsec_get_keystate(struct message *msg)
{
struct keystate *ks;
struct hash *hash;
diff --git a/sbin/isakmpd/isakmp_cfg.c b/sbin/isakmpd/isakmp_cfg.c
index df6b8f15b10..1ad29b93ee0 100644
--- a/sbin/isakmpd/isakmp_cfg.c
+++ b/sbin/isakmpd/isakmp_cfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isakmp_cfg.c,v 1.29 2004/05/23 18:17:56 hshoexer Exp $ */
+/* $OpenBSD: isakmp_cfg.c,v 1.30 2004/06/09 14:02:44 ho Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist. All rights reserved.
@@ -75,7 +75,7 @@ static int cfg_responder_send_ATTR(struct message *);
u_int8_t *cfg_add_hash(struct message *);
int cfg_finalize_hash(struct message *, u_int8_t *, u_int8_t *,
u_int16_t);
-int cfg_verify_hash(struct message * msg);
+int cfg_verify_hash(struct message *);
/* Server: SET/ACK Client; REQ/REPLY */
int (*isakmp_cfg_initiator[]) (struct message *) = {
@@ -607,7 +607,7 @@ cfg_add_hash(struct message *msg)
}
int
-cfg_finalize_hash(struct message * msg, u_int8_t * hashp, u_int8_t * data,
+cfg_finalize_hash(struct message *msg, u_int8_t *hashp, u_int8_t *data,
u_int16_t length)
{
struct ipsec_sa *isa = msg->isakmp_sa->data;
diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c
index f59f64bb5ad..380473f8ab4 100644
--- a/sbin/isakmpd/message.c
+++ b/sbin/isakmpd/message.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: message.c,v 1.74 2004/06/09 12:59:36 hshoexer Exp $ */
+/* $OpenBSD: message.c,v 1.75 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: message.c,v 1.156 2000/10/10 12:36:39 provos Exp $ */
/*
@@ -463,7 +463,7 @@ message_validate_cert(struct message *msg, struct payload *p)
/* Validate the certificate request payload P in message MSG. */
static int
-message_validate_cert_req(struct message * msg, struct payload * p)
+message_validate_cert_req(struct message *msg, struct payload *p)
{
struct cert_handler *cert;
size_t len = GET_ISAKMP_GEN_LENGTH(p->p) - ISAKMP_CERTREQ_AUTHORITY_OFF;
@@ -1526,7 +1526,7 @@ struct info_args {
*/
void
message_send_notification(struct message *msg, struct sa *isakmp_sa,
- u_int16_t notify, struct proto * proto, int incoming)
+ u_int16_t notify, struct proto *proto, int incoming)
{
struct info_args args;
struct sa *doi_sa = proto ? proto->sa : isakmp_sa;
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c
index cc243b8d05a..64ebdef954c 100644
--- a/sbin/isakmpd/pf_key_v2.c
+++ b/sbin/isakmpd/pf_key_v2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_key_v2.c,v 1.140 2004/04/15 18:39:26 deraadt Exp $ */
+/* $OpenBSD: pf_key_v2.c,v 1.141 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $ */
/*
@@ -2260,7 +2260,7 @@ pf_key_v2_convert_id(u_int8_t * id, int idlen, size_t * reslen, int *idtype)
/* Enable a flow given an SA. */
int
-pf_key_v2_enable_sa(struct sa * sa, struct sa * isakmp_sa)
+pf_key_v2_enable_sa(struct sa *sa, struct sa *isakmp_sa)
{
struct ipsec_sa *isa = sa->data;
struct sockaddr *dst, *src;
@@ -2462,7 +2462,7 @@ passed:
/* Disable a flow given a SA. */
static int
-pf_key_v2_disable_sa(struct sa * sa, int incoming)
+pf_key_v2_disable_sa(struct sa *sa, int incoming)
{
struct ipsec_sa *isa = sa->data;
struct sockaddr *dst, *src;
@@ -2527,7 +2527,7 @@ pf_key_v2_disable_sa(struct sa * sa, int incoming)
* of the IKE security association SA. Also delete potential flows tied to it.
*/
int
-pf_key_v2_delete_spi(struct sa * sa, struct proto * proto, int incoming)
+pf_key_v2_delete_spi(struct sa *sa, struct proto *proto, int incoming)
{
struct sadb_msg msg;
struct sadb_sa ssa;
@@ -2690,7 +2690,7 @@ cleanup:
}
static void
-pf_key_v2_stayalive(struct exchange * exchange, void *vconn, int fail)
+pf_key_v2_stayalive(struct exchange *exchange, void *vconn, int fail)
{
char *conn = vconn;
struct sa *sa;
@@ -2725,7 +2725,7 @@ pf_key_v2_connection_check(char *conn)
/* Handle a PF_KEY lifetime expiration message PMSG. */
static void
-pf_key_v2_expire(struct pf_key_v2_msg * pmsg)
+pf_key_v2_expire(struct pf_key_v2_msg *pmsg)
{
struct sadb_msg *msg;
struct sadb_sa *ssa;
@@ -2832,7 +2832,7 @@ pf_key_v2_expire(struct pf_key_v2_msg * pmsg)
/* Handle a PF_KEY SA ACQUIRE message PMSG. */
static void
-pf_key_v2_acquire(struct pf_key_v2_msg * pmsg)
+pf_key_v2_acquire(struct pf_key_v2_msg *pmsg)
{
#if defined (SADB_X_ASKPOLICY)
struct sadb_msg *msg, askpolicy_msg;
@@ -3830,7 +3830,7 @@ fail:
}
static void
-pf_key_v2_notify(struct pf_key_v2_msg * msg)
+pf_key_v2_notify(struct pf_key_v2_msg *msg)
{
switch (((struct sadb_msg *) TAILQ_FIRST(msg)->seg)->sadb_msg_type) {
case SADB_EXPIRE:
@@ -3880,8 +3880,8 @@ pf_key_v2_handler(int fd)
* XXX Assumes OpenBSD GRPSPIS extension. Should probably be moved to sysdep.c
*/
int
-pf_key_v2_group_spis(struct sa * sa, struct proto * proto1,
- struct proto * proto2, int incoming)
+pf_key_v2_group_spis(struct sa *sa, struct proto *proto1,
+ struct proto *proto2, int incoming)
{
#if defined (SADB_X_GRPSPIS)
struct sadb_msg msg;
diff --git a/sbin/isakmpd/transport.c b/sbin/isakmpd/transport.c
index ca92f5cda48..a224435adf3 100644
--- a/sbin/isakmpd/transport.c
+++ b/sbin/isakmpd/transport.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: transport.c,v 1.24 2004/04/15 18:39:26 deraadt Exp $ */
+/* $OpenBSD: transport.c,v 1.25 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: transport.c,v 1.43 2000/10/10 12:36:39 provos Exp $ */
/*
@@ -71,7 +71,7 @@ transport_init(void)
/* Register another transport T. */
void
-transport_add(struct transport * t)
+transport_add(struct transport *t)
{
LOG_DBG((LOG_TRANSPORT, 70, "transport_add: adding %p", t));
TAILQ_INIT(&t->sendq);
@@ -83,7 +83,7 @@ transport_add(struct transport * t)
/* Add a referer to transport T. */
void
-transport_reference(struct transport * t)
+transport_reference(struct transport *t)
{
t->refcnt++;
LOG_DBG((LOG_TRANSPORT, 95,
@@ -95,7 +95,7 @@ transport_reference(struct transport * t)
* Remove a referer from transport T, removing all of T when no referers left.
*/
void
-transport_release(struct transport * t)
+transport_release(struct transport *t)
{
LOG_DBG((LOG_TRANSPORT, 95,
"transport_release: transport %p had %d references", t,
@@ -147,7 +147,7 @@ transport_prio_sendqs_empty(void)
/* Register another transport method T. */
void
-transport_method_add(struct transport_vtbl * t)
+transport_method_add(struct transport_vtbl *t)
{
LIST_INSERT_HEAD(&transport_method_list, t, link);
}
diff --git a/sbin/isakmpd/udp.c b/sbin/isakmpd/udp.c
index e72b64d464f..78a0d49e9b1 100644
--- a/sbin/isakmpd/udp.c
+++ b/sbin/isakmpd/udp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp.c,v 1.71 2004/05/23 18:17:56 hshoexer Exp $ */
+/* $OpenBSD: udp.c,v 1.72 2004/06/09 14:02:44 ho Exp $ */
/* $EOM: udp.c,v 1.57 2001/01/26 10:09:57 niklas Exp $ */
/*
@@ -712,7 +712,7 @@ udp_fd_isset(struct transport *t, fd_set *fds)
* module.
*/
static void
-udp_handle_message(struct transport * t)
+udp_handle_message(struct transport *t)
{
struct udp_transport *u = (struct udp_transport *) t;
u_int8_t buf[UDP_SIZE];
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 02:36:26 +0000