summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2001-04-15 16:09:17 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2001-04-15 16:09:17 +0000
commite309166fcfe403129197403fc8267de795a161ba (patch)
treeb5af4ba63c282030c24ae08b5a6431c96560252c /sbin
parent6585ea45efd718a3ce89e9bd9596a892824f65c8 (diff)
Style.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/hash.c6
-rw-r--r--sbin/isakmpd/ipsec.c6
-rw-r--r--sbin/isakmpd/log.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/sbin/isakmpd/hash.c b/sbin/isakmpd/hash.c
index 0b2498a3f24..eca6e409ce3 100644
--- a/sbin/isakmpd/hash.c
+++ b/sbin/isakmpd/hash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hash.c,v 1.5 1999/04/19 20:00:24 niklas Exp $ */
+/* $OpenBSD: hash.c,v 1.6 2001/04/15 16:09:16 ho Exp $ */
/* $EOM: hash.c,v 1.10 1999/04/17 23:20:34 niklas Exp $ */
/*
@@ -111,13 +111,13 @@ hmac_init (struct hash *hash, unsigned char *okey, int len)
}
/* HMAC I and O pad computation */
- for (i=0; i < blocklen; i++)
+ for (i = 0; i < blocklen; i++)
key[i] ^= HMAC_IPAD_VAL;
hash->Init (hash->ctx);
hash->Update (hash->ctx, key, blocklen);
- for (i=0; i < blocklen; i++)
+ for (i = 0; i < blocklen; i++)
key[i] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL);
hash->Init (hash->ctx2);
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c
index b92c9d91477..c111f58300b 100644
--- a/sbin/isakmpd/ipsec.c
+++ b/sbin/isakmpd/ipsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec.c,v 1.42 2001/04/09 22:09:52 ho Exp $ */
+/* $OpenBSD: ipsec.c,v 1.43 2001/04/15 16:09:16 ho Exp $ */
/* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */
/*
@@ -832,7 +832,7 @@ ipsec_invalid_spi (struct message *msg, struct payload *p)
off = ISAKMP_NOTIFY_SPI_OFF + spisz;
invspisz = totsiz - off;
- if(invspisz != sizeof spi)
+ if (invspisz != sizeof spi)
{
LOG_DBG ((LOG_SA, 40,
"ipsec_invalid_spi: SPI size %d in INVALID_SPI "
@@ -890,7 +890,7 @@ ipsec_responder (struct message *msg)
"ipsec_responder: got NOTIFY of type %s",
constant_lookup (isakmp_notify_cst, type)));
- if(type == ISAKMP_NOTIFY_INVALID_SPI)
+ if (type == ISAKMP_NOTIFY_INVALID_SPI)
ipsec_invalid_spi (msg, p);
p->flags |= PL_MARK;
diff --git a/sbin/isakmpd/log.c b/sbin/isakmpd/log.c
index 0b443b897a0..d30b1489d05 100644
--- a/sbin/isakmpd/log.c
+++ b/sbin/isakmpd/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.17 2001/04/09 21:21:57 ho Exp $ */
+/* $OpenBSD: log.c,v 1.18 2001/04/15 16:09:16 ho Exp $ */
/* $EOM: log.c,v 1.30 2000/09/29 08:19:23 niklas Exp $ */
/*
@@ -590,7 +590,7 @@ in_cksum (const struct ip *ip, int len)
nleft -= 2;
}
if (nleft == 1)
- sum += htons (*(u_char *)w<<8);
+ sum += htons (*(u_char *)w << 8);
sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */
sum += (sum >> 16); /* add carry */