summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/sysdep
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2002-06-09 08:13:10 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2002-06-09 08:13:10 +0000
commit3ed8b10a8df515c0cb5a2a6a0962c67f1c697164 (patch)
tree16644eb4e4232e2d2cd65fc342c5dbaafdc4e136 /sbin/isakmpd/sysdep
parentc021608bd50b74de1b8074e336f7adad03b1c7d8 (diff)
rm trailing whitespace
Diffstat (limited to 'sbin/isakmpd/sysdep')
-rw-r--r--sbin/isakmpd/sysdep/freebsd/Makefile.sysdep4
-rw-r--r--sbin/isakmpd/sysdep/linux/klips.c12
-rw-r--r--sbin/isakmpd/sysdep/linux/sys/queue.h4
-rw-r--r--sbin/isakmpd/sysdep/linux/sysdep.c6
-rw-r--r--sbin/isakmpd/sysdep/openbsd/keynote_compat.c4
-rw-r--r--sbin/isakmpd/sysdep/openbsd/sysdep.c8
6 files changed, 19 insertions, 19 deletions
diff --git a/sbin/isakmpd/sysdep/freebsd/Makefile.sysdep b/sbin/isakmpd/sysdep/freebsd/Makefile.sysdep
index 7a99372b989..23205d1861f 100644
--- a/sbin/isakmpd/sysdep/freebsd/Makefile.sysdep
+++ b/sbin/isakmpd/sysdep/freebsd/Makefile.sysdep
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sysdep,v 1.6 2001/10/26 16:03:07 ho Exp $
+# $OpenBSD: Makefile.sysdep,v 1.7 2002/06/09 08:13:07 todd Exp $
#
# Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
@@ -42,7 +42,7 @@ LIBSYSDEPDIR= ${TOPDIR}/sysdep/common/libsysdep
LIBSYSDEPDIR= ${.CURDIR}/sysdep/common/libsysdep
.endif
-LDADD+= -lgmp ${LIBSYSDEPDIR}/libsysdep.a -lipsec -L/usr/local/lib
+LDADD+= -lgmp ${LIBSYSDEPDIR}/libsysdep.a -lipsec -L/usr/local/lib
DPADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a
CFLAGS+= -DHAVE_GETNAMEINFO -DHAVE_GETIFADDRS \
diff --git a/sbin/isakmpd/sysdep/linux/klips.c b/sbin/isakmpd/sysdep/linux/klips.c
index da614330e05..1393629ba2c 100644
--- a/sbin/isakmpd/sysdep/linux/klips.c
+++ b/sbin/isakmpd/sysdep/linux/klips.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: klips.c,v 1.8 2001/06/29 19:08:12 ho Exp $ */
+/* $OpenBSD: klips.c,v 1.9 2002/06/09 08:13:07 todd Exp $ */
/*
* Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
@@ -254,7 +254,7 @@ klips_set_spi (struct sa *sa, struct proto *proto, int incoming,
break;
default:
- LOG_DBG ((LOG_SYSDEP, 10,
+ LOG_DBG ((LOG_SYSDEP, 10,
"klips_set_spi: Unsupported enc/auth alg negotiated"));
return -1;
}
@@ -424,7 +424,7 @@ klips_set_spi (struct sa *sa, struct proto *proto, int incoming,
free (emsg);
return -1;
}
-
+
/*
* Delete the IPsec SA represented by the INCOMING direction in protocol PROTO
* of the IKE security association SA.
@@ -481,7 +481,7 @@ klips_hex_decode (char *src, u_char *dst, int dstsize)
{
ch = tolower (p[0]);
cl = tolower (p[1]);
-
+
if ((ch >= '0') && (ch <= '9'))
ch -= '0';
else if ((ch >= 'a') && (ch <= 'f'))
@@ -498,7 +498,7 @@ klips_hex_decode (char *src, u_char *dst, int dstsize)
*q++ = (ch << 4) | cl;
}
-
+
return (int)(q - dst);
}
@@ -527,7 +527,7 @@ klips_route_get (u_long dst)
klips_hex_decode (netbuf, (u_char *)&net, sizeof net);
klips_hex_decode (gatebuf, (u_char *)&gate, sizeof gate);
klips_hex_decode (maskbuf, (u_char *)&mask, sizeof mask);
-
+
net = htonl (net);
gate = htonl (gate);
mask = htonl (mask);
diff --git a/sbin/isakmpd/sysdep/linux/sys/queue.h b/sbin/isakmpd/sysdep/linux/sys/queue.h
index 6af6f7418bd..eb35990304c 100644
--- a/sbin/isakmpd/sysdep/linux/sys/queue.h
+++ b/sbin/isakmpd/sysdep/linux/sys/queue.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue.h,v 1.3 2001/01/26 11:34:05 niklas Exp $ */
+/* $OpenBSD: queue.h,v 1.4 2002/06/09 08:13:07 todd Exp $ */
/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */
/*
@@ -85,7 +85,7 @@
#define LIST_HEAD(name, type) \
struct name { \
struct type *lh_first; /* first element */ \
-}
+}
#define LIST_ENTRY(type) \
struct { \
diff --git a/sbin/isakmpd/sysdep/linux/sysdep.c b/sbin/isakmpd/sysdep/linux/sysdep.c
index c9f8a17f6c8..b51ed820010 100644
--- a/sbin/isakmpd/sysdep/linux/sysdep.c
+++ b/sbin/isakmpd/sysdep/linux/sysdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysdep.c,v 1.10 2001/10/26 12:23:45 ho Exp $ */
+/* $OpenBSD: sysdep.c,v 1.11 2002/06/09 08:13:07 todd Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -84,8 +84,8 @@ sysdep_random ()
u_int32_t *tmp = (u_int32_t *)&sig[i * 4];
rndval ^= *tmp;
}
-
- return rndval;
+
+ return rndval;
}
char *
diff --git a/sbin/isakmpd/sysdep/openbsd/keynote_compat.c b/sbin/isakmpd/sysdep/openbsd/keynote_compat.c
index 8a8c6aad64d..d76d524ff5f 100644
--- a/sbin/isakmpd/sysdep/openbsd/keynote_compat.c
+++ b/sbin/isakmpd/sysdep/openbsd/keynote_compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote_compat.c,v 1.3 2000/12/12 01:49:48 niklas Exp $ */
+/* $OpenBSD: keynote_compat.c,v 1.4 2002/06/09 08:13:07 todd Exp $ */
/* $EOM: keynote_compat.c,v 1.1 2000/10/15 19:18:26 niklas Exp $ */
/*
@@ -51,7 +51,7 @@
* Permission to use, copy, and modify this software without fee
* is hereby granted, provided that this entire notice is included in
* all copies of any software which is or includes a copy or
- * modification of this software.
+ * modification of this software.
*
* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
* IMPLIED WARRANTY. IN PARTICULAR, THE AUTHORS MAKES NO
diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep.c b/sbin/isakmpd/sysdep/openbsd/sysdep.c
index 01a09dc0565..5fda1cf9456 100644
--- a/sbin/isakmpd/sysdep/openbsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/openbsd/sysdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysdep.c,v 1.21 2001/10/26 12:23:46 ho Exp $ */
+/* $OpenBSD: sysdep.c,v 1.22 2002/06/09 08:13:07 todd Exp $ */
/* $EOM: sysdep.c,v 1.9 2000/12/04 04:46:35 angelos Exp $ */
/*
@@ -139,14 +139,14 @@ int
sysdep_cleartext (int fd, int af)
{
int level, sw;
- struct {
+ struct {
int ip_proto; /* IP protocol */
int auth_level;
int esp_trans_level;
int esp_network_level;
int ipcomp_level;
} optsw[] =
- {
+ {
{
IPPROTO_IP,
IP_AUTH_LEVEL,
@@ -170,7 +170,7 @@ sysdep_cleartext (int fd, int af)
#endif
},
};
-
+
if (app_none)
return 0;