summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/isakmpd/apps/certpatch/certpatch.c6
-rw-r--r--sbin/isakmpd/dh.c4
-rw-r--r--sbin/isakmpd/exchange.c4
-rw-r--r--sbin/isakmpd/ipsec.c6
-rw-r--r--sbin/isakmpd/isakmpd.c8
-rw-r--r--sbin/isakmpd/math_2n.c4
-rw-r--r--sbin/isakmpd/math_group.c4
-rw-r--r--sbin/isakmpd/message.c8
-rw-r--r--sbin/isakmpd/pf_encap.c16
-rw-r--r--sbin/isakmpd/pf_key_v2.c12
-rw-r--r--sbin/isakmpd/sa.c6
-rw-r--r--sbin/isakmpd/transport.c4
-rw-r--r--sbin/isakmpd/udp.c4
-rw-r--r--sbin/isakmpd/x509.c10
14 files changed, 48 insertions, 48 deletions
diff --git a/sbin/isakmpd/apps/certpatch/certpatch.c b/sbin/isakmpd/apps/certpatch/certpatch.c
index 825697d19f7..4b128cff53a 100644
--- a/sbin/isakmpd/apps/certpatch/certpatch.c
+++ b/sbin/isakmpd/apps/certpatch/certpatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: certpatch.c,v 1.15 2001/02/16 21:17:31 provos Exp $ */
+/* $OpenBSD: certpatch.c,v 1.16 2001/04/09 22:09:53 ho Exp $ */
/* $EOM: certpatch.c,v 1.11 2000/12/21 14:50:09 ho Exp $ */
/*
@@ -110,7 +110,7 @@ main (int argc, char **argv)
/* read command line arguments */
while ((ch = getopt (argc, argv, "t:k:i:")) != -1)
- switch(ch) {
+ switch (ch) {
case 't':
type = optarg;
break;
@@ -161,7 +161,7 @@ main (int argc, char **argv)
if (BIO_read_filename (file, certin) == -1)
{
perror ("read");
- exit(1);
+ exit (1);
}
#if SSLEAY_VERSION_NUMBER >= 0x00904100L
cert = PEM_read_bio_X509 (file, NULL, NULL, NULL);
diff --git a/sbin/isakmpd/dh.c b/sbin/isakmpd/dh.c
index 9f9fa44d8fe..16beb6a746d 100644
--- a/sbin/isakmpd/dh.c
+++ b/sbin/isakmpd/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.5 1999/04/19 20:00:24 niklas Exp $ */
+/* $OpenBSD: dh.c,v 1.6 2001/04/09 22:09:51 ho Exp $ */
/* $EOM: dh.c,v 1.5 1999/04/17 23:20:22 niklas Exp $ */
/*
@@ -78,7 +78,7 @@ dh_create_exchange (struct group *group, u_int8_t *buf)
int
dh_create_shared (struct group *group, u_int8_t *secret, u_int8_t *exchange)
{
- if (group->setraw (group, group->b, exchange, group->getlen(group)))
+ if (group->setraw (group, group->b, exchange, group->getlen (group)))
return -1;
if (group->operation (group, group->a, group->b, group->c))
return -1;
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c
index 73e4a9acb17..cf4d5e72eb5 100644
--- a/sbin/isakmpd/exchange.c
+++ b/sbin/isakmpd/exchange.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exchange.c,v 1.43 2001/04/08 21:23:02 ho Exp $ */
+/* $OpenBSD: exchange.c,v 1.44 2001/04/09 22:09:51 ho Exp $ */
/* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */
/*
@@ -631,7 +631,7 @@ exchange_create (int phase, int initiator, int doi, int type)
}
}
- gettimeofday(&expiration, 0);
+ gettimeofday (&expiration, 0);
delta = conf_get_num ("General", "Exchange-max-time", EXCHANGE_MAX_TIME);
expiration.tv_sec += delta;
exchange->death = timer_add_event ("exchange_free_aux", exchange_free_aux,
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c
index 094cf13b173..b92c9d91477 100644
--- a/sbin/isakmpd/ipsec.c
+++ b/sbin/isakmpd/ipsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec.c,v 1.41 2001/03/29 06:51:25 ho Exp $ */
+/* $OpenBSD: ipsec.c,v 1.42 2001/04/09 22:09:52 ho Exp $ */
/* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */
/*
@@ -1760,8 +1760,8 @@ ipsec_decode_ids (char *fmt, u_int8_t *id1, size_t id1_len,
static char result[1024];
char s_id1[256], s_id2[256];
- ipsec_decode_id(s_id1, sizeof s_id1, id1, id1_len, isakmpform);
- ipsec_decode_id(s_id2, sizeof s_id2, id2, id2_len, isakmpform);
+ ipsec_decode_id (s_id1, sizeof s_id1, id1, id1_len, isakmpform);
+ ipsec_decode_id (s_id2, sizeof s_id2, id2, id2_len, isakmpform);
snprintf (result, sizeof result, fmt, s_id1, s_id2);
return result;
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index 48d1e75ee8f..e46b5a2cf0e 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isakmpd.c,v 1.29 2001/04/09 21:21:57 ho Exp $ */
+/* $OpenBSD: isakmpd.c,v 1.30 2001/04/09 22:09:52 ho Exp $ */
/* $EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $ */
/*
@@ -237,7 +237,7 @@ reinit (void)
#endif
/* Reinitialize certificates */
- cert_init();
+ cert_init ();
/* Reinitialize our connection list. */
connection_reinit ();
@@ -250,7 +250,7 @@ reinit (void)
/*
* XXX "These" (non-existant) reinitializations should not be done.
- * cookie_reinit();
+ * cookie_reinit ();
* ui_reinit ();
* sa_reinit ();
*/
@@ -330,7 +330,7 @@ write_pid_file (void)
if (fp != NULL)
{
/* XXX Error checking! */
- fprintf (fp, "%d\n", getpid());
+ fprintf (fp, "%d\n", getpid ());
fclose (fp);
}
else
diff --git a/sbin/isakmpd/math_2n.c b/sbin/isakmpd/math_2n.c
index d879dc87405..2a59ee0ef17 100644
--- a/sbin/isakmpd/math_2n.c
+++ b/sbin/isakmpd/math_2n.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: math_2n.c,v 1.7 1999/04/20 11:32:57 niklas Exp $ */
+/* $OpenBSD: math_2n.c,v 1.8 2001/04/09 22:09:52 ho Exp $ */
/* $EOM: math_2n.c,v 1.15 1999/04/20 09:23:30 niklas Exp $ */
/*
@@ -272,7 +272,7 @@ b2n_print (b2n_ptr n)
flag = 1;
}
}
- printf("\n");
+ printf ("\n");
}
int
diff --git a/sbin/isakmpd/math_group.c b/sbin/isakmpd/math_group.c
index 2a43dd151c6..9c71b3534a3 100644
--- a/sbin/isakmpd/math_group.c
+++ b/sbin/isakmpd/math_group.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: math_group.c,v 1.12 2000/04/07 22:04:44 niklas Exp $ */
+/* $OpenBSD: math_group.c,v 1.13 2001/04/09 22:09:52 ho Exp $ */
/* $EOM: math_group.c,v 1.25 2000/04/07 19:53:26 niklas Exp $ */
/*
@@ -527,7 +527,7 @@ modp_setrandom (struct group *grp, math_mp_t d)
for (i = 0; i < l; i++)
{
if (i % 4)
- tmp = sysdep_random();
+ tmp = sysdep_random ();
#if MP_FLAVOUR == MP_FLAVOUR_GMP
mpz_mul_2exp (d, d, 8);
diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c
index 4fb5ff13e3f..9efc344ceb5 100644
--- a/sbin/isakmpd/message.c
+++ b/sbin/isakmpd/message.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: message.c,v 1.38 2001/04/09 21:21:57 ho Exp $ */
+/* $OpenBSD: message.c,v 1.39 2001/04/09 22:09:52 ho Exp $ */
/* $EOM: message.c,v 1.156 2000/10/10 12:36:39 provos Exp $ */
/*
@@ -669,7 +669,7 @@ message_validate_sa (struct message *msg, struct payload *p)
{
msg->isakmp_sa = TAILQ_FIRST (&exchange->sa_list);
if (msg->isakmp_sa)
- sa_reference(msg->isakmp_sa);
+ sa_reference (msg->isakmp_sa);
}
/*
@@ -899,7 +899,7 @@ message_recv (struct message *msg)
{
msg->isakmp_sa = sa_lookup_by_header (buf, 0);
if (msg->isakmp_sa)
- sa_reference(msg->isakmp_sa);
+ sa_reference (msg->isakmp_sa);
/*
* If we cannot find an ISAKMP SA out of the cookies, this is either
@@ -1468,7 +1468,7 @@ message_dump_raw (char *header, struct message *msg, int class)
for (i = 0; i < msg->iovlen; i++)
for (j = 0; j < msg->iov[i].iov_len; j++)
{
- sprintf(p, "%02x", ((u_int8_t *)msg->iov[i].iov_base)[j]);
+ sprintf (p, "%02x", ((u_int8_t *)msg->iov[i].iov_base)[j]);
p += 2;
if (++k % 32 == 0)
{
diff --git a/sbin/isakmpd/pf_encap.c b/sbin/isakmpd/pf_encap.c
index 05e72bc5b91..4fa5bdd68cb 100644
--- a/sbin/isakmpd/pf_encap.c
+++ b/sbin/isakmpd/pf_encap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_encap.c,v 1.20 2001/01/27 12:03:34 niklas Exp $ */
+/* $OpenBSD: pf_encap.c,v 1.21 2001/04/09 22:09:52 ho Exp $ */
/* $EOM: pf_encap.c,v 1.73 2000/12/04 04:46:34 angelos Exp $ */
/*
@@ -742,7 +742,7 @@ pf_encap_enable_spi (in_addr_t laddr, in_addr_t lmask, in_addr_t raddr,
emsg->em_ena_dst.s_addr = dst;
LOG_DBG ((LOG_SYSDEP, 50, "pf_encap_enable_spi: src %x %x dst %x %x",
- htonl(laddr), htonl(lmask), htonl(raddr), htonl(rmask)));
+ htonl (laddr), htonl (lmask), htonl (raddr), htonl (rmask)));
emsg->em_ena_isrc.s_addr = laddr;
emsg->em_ena_ismask.s_addr = lmask;
emsg->em_ena_idst.s_addr = raddr;
@@ -854,7 +854,7 @@ pf_encap_route (in_addr_t laddr, in_addr_t lmask, in_addr_t raddr,
LOG_DBG ((LOG_SYSDEP, 70, "pf_encap_route: rtmsg", rtmsg,
rtmsg->rtm_msglen));
- if (write(s, (caddr_t)rtmsg, rtmsg->rtm_msglen) == -1)
+ if (write (s, (caddr_t)rtmsg, rtmsg->rtm_msglen) == -1)
{
if (errno == EEXIST)
{
@@ -862,17 +862,17 @@ pf_encap_route (in_addr_t laddr, in_addr_t lmask, in_addr_t raddr,
LOG_DBG ((LOG_SYSDEP, 70, "pf_encap_route: rtmsg", rtmsg,
rtmsg->rtm_msglen));
- if (write(s, (caddr_t)rtmsg, rtmsg->rtm_msglen) == -1)
+ if (write (s, (caddr_t)rtmsg, rtmsg->rtm_msglen) == -1)
{
- log_error("pf_encap_route: write(%d, %p, %d) failed", s, rtmsg,
- rtmsg->rtm_msglen);
+ log_error ("pf_encap_route: write(%d, %p, %d) failed", s, rtmsg,
+ rtmsg->rtm_msglen);
goto fail;
}
}
else
{
- log_error("pf_encap_route: write(%d, %p, %d) failed", s, rtmsg,
- rtmsg->rtm_msglen);
+ log_error ("pf_encap_route: write(%d, %p, %d) failed", s, rtmsg,
+ rtmsg->rtm_msglen);
goto fail;
}
}
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c
index 84f02ecfee0..2758ed0b00f 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.47 2001/03/27 21:09:49 ho Exp $ */
+/* $OpenBSD: pf_key_v2.c,v 1.48 2001/04/09 22:09:52 ho Exp $ */
/* $EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $ */
/*
@@ -625,7 +625,7 @@ pf_key_v2_get_spi (size_t *sz, u_int8_t proto, struct sockaddr *src,
goto cleanup;
#ifdef KAME
- memset(&ssa2, 0, sizeof ssa2);
+ memset (&ssa2, 0, sizeof ssa2);
ssa2.sadb_x_sa2_exttype = SADB_X_EXT_SA2;
ssa2.sadb_x_sa2_len = sizeof ssa2 / PF_KEY_V2_CHUNK;
ssa2.sadb_x_sa2_mode = 0;
@@ -904,7 +904,7 @@ pf_key_v2_set_spi (struct sa *sa, struct proto *proto, int incoming)
goto cleanup;
#ifdef KAME
- memset(&ssa2, 0, sizeof ssa2);
+ memset (&ssa2, 0, sizeof ssa2);
ssa2.sadb_x_sa2_exttype = SADB_X_EXT_SA2;
ssa2.sadb_x_sa2_len = sizeof ssa2 / PF_KEY_V2_CHUNK;
ssa2.sadb_x_sa2_mode = 0;
@@ -1452,7 +1452,7 @@ pf_key_v2_flow (in_addr_t laddr, in_addr_t lmask, in_addr_t raddr,
if (!flow)
goto cleanup;
- memset(&ssa2, 0, sizeof ssa2);
+ memset (&ssa2, 0, sizeof ssa2);
ssa2.sadb_x_sa2_exttype = SADB_X_EXT_SA2;
ssa2.sadb_x_sa2_len = sizeof ssa2 / PF_KEY_V2_CHUNK;
ssa2.sadb_x_sa2_mode = 0;
@@ -1828,7 +1828,7 @@ pf_key_v2_delete_spi (struct sa *sa, struct proto *proto, int incoming)
goto cleanup;
#ifdef KAME
- memset(&ssa2, 0, sizeof ssa2);
+ memset (&ssa2, 0, sizeof ssa2);
ssa2.sadb_x_sa2_exttype = SADB_X_EXT_SA2;
ssa2.sadb_x_sa2_len = sizeof ssa2 / PF_KEY_V2_CHUNK;
ssa2.sadb_x_sa2_mode = 0;
@@ -2884,7 +2884,7 @@ pf_key_v2_group_spis (struct sa *sa, struct proto *proto1,
if (pf_key_v2_msg_add (grpspis, (struct sadb_ext *)&sa2, 0) == -1)
goto cleanup;
#else
- memset(&kamesa2, 0, sizeof kamesa2);
+ memset (&kamesa2, 0, sizeof kamesa2);
kamesa2.sadb_x_sa2_exttype = SADB_X_EXT_SA2;
kamesa2.sadb_x_sa2_len = sizeof kamesa2 / PF_KEY_V2_CHUNK;
kamesa2.sadb_x_sa2_mode = 0;
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index 0836dfa75b2..910017983bd 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sa.c,v 1.39 2001/03/06 22:18:48 angelos Exp $ */
+/* $OpenBSD: sa.c,v 1.40 2001/04/09 22:09:52 ho Exp $ */
/* $EOM: sa.c,v 1.112 2000/12/12 00:22:52 niklas Exp $ */
/*
@@ -232,7 +232,7 @@ isakmp_sa_check (struct sa *sa, void *v_arg)
return 0;
/* match icookie+rcookie against spi */
- if(memcmp (sa->cookies, arg->spi, ISAKMP_HDR_COOKIES_LEN) == 0)
+ if (memcmp (sa->cookies, arg->spi, ISAKMP_HDR_COOKIES_LEN) == 0)
return 1;
return 0;
@@ -797,7 +797,7 @@ sa_setup_expirations (struct sa *sa)
if (!sa->death)
{
- gettimeofday(&expiration, 0);
+ gettimeofday (&expiration, 0);
LOG_DBG ((LOG_TIMER, 95,
"sa_setup_expirations: SA %p hard timeout in %qd seconds",
sa, sa->seconds));
diff --git a/sbin/isakmpd/transport.c b/sbin/isakmpd/transport.c
index 31341145ec6..ca325361d93 100644
--- a/sbin/isakmpd/transport.c
+++ b/sbin/isakmpd/transport.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: transport.c,v 1.12 2000/10/10 13:35:12 niklas Exp $ */
+/* $OpenBSD: transport.c,v 1.13 2001/04/09 22:09:53 ho Exp $ */
/* $EOM: transport.c,v 1.43 2000/10/10 12:36:39 provos Exp $ */
/*
@@ -115,7 +115,7 @@ transport_report (void)
/* This is the reason message_dump_raw lives outside message.c. */
for (msg = TAILQ_FIRST (&t->sendq); msg; msg = TAILQ_NEXT (msg, link))
- message_dump_raw("udp_report", msg, LOG_REPORT);
+ message_dump_raw ("udp_report", msg, LOG_REPORT);
}
}
diff --git a/sbin/isakmpd/udp.c b/sbin/isakmpd/udp.c
index 682d954db1f..7ccfae66193 100644
--- a/sbin/isakmpd/udp.c
+++ b/sbin/isakmpd/udp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp.c,v 1.28 2001/03/06 22:17:21 angelos Exp $ */
+/* $OpenBSD: udp.c,v 1.29 2001/04/09 22:09:53 ho Exp $ */
/* $EOM: udp.c,v 1.57 2001/01/26 10:09:57 niklas Exp $ */
/*
@@ -454,7 +454,7 @@ udp_init ()
port = htons (udp_default_port);
else
{
- s = getservbyname("isakmp", "udp");
+ s = getservbyname ("isakmp", "udp");
port = s ? s->s_port : htons (UDP_DEFAULT_PORT);
}
diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c
index 0fdf8910888..1496c5ba420 100644
--- a/sbin/isakmpd/x509.c
+++ b/sbin/isakmpd/x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.c,v 1.47 2001/04/03 13:59:12 ho Exp $ */
+/* $OpenBSD: x509.c,v 1.48 2001/04/09 22:09:53 ho Exp $ */
/* $EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho Exp $ */
/*
@@ -331,7 +331,7 @@ x509_generate_kn (X509 *cert)
return 0;
}
- sprintf(before, "%s", tm->data);
+ sprintf (before, "%s", tm->data);
}
/* Fix missing seconds. */
@@ -447,7 +447,7 @@ x509_generate_kn (X509 *cert)
return 0;
}
- sprintf(after, "%s", tm->data);
+ sprintf (after, "%s", tm->data);
}
/* Fix missing seconds. */
@@ -1199,7 +1199,7 @@ x509_cert_get_subjects (void *scert, int *cnt, u_int8_t ***id,
*/
*cnt = 2;
- *id = calloc(*cnt, sizeof **id);
+ *id = calloc (*cnt, sizeof **id);
if (!*id)
{
log_print ("x509_cert_get_subject: malloc (%d) failed",
@@ -1207,7 +1207,7 @@ x509_cert_get_subjects (void *scert, int *cnt, u_int8_t ***id,
goto fail;
}
- *id_len = malloc(*cnt * sizeof **id_len);
+ *id_len = malloc (*cnt * sizeof **id_len);
if (!*id_len)
{
log_print ("x509_cert_get_subject: malloc (%d) failed",
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 07:46:45 +0000