summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2010-07-20 16:28:22 +0000
committerderaadt <deraadt@openbsd.org>2010-07-20 16:28:22 +0000
commit311642f0ba1eff00c2b90157dfe21d0cbc473cb7 (patch)
tree2a9ad6e77c2d0abf7e81311b2e15820c977ef8ca
parentSwitch some obvious network stack MAC comparisons from bcmp() to (diff)
downloadwireguard-openbsd-311642f0ba1eff00c2b90157dfe21d0cbc473cb7.tar.xz
wireguard-openbsd-311642f0ba1eff00c2b90157dfe21d0cbc473cb7.zip
two iterators should be u_int; ok jsg
-rw-r--r--sbin/iked/ikev2.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c
index 5952d7be1b0..426256569e4 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2.c,v 1.21 2010/07/03 16:59:35 reyk Exp $ */
+/* $OpenBSD: ikev2.c,v 1.22 2010/07/20 16:28:22 deraadt Exp $ */
/* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */
/*
@@ -1320,9 +1320,10 @@ ikev2_add_proposals(struct iked *env, struct iked_sa *sa, struct ibuf *buf,
struct iked_transform *xform;
struct iked_proposal *prop;
struct iked_childsa csa;
- ssize_t i, length = 0, saplength, ret, n;
+ ssize_t length = 0, saplength, ret, n;
u_int64_t spi64;
u_int32_t spi32, spi;
+ u_int i;
n = 0;
TAILQ_FOREACH(prop, proposals, prop_entry) {
@@ -3259,7 +3260,7 @@ ikev2_valid_proposal(struct iked_proposal *prop,
struct iked_transform **exf, struct iked_transform **ixf)
{
struct iked_transform *xform, *encrxf, *integrxf;
- size_t i;
+ u_int i;
switch (prop->prop_protoid) {
case IKEV2_SAPROTO_ESP: