if someone wants a portable, create a -p project. clutter stops quality

14 files changed, 0 insertions, 2673 deletions

diff --git a/sbin/isakmpd/sysdep/common/blf.h b/sbin/isakmpd/sysdep/common/blf.h
deleted file mode 100644
index 97eec8923b5..00000000000
--- a/sbin/isakmpd/sysdep/common/blf.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $OpenBSD: blf.h,v 1.5 2003/06/03 14:52:06 ho Exp $ */
-/*
- * Blowfish - a fast block cipher designed by Bruce Schneier
- *
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _BLF_H_
-#define _BLF_H_
-
-/* Schneier states the maximum key length to be 56 bytes.
- * The way how the subkeys are initialized by the key up
- * to (N+2)*4 i.e. 72 bytes are utilized.
- * Warning: For normal blowfish encryption only 56 bytes
- * of the key affect all cipherbits.
- */
-
-#define BLF_N	16			/* Number of Subkeys */
-#define BLF_MAXKEYLEN ((BLF_N-2)*4)	/* 448 bits */
-
-/* Blowfish context */
-typedef struct BlowfishContext {
-	u_int32_t S[4][256];	/* S-Boxes */
-	u_int32_t P[BLF_N + 2];	/* Subkeys */
-} blf_ctx;
-
-/* Raw access to customized Blowfish
- *	blf_key is just:
- *	Blowfish_initstate( state )
- *	Blowfish_expand0state( state, key, keylen )
- */
-
-void Blowfish_encipher(blf_ctx *, u_int32_t *, u_int32_t *);
-void Blowfish_decipher(blf_ctx *, u_int32_t *, u_int32_t *);
-void Blowfish_initstate(blf_ctx *);
-void Blowfish_expand0state(blf_ctx *, const u_int8_t *, u_int16_t);
-void Blowfish_expandstate
-(blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t);
-
-/* Standard Blowfish */
-
-void blf_key(blf_ctx *, const u_int8_t *, u_int16_t);
-void blf_enc(blf_ctx *, u_int32_t *, u_int16_t);
-void blf_dec(blf_ctx *, u_int32_t *, u_int16_t);
-
-/* Converts u_int8_t to u_int32_t */
-u_int32_t Blowfish_stream2word(const u_int8_t *, u_int16_t , u_int16_t *);
-
-#endif
diff --git a/sbin/isakmpd/sysdep/common/cast.h b/sbin/isakmpd/sysdep/common/cast.h
deleted file mode 100644
index c130986ee64..00000000000
--- a/sbin/isakmpd/sysdep/common/cast.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*      $OpenBSD: cast.h,v 1.1 2001/01/26 11:34:00 niklas Exp $       */
-/*
- *	CAST-128 in C
- *	Written by Steve Reid <sreid@sea-to-sky.net>
- *	100% Public Domain - no warranty
- *	Released 1997.10.11
- */
-
-#ifndef _CAST_H_
-#define _CAST_H_
-
-typedef struct {
-	u_int32_t xkey[32];	/* Key, after expansion */
-	int rounds;		/* Number of rounds to use, 12 or 16 */
-} cast_key;
-
-void cast_setkey(cast_key* key, u_int8_t* rawkey, int keybytes);
-void cast_encrypt(cast_key* key, u_int8_t* inblock, u_int8_t* outblock);
-void cast_decrypt(cast_key* key, u_int8_t* inblock, u_int8_t* outblock);
-
-#endif /* ifndef _CAST_H_ */
-
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/GNUmakefile b/sbin/isakmpd/sysdep/common/libsysdep/GNUmakefile
deleted file mode 100644
index 3b623283a1f..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/GNUmakefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#	$OpenBSD: GNUmakefile,v 1.4 2003/06/03 14:52:06 ho Exp $
-
-#
-# Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# This code was written under funding by Ericsson Radio Systems.
-#
-
-.CURDIR:=	$(shell pwd)
-
-LIB=		sysdep
-SRCS=		arc4random.c blowfish.c cast.c md5.c sha1.c strlcat.c strlcpy.c
-NOMAN=
-CFLAGS+=	-I${.CURDIR}/.. -I/usr/include/machine
-
-lib${LIB}.a: ${SRCS:%.c=%.o}
-	ar cq $@ ${SRCS:%.c=%.o}
-
-clean:
-	rm -f lib${LIB}.a ${SRCS:%.c=%.o}
-
-cleandir: clean cleandepend
-
-depend: .depend
-
-.depend: ${SRCS}
-	@rm -f .depend
-	${MKDEP} ${CFLAGS} ${SRCS} > .depend
-
-cleandepend:
-	rm -f .depend
-
-ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
--include .depend
-endif
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/Makefile b/sbin/isakmpd/sysdep/common/libsysdep/Makefile
deleted file mode 100644
index fce68d3a8c3..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#	$OpenBSD: Makefile,v 1.4 2003/06/03 14:52:06 ho Exp $
-
-#
-# Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# This code was written under funding by Ericsson Radio Systems.
-#
-OPSYS!=	uname -s
-
-LIB=		sysdep
-SRCS=		arc4random.c blowfish.c cast.c md5.c sha1.c strlcat.c strlcpy.c
-NOPROFILE=	
-NOPIC=
-NOMAN=
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS+=	-I${.CURDIR}/.. -I/usr/include/machine
-.else
-CFLAGS+=	-I${.CURDIR}/.. -I/usr/include/machine
-.endif
-
-.include <bsd.lib.mk>
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/arc4random.c b/sbin/isakmpd/sysdep/common/libsysdep/arc4random.c
deleted file mode 100644
index 28222f769ef..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/arc4random.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*	$OpenBSD: arc4random.c,v 1.7 2005/02/10 14:43:14 ho Exp $	*/
-
-/*
- * Arc4 random number generator for OpenBSD.
- * Copyright 1996 David Mazieres <dm@lcs.mit.edu>.
- *
- * Modification and redistribution in source and binary forms is
- * permitted provided that due credit is given to the author and the
- * OpenBSD project by leaving this copyright notice intact.
- */
-
-/*
- * This code is derived from section 17.1 of Applied Cryptography,
- * second edition, which describes a stream cipher allegedly
- * compatible with RSA Labs "RC4" cipher (the actual description of
- * which is a trade secret).  The same algorithm is used as a stream
- * cipher called "arcfour" in Tatu Ylonen's ssh package.
- *
- * Here the stream cipher has been modified always to include the time
- * when initializing the state.  That makes it impossible to
- * regenerate the same random sequence twice, so this can't be used
- * for encryption, but will generate good random numbers.
- *
- * RC4 is a registered trademark of RSA Laboratories.
- */
-
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#ifdef __GNUC__
-#define inline __inline
-#else				/* !__GNUC__ */
-#define inline
-#endif				/* !__GNUC__ */
-
-struct arc4_stream {
-	u_int8_t i;
-	u_int8_t j;
-	u_int8_t s[256];
-};
-
-int     rs_initialized;
-static struct arc4_stream rs;
-
-static inline u_int8_t arc4_getbyte(struct arc4_stream *);
-
-static inline void
-arc4_init(struct arc4_stream *as)
-{
-	int     n;
-
-	for (n = 0; n < 256; n++)
-		as->s[n] = n;
-	as->i = 0;
-	as->j = 0;
-}
-
-static inline void
-arc4_addrandom(struct arc4_stream *as, u_char *dat, int datlen)
-{
-	int     n;
-	u_int8_t si;
-
-	as->i--;
-	for (n = 0; n < 256; n++) {
-		as->i = (as->i + 1);
-		si = as->s[as->i];
-		as->j = (as->j + si + dat[n % datlen]);
-		as->s[as->i] = as->s[as->j];
-		as->s[as->j] = si;
-	}
-	as->j = as->i;
-}
-
-static void
-arc4_stir(struct arc4_stream *as)
-{
-	int     fd, i;
-	struct {
-		struct timeval tv;
-		u_int8_t rnd[128 - sizeof(struct timeval)];
-	}       rdat;
-
-	gettimeofday(&rdat.tv, NULL);
-	fd = open("/dev/arandom", O_RDONLY);
-	if (fd < 0)
-		fd = open("/dev/random", O_RDONLY);
-	if (fd >= 0) {
-		read(fd, rdat.rnd, sizeof(rdat.rnd));
-		close(fd);
-	}
-	/* fd < 0?  Ah, what the heck. We'll just take whatever was on the
-	 * stack... */
-
-	arc4_addrandom(as, (void *)&rdat, sizeof(rdat));
-
-	/*
-	 * Discard early keystream, as per recommendations in:
-	 * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps
-	 */
-	for (i = 0; i < 256; i++)
-		(void)arc4_getbyte(as);
-}
-
-static inline u_int8_t
-arc4_getbyte(struct arc4_stream *as)
-{
-	u_int8_t si, sj;
-
-	as->i = (as->i + 1);
-	si = as->s[as->i];
-	as->j = (as->j + si);
-	sj = as->s[as->j];
-	as->s[as->i] = sj;
-	as->s[as->j] = si;
-	return (as->s[(si + sj) & 0xff]);
-}
-
-static inline u_int32_t
-arc4_getword(struct arc4_stream *as)
-{
-	u_int32_t val;
-	val = arc4_getbyte(as) << 24;
-	val |= arc4_getbyte(as) << 16;
-	val |= arc4_getbyte(as) << 8;
-	val |= arc4_getbyte(as);
-	return val;
-}
-
-void
-arc4random_stir(void)
-{
-	if (!rs_initialized) {
-		arc4_init(&rs);
-		rs_initialized = 1;
-	}
-	arc4_stir(&rs);
-}
-
-void
-arc4random_addrandom(u_char *dat, int datlen)
-{
-	if (!rs_initialized)
-		arc4random_stir();
-	arc4_addrandom(&rs, dat, datlen);
-}
-
-u_int32_t
-arc4random(void)
-{
-	if (!rs_initialized)
-		arc4random_stir();
-	return arc4_getword(&rs);
-}
-
-#if 0
-/*-------- Test code for i386 --------*/
-#include <stdio.h>
-#include <machine/pctr.h>
-int
-main(int argc, char **argv)
-{
-	const int iter = 1000000;
-	int     i;
-	pctrval v;
-
-	v = rdtsc();
-	for (i = 0; i < iter; i++)
-		arc4random();
-	v = rdtsc() - v;
-	v /= iter;
-
-	printf("%qd cycles\n", v);
-}
-#endif
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c b/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c
deleted file mode 100644
index 5c59f4b8338..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c
+++ /dev/null
@@ -1,685 +0,0 @@
-/* $OpenBSD: blowfish.c,v 1.4 2003/06/03 14:52:06 ho Exp $ */
-/*
- * Blowfish block cipher for OpenBSD
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This code is derived from section 14.3 and the given source
- * in section V of Applied Cryptography, second edition.
- * Blowfish is an unpatented fast block cipher designed by
- * Bruce Schneier.
- */
-
-#if 0
-#include <stdio.h>		/* used for debugging */
-#include <string.h>
-#endif
-
-#include <sys/types.h>
-#include <blf.h>
-
-#undef inline
-#ifdef __GNUC__
-#define inline __inline
-#else				/* !__GNUC__ */
-#define inline
-#endif				/* !__GNUC__ */
-
-/* Function for Feistel Networks */
-
-#define F(bc, x) ((((bc)->S[0][((x) & 0xFF000000) >> 24] \
-		    + (bc)->S[1][((x) &0xFF0000 ) >> 16]) \
-		   ^ (bc)->S[2][((x) & 0xFF00) >> 8]) \
-		  + (bc)->S[3][(x) & 0x00FF])
-
-#define BLFRND(bc,i,j,n) (i ^= F(bc,j) ^ (bc)->P[n])
-
-void
-Blowfish_encipher(c, xl, xr)
-	blf_ctx *c;
-	u_int32_t *xl;
-	u_int32_t *xr;
-{
-	u_int32_t Xl;
-	u_int32_t Xr;
-
-	Xl = *xl;
-	Xr = *xr;
-
-	Xl ^= c->P[0];
-	BLFRND(c, Xr, Xl, 1); BLFRND(c, Xl, Xr, 2);
-	BLFRND(c, Xr, Xl, 3); BLFRND(c, Xl, Xr, 4);
-	BLFRND(c, Xr, Xl, 5); BLFRND(c, Xl, Xr, 6);
-	BLFRND(c, Xr, Xl, 7); BLFRND(c, Xl, Xr, 8);
-	BLFRND(c, Xr, Xl, 9); BLFRND(c, Xl, Xr, 10);
-	BLFRND(c, Xr, Xl, 11); BLFRND(c, Xl, Xr, 12);
-	BLFRND(c, Xr, Xl, 13); BLFRND(c, Xl, Xr, 14);
-	BLFRND(c, Xr, Xl, 15); BLFRND(c, Xl, Xr, 16);
-
-	*xl = Xr ^ c->P[17];
-	*xr = Xl;
-}
-
-void
-Blowfish_decipher(c, xl, xr)
-	blf_ctx *c;
-	u_int32_t *xl;
-	u_int32_t *xr;
-{
-	u_int32_t Xl;
-	u_int32_t Xr;
-
-	Xl = *xl;
-	Xr = *xr;
-
-	Xl ^= c->P[17];
-	BLFRND(c, Xr, Xl, 16); BLFRND(c, Xl, Xr, 15);
-	BLFRND(c, Xr, Xl, 14); BLFRND(c, Xl, Xr, 13);
-	BLFRND(c, Xr, Xl, 12); BLFRND(c, Xl, Xr, 11);
-	BLFRND(c, Xr, Xl, 10); BLFRND(c, Xl, Xr, 9);
-	BLFRND(c, Xr, Xl, 8); BLFRND(c, Xl, Xr, 7);
-	BLFRND(c, Xr, Xl, 6); BLFRND(c, Xl, Xr, 5);
-	BLFRND(c, Xr, Xl, 4); BLFRND(c, Xl, Xr, 3);
-	BLFRND(c, Xr, Xl, 2); BLFRND(c, Xl, Xr, 1);
-
-	*xl = Xr ^ c->P[0];
-	*xr = Xl;
-}
-
-void
-Blowfish_initstate(c)
-	blf_ctx *c;
-{
-
-/* P-box and S-box tables initialized with digits of Pi */
-
-	const blf_ctx initstate =
-
-	{ {
-		{
-			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-			0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-			0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-			0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-			0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-			0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-			0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-			0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-			0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-			0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-			0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-			0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-			0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-			0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-			0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-			0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-			0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-			0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-			0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-			0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-			0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-			0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-			0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-			0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-			0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-			0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-			0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-			0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-			0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-			0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-			0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-			0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-			0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-			0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-			0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-			0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-			0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-			0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-			0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-			0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-			0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-			0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-			0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-			0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-			0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-			0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-			0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-		0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
-		{
-			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-			0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-			0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-			0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-			0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-			0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-			0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-			0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-			0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-			0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-			0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-			0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-			0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-			0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-			0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-			0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-			0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-			0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-			0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-			0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-			0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-			0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-			0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-			0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-			0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-			0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-			0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-			0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-			0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-			0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-			0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-			0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-			0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-			0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-			0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-			0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-			0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-			0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-			0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-			0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-			0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-			0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-			0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-			0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-			0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-			0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-			0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-		0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
-		{
-			0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-			0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-			0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-			0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-			0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-			0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-			0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-			0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-			0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-			0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-			0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-			0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-			0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-			0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-			0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-			0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-			0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-			0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-			0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-			0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-			0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-			0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-			0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-			0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-			0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-			0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-			0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-			0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-			0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-			0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-			0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-			0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-			0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-			0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-			0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-			0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-			0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-			0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-			0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-			0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-			0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-			0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-			0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-			0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-			0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-			0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-		0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
-		{
-			0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-			0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-			0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-			0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-			0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-			0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-			0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-			0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-			0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-			0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-			0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-			0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-			0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-			0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-			0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-			0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-			0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-			0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-			0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-			0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-			0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-			0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-			0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-			0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-			0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-			0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-			0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-			0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-			0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-			0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-			0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-			0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-			0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-			0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-			0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-			0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-			0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-			0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-			0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-			0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-			0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-			0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-			0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-			0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-			0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-			0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-		0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
-	},
-	{
-		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-		0x9216d5d9, 0x8979fb1b
-	} };
-
-	*c = initstate;
-
-}
-
-u_int32_t
-Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current)
-{
-	u_int8_t i;
-	u_int16_t j;
-	u_int32_t temp;
-
-	temp = 0x00000000;
-	j = *current;
-
-	for (i = 0; i < 4; i++, j++) {
-		if (j >= databytes)
-			j = 0;
-		temp = (temp << 8) | data[j];
-	}
-
-	*current = j;
-	return temp;
-}
-
-void
-Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes)
-{
-	u_int16_t i;
-	u_int16_t j;
-	u_int16_t k;
-	u_int32_t temp;
-	u_int32_t datal;
-	u_int32_t datar;
-
-	j = 0;
-	for (i = 0; i < BLF_N + 2; i++) {
-		/* Extract 4 int8 to 1 int32 from keystream */
-		temp = Blowfish_stream2word(key, keybytes, &j);
-		c->P[i] = c->P[i] ^ temp;
-	}
-
-	j = 0;
-	datal = 0x00000000;
-	datar = 0x00000000;
-	for (i = 0; i < BLF_N + 2; i += 2) {
-		Blowfish_encipher(c, &datal, &datar);
-
-		c->P[i] = datal;
-		c->P[i + 1] = datar;
-	}
-
-	for (i = 0; i < 4; i++) {
-		for (k = 0; k < 256; k += 2) {
-			Blowfish_encipher(c, &datal, &datar);
-
-			c->S[i][k] = datal;
-			c->S[i][k + 1] = datar;
-		}
-	}
-}
-
-
-void
-Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes,
-		     const u_int8_t *key, u_int16_t keybytes)
-{
-	u_int16_t i;
-	u_int16_t j;
-	u_int16_t k;
-	u_int32_t temp;
-	u_int32_t datal;
-	u_int32_t datar;
-
-	j = 0;
-	for (i = 0; i < BLF_N + 2; i++) {
-		/* Extract 4 int8 to 1 int32 from keystream */
-		temp = Blowfish_stream2word(key, keybytes, &j);
-		c->P[i] = c->P[i] ^ temp;
-	}
-
-	j = 0;
-	datal = 0x00000000;
-	datar = 0x00000000;
-	for (i = 0; i < BLF_N + 2; i += 2) {
-		datal ^= Blowfish_stream2word(data, databytes, &j);
-		datar ^= Blowfish_stream2word(data, databytes, &j);
-		Blowfish_encipher(c, &datal, &datar);
-
-		c->P[i] = datal;
-		c->P[i + 1] = datar;
-	}
-
-	for (i = 0; i < 4; i++) {
-		for (k = 0; k < 256; k += 2) {
-			datal ^= Blowfish_stream2word(data, databytes, &j);
-			datar ^= Blowfish_stream2word(data, databytes, &j);
-			Blowfish_encipher(c, &datal, &datar);
-
-			c->S[i][k] = datal;
-			c->S[i][k + 1] = datar;
-		}
-	}
-
-}
-
-void
-blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len)
-{
-	/* Initialize S-boxes and subkeys with Pi */
-	Blowfish_initstate(c);
-
-	/* Transform S-boxes and subkeys with key */
-	Blowfish_expand0state(c, k, len);
-}
-
-void
-blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
-{
-	u_int32_t *d;
-	u_int16_t i;
-
-	d = data;
-	for (i = 0; i < blocks; i++) {
-		Blowfish_encipher(c, d, d + 1);
-		d += 2;
-	}
-}
-
-void
-blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
-{
-	u_int32_t *d;
-	u_int16_t i;
-
-	d = data;
-	for (i = 0; i < blocks; i++) {
-		Blowfish_decipher(c, d, d + 1);
-		d += 2;
-	}
-}
-
-void
-blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
-{
-	u_int32_t l, r;
-	u_int32_t i;
-
-	for (i = 0; i < len; i += 8) {
-		l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-		r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-		Blowfish_encipher(c, &l, &r);
-		data[0] = l >> 24 & 0xff;
-		data[1] = l >> 16 & 0xff;
-		data[2] = l >> 8 & 0xff;
-		data[3] = l & 0xff;
-		data[4] = r >> 24 & 0xff;
-		data[5] = r >> 16 & 0xff;
-		data[6] = r >> 8 & 0xff;
-		data[7] = r & 0xff;
-		data += 8;
-	}
-}
-
-void
-blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
-{
-	u_int32_t l, r;
-	u_int32_t i;
-
-	for (i = 0; i < len; i += 8) {
-		l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-		r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-		Blowfish_decipher(c, &l, &r);
-		data[0] = l >> 24 & 0xff;
-		data[1] = l >> 16 & 0xff;
-		data[2] = l >> 8 & 0xff;
-		data[3] = l & 0xff;
-		data[4] = r >> 24 & 0xff;
-		data[5] = r >> 16 & 0xff;
-		data[6] = r >> 8 & 0xff;
-		data[7] = r & 0xff;
-		data += 8;
-	}
-}
-
-void
-blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len)
-{
-	u_int32_t l, r;
-	u_int32_t i, j;
-
-	for (i = 0; i < len; i += 8) {
-		for (j = 0; j < 8; j++)
-			data[j] ^= iv[j];
-		l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-		r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-		Blowfish_encipher(c, &l, &r);
-		data[0] = l >> 24 & 0xff;
-		data[1] = l >> 16 & 0xff;
-		data[2] = l >> 8 & 0xff;
-		data[3] = l & 0xff;
-		data[4] = r >> 24 & 0xff;
-		data[5] = r >> 16 & 0xff;
-		data[6] = r >> 8 & 0xff;
-		data[7] = r & 0xff;
-		iv = data;
-		data += 8;
-	}
-}
-
-void
-blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len)
-{
-	u_int32_t l, r;
-	u_int8_t *iv;
-	u_int32_t i, j;
-
-	iv = data + len - 16;
-	data = data + len - 8;
-	for (i = len - 8; i >= 8; i -= 8) {
-		l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-		r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-		Blowfish_decipher(c, &l, &r);
-		data[0] = l >> 24 & 0xff;
-		data[1] = l >> 16 & 0xff;
-		data[2] = l >> 8 & 0xff;
-		data[3] = l & 0xff;
-		data[4] = r >> 24 & 0xff;
-		data[5] = r >> 16 & 0xff;
-		data[6] = r >> 8 & 0xff;
-		data[7] = r & 0xff;
-		for (j = 0; j < 8; j++)
-			data[j] ^= iv[j];
-		iv -= 8;
-		data -= 8;
-	}
-	l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-	r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-	Blowfish_decipher(c, &l, &r);
-	data[0] = l >> 24 & 0xff;
-	data[1] = l >> 16 & 0xff;
-	data[2] = l >> 8 & 0xff;
-	data[3] = l & 0xff;
-	data[4] = r >> 24 & 0xff;
-	data[5] = r >> 16 & 0xff;
-	data[6] = r >> 8 & 0xff;
-	data[7] = r & 0xff;
-	for (j = 0; j < 8; j++)
-		data[j] ^= iva[j];
-}
-
-#if 0
-void
-report(u_int32_t data[], u_int16_t len)
-{
-	u_int16_t i;
-	for (i = 0; i < len; i += 2)
-		printf("Block %0hd: %08lx %08lx.\n",
-		    i / 2, data[i], data[i + 1]);
-}
-void
-main(void)
-{
-
-	blf_ctx c;
-	char    key[] = "AAAAA";
-	char    key2[] = "abcdefghijklmnopqrstuvwxyz";
-
-	u_int32_t data[10];
-	u_int32_t data2[] =
-	{0x424c4f57l, 0x46495348l};
-
-	u_int16_t i;
-
-	/* First test */
-	for (i = 0; i < 10; i++)
-		data[i] = i;
-
-	blf_key(&c, (u_int8_t *) key, 5);
-	blf_enc(&c, data, 5);
-	blf_dec(&c, data, 1);
-	blf_dec(&c, data + 2, 4);
-	printf("Should read as 0 - 9.\n");
-	report(data, 10);
-
-	/* Second test */
-	blf_key(&c, (u_int8_t *) key2, strlen(key2));
-	blf_enc(&c, data2, 1);
-	printf("\nShould read as: 0x324ed0fe 0xf413a203.\n");
-	report(data2, 2);
-	blf_dec(&c, data2, 1);
-	report(data2, 2);
-}
-#endif
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/cast.c b/sbin/isakmpd/sysdep/common/libsysdep/cast.c
deleted file mode 100644
index dc21610d250..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/cast.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/*      $OpenBSD: cast.c,v 1.3 2001/06/05 00:12:51 niklas Exp $       */
-/*
- *	CAST-128 in C
- *	Written by Steve Reid <sreid@sea-to-sky.net>
- *	100% Public Domain - no warranty
- *	Released 1997.10.11
- */
-
-#include <sys/types.h>
-
-#include <cast.h>
-
-/* CAST S-Boxes */
-
-static const u_int32_t cast_sbox1[256] = {
-	0x30FB40D4, 0x9FA0FF0B, 0x6BECCD2F, 0x3F258C7A,
-	0x1E213F2F, 0x9C004DD3, 0x6003E540, 0xCF9FC949,
-	0xBFD4AF27, 0x88BBBDB5, 0xE2034090, 0x98D09675,
-	0x6E63A0E0, 0x15C361D2, 0xC2E7661D, 0x22D4FF8E,
-	0x28683B6F, 0xC07FD059, 0xFF2379C8, 0x775F50E2,
-	0x43C340D3, 0xDF2F8656, 0x887CA41A, 0xA2D2BD2D,
-	0xA1C9E0D6, 0x346C4819, 0x61B76D87, 0x22540F2F,
-	0x2ABE32E1, 0xAA54166B, 0x22568E3A, 0xA2D341D0,
-	0x66DB40C8, 0xA784392F, 0x004DFF2F, 0x2DB9D2DE,
-	0x97943FAC, 0x4A97C1D8, 0x527644B7, 0xB5F437A7,
-	0xB82CBAEF, 0xD751D159, 0x6FF7F0ED, 0x5A097A1F,
-	0x827B68D0, 0x90ECF52E, 0x22B0C054, 0xBC8E5935,
-	0x4B6D2F7F, 0x50BB64A2, 0xD2664910, 0xBEE5812D,
-	0xB7332290, 0xE93B159F, 0xB48EE411, 0x4BFF345D,
-	0xFD45C240, 0xAD31973F, 0xC4F6D02E, 0x55FC8165,
-	0xD5B1CAAD, 0xA1AC2DAE, 0xA2D4B76D, 0xC19B0C50,
-	0x882240F2, 0x0C6E4F38, 0xA4E4BFD7, 0x4F5BA272,
-	0x564C1D2F, 0xC59C5319, 0xB949E354, 0xB04669FE,
-	0xB1B6AB8A, 0xC71358DD, 0x6385C545, 0x110F935D,
-	0x57538AD5, 0x6A390493, 0xE63D37E0, 0x2A54F6B3,
-	0x3A787D5F, 0x6276A0B5, 0x19A6FCDF, 0x7A42206A,
-	0x29F9D4D5, 0xF61B1891, 0xBB72275E, 0xAA508167,
-	0x38901091, 0xC6B505EB, 0x84C7CB8C, 0x2AD75A0F,
-	0x874A1427, 0xA2D1936B, 0x2AD286AF, 0xAA56D291,
-	0xD7894360, 0x425C750D, 0x93B39E26, 0x187184C9,
-	0x6C00B32D, 0x73E2BB14, 0xA0BEBC3C, 0x54623779,
-	0x64459EAB, 0x3F328B82, 0x7718CF82, 0x59A2CEA6,
-	0x04EE002E, 0x89FE78E6, 0x3FAB0950, 0x325FF6C2,
-	0x81383F05, 0x6963C5C8, 0x76CB5AD6, 0xD49974C9,
-	0xCA180DCF, 0x380782D5, 0xC7FA5CF6, 0x8AC31511,
-	0x35E79E13, 0x47DA91D0, 0xF40F9086, 0xA7E2419E,
-	0x31366241, 0x051EF495, 0xAA573B04, 0x4A805D8D,
-	0x548300D0, 0x00322A3C, 0xBF64CDDF, 0xBA57A68E,
-	0x75C6372B, 0x50AFD341, 0xA7C13275, 0x915A0BF5,
-	0x6B54BFAB, 0x2B0B1426, 0xAB4CC9D7, 0x449CCD82,
-	0xF7FBF265, 0xAB85C5F3, 0x1B55DB94, 0xAAD4E324,
-	0xCFA4BD3F, 0x2DEAA3E2, 0x9E204D02, 0xC8BD25AC,
-	0xEADF55B3, 0xD5BD9E98, 0xE31231B2, 0x2AD5AD6C,
-	0x954329DE, 0xADBE4528, 0xD8710F69, 0xAA51C90F,
-	0xAA786BF6, 0x22513F1E, 0xAA51A79B, 0x2AD344CC,
-	0x7B5A41F0, 0xD37CFBAD, 0x1B069505, 0x41ECE491,
-	0xB4C332E6, 0x032268D4, 0xC9600ACC, 0xCE387E6D,
-	0xBF6BB16C, 0x6A70FB78, 0x0D03D9C9, 0xD4DF39DE,
-	0xE01063DA, 0x4736F464, 0x5AD328D8, 0xB347CC96,
-	0x75BB0FC3, 0x98511BFB, 0x4FFBCC35, 0xB58BCF6A,
-	0xE11F0ABC, 0xBFC5FE4A, 0xA70AEC10, 0xAC39570A,
-	0x3F04442F, 0x6188B153, 0xE0397A2E, 0x5727CB79,
-	0x9CEB418F, 0x1CACD68D, 0x2AD37C96, 0x0175CB9D,
-	0xC69DFF09, 0xC75B65F0, 0xD9DB40D8, 0xEC0E7779,
-	0x4744EAD4, 0xB11C3274, 0xDD24CB9E, 0x7E1C54BD,
-	0xF01144F9, 0xD2240EB1, 0x9675B3FD, 0xA3AC3755,
-	0xD47C27AF, 0x51C85F4D, 0x56907596, 0xA5BB15E6,
-	0x580304F0, 0xCA042CF1, 0x011A37EA, 0x8DBFAADB,
-	0x35BA3E4A, 0x3526FFA0, 0xC37B4D09, 0xBC306ED9,
-	0x98A52666, 0x5648F725, 0xFF5E569D, 0x0CED63D0,
-	0x7C63B2CF, 0x700B45E1, 0xD5EA50F1, 0x85A92872,
-	0xAF1FBDA7, 0xD4234870, 0xA7870BF3, 0x2D3B4D79,
-	0x42E04198, 0x0CD0EDE7, 0x26470DB8, 0xF881814C,
-	0x474D6AD7, 0x7C0C5E5C, 0xD1231959, 0x381B7298,
-	0xF5D2F4DB, 0xAB838653, 0x6E2F1E23, 0x83719C9E,
-	0xBD91E046, 0x9A56456E, 0xDC39200C, 0x20C8C571,
-	0x962BDA1C, 0xE1E696FF, 0xB141AB08, 0x7CCA89B9,
-	0x1A69E783, 0x02CC4843, 0xA2F7C579, 0x429EF47D,
-	0x427B169C, 0x5AC9F049, 0xDD8F0F00, 0x5C8165BF
-};
-
-static const u_int32_t cast_sbox2[256] = {
-	0x1F201094, 0xEF0BA75B, 0x69E3CF7E, 0x393F4380,
-	0xFE61CF7A, 0xEEC5207A, 0x55889C94, 0x72FC0651,
-	0xADA7EF79, 0x4E1D7235, 0xD55A63CE, 0xDE0436BA,
-	0x99C430EF, 0x5F0C0794, 0x18DCDB7D, 0xA1D6EFF3,
-	0xA0B52F7B, 0x59E83605, 0xEE15B094, 0xE9FFD909,
-	0xDC440086, 0xEF944459, 0xBA83CCB3, 0xE0C3CDFB,
-	0xD1DA4181, 0x3B092AB1, 0xF997F1C1, 0xA5E6CF7B,
-	0x01420DDB, 0xE4E7EF5B, 0x25A1FF41, 0xE180F806,
-	0x1FC41080, 0x179BEE7A, 0xD37AC6A9, 0xFE5830A4,
-	0x98DE8B7F, 0x77E83F4E, 0x79929269, 0x24FA9F7B,
-	0xE113C85B, 0xACC40083, 0xD7503525, 0xF7EA615F,
-	0x62143154, 0x0D554B63, 0x5D681121, 0xC866C359,
-	0x3D63CF73, 0xCEE234C0, 0xD4D87E87, 0x5C672B21,
-	0x071F6181, 0x39F7627F, 0x361E3084, 0xE4EB573B,
-	0x602F64A4, 0xD63ACD9C, 0x1BBC4635, 0x9E81032D,
-	0x2701F50C, 0x99847AB4, 0xA0E3DF79, 0xBA6CF38C,
-	0x10843094, 0x2537A95E, 0xF46F6FFE, 0xA1FF3B1F,
-	0x208CFB6A, 0x8F458C74, 0xD9E0A227, 0x4EC73A34,
-	0xFC884F69, 0x3E4DE8DF, 0xEF0E0088, 0x3559648D,
-	0x8A45388C, 0x1D804366, 0x721D9BFD, 0xA58684BB,
-	0xE8256333, 0x844E8212, 0x128D8098, 0xFED33FB4,
-	0xCE280AE1, 0x27E19BA5, 0xD5A6C252, 0xE49754BD,
-	0xC5D655DD, 0xEB667064, 0x77840B4D, 0xA1B6A801,
-	0x84DB26A9, 0xE0B56714, 0x21F043B7, 0xE5D05860,
-	0x54F03084, 0x066FF472, 0xA31AA153, 0xDADC4755,
-	0xB5625DBF, 0x68561BE6, 0x83CA6B94, 0x2D6ED23B,
-	0xECCF01DB, 0xA6D3D0BA, 0xB6803D5C, 0xAF77A709,
-	0x33B4A34C, 0x397BC8D6, 0x5EE22B95, 0x5F0E5304,
-	0x81ED6F61, 0x20E74364, 0xB45E1378, 0xDE18639B,
-	0x881CA122, 0xB96726D1, 0x8049A7E8, 0x22B7DA7B,
-	0x5E552D25, 0x5272D237, 0x79D2951C, 0xC60D894C,
-	0x488CB402, 0x1BA4FE5B, 0xA4B09F6B, 0x1CA815CF,
-	0xA20C3005, 0x8871DF63, 0xB9DE2FCB, 0x0CC6C9E9,
-	0x0BEEFF53, 0xE3214517, 0xB4542835, 0x9F63293C,
-	0xEE41E729, 0x6E1D2D7C, 0x50045286, 0x1E6685F3,
-	0xF33401C6, 0x30A22C95, 0x31A70850, 0x60930F13,
-	0x73F98417, 0xA1269859, 0xEC645C44, 0x52C877A9,
-	0xCDFF33A6, 0xA02B1741, 0x7CBAD9A2, 0x2180036F,
-	0x50D99C08, 0xCB3F4861, 0xC26BD765, 0x64A3F6AB,
-	0x80342676, 0x25A75E7B, 0xE4E6D1FC, 0x20C710E6,
-	0xCDF0B680, 0x17844D3B, 0x31EEF84D, 0x7E0824E4,
-	0x2CCB49EB, 0x846A3BAE, 0x8FF77888, 0xEE5D60F6,
-	0x7AF75673, 0x2FDD5CDB, 0xA11631C1, 0x30F66F43,
-	0xB3FAEC54, 0x157FD7FA, 0xEF8579CC, 0xD152DE58,
-	0xDB2FFD5E, 0x8F32CE19, 0x306AF97A, 0x02F03EF8,
-	0x99319AD5, 0xC242FA0F, 0xA7E3EBB0, 0xC68E4906,
-	0xB8DA230C, 0x80823028, 0xDCDEF3C8, 0xD35FB171,
-	0x088A1BC8, 0xBEC0C560, 0x61A3C9E8, 0xBCA8F54D,
-	0xC72FEFFA, 0x22822E99, 0x82C570B4, 0xD8D94E89,
-	0x8B1C34BC, 0x301E16E6, 0x273BE979, 0xB0FFEAA6,
-	0x61D9B8C6, 0x00B24869, 0xB7FFCE3F, 0x08DC283B,
-	0x43DAF65A, 0xF7E19798, 0x7619B72F, 0x8F1C9BA4,
-	0xDC8637A0, 0x16A7D3B1, 0x9FC393B7, 0xA7136EEB,
-	0xC6BCC63E, 0x1A513742, 0xEF6828BC, 0x520365D6,
-	0x2D6A77AB, 0x3527ED4B, 0x821FD216, 0x095C6E2E,
-	0xDB92F2FB, 0x5EEA29CB, 0x145892F5, 0x91584F7F,
-	0x5483697B, 0x2667A8CC, 0x85196048, 0x8C4BACEA,
-	0x833860D4, 0x0D23E0F9, 0x6C387E8A, 0x0AE6D249,
-	0xB284600C, 0xD835731D, 0xDCB1C647, 0xAC4C56EA,
-	0x3EBD81B3, 0x230EABB0, 0x6438BC87, 0xF0B5B1FA,
-	0x8F5EA2B3, 0xFC184642, 0x0A036B7A, 0x4FB089BD,
-	0x649DA589, 0xA345415E, 0x5C038323, 0x3E5D3BB9,
-	0x43D79572, 0x7E6DD07C, 0x06DFDF1E, 0x6C6CC4EF,
-	0x7160A539, 0x73BFBE70, 0x83877605, 0x4523ECF1
-};
-
-static const u_int32_t cast_sbox3[256] = {
-	0x8DEFC240, 0x25FA5D9F, 0xEB903DBF, 0xE810C907,
-	0x47607FFF, 0x369FE44B, 0x8C1FC644, 0xAECECA90,
-	0xBEB1F9BF, 0xEEFBCAEA, 0xE8CF1950, 0x51DF07AE,
-	0x920E8806, 0xF0AD0548, 0xE13C8D83, 0x927010D5,
-	0x11107D9F, 0x07647DB9, 0xB2E3E4D4, 0x3D4F285E,
-	0xB9AFA820, 0xFADE82E0, 0xA067268B, 0x8272792E,
-	0x553FB2C0, 0x489AE22B, 0xD4EF9794, 0x125E3FBC,
-	0x21FFFCEE, 0x825B1BFD, 0x9255C5ED, 0x1257A240,
-	0x4E1A8302, 0xBAE07FFF, 0x528246E7, 0x8E57140E,
-	0x3373F7BF, 0x8C9F8188, 0xA6FC4EE8, 0xC982B5A5,
-	0xA8C01DB7, 0x579FC264, 0x67094F31, 0xF2BD3F5F,
-	0x40FFF7C1, 0x1FB78DFC, 0x8E6BD2C1, 0x437BE59B,
-	0x99B03DBF, 0xB5DBC64B, 0x638DC0E6, 0x55819D99,
-	0xA197C81C, 0x4A012D6E, 0xC5884A28, 0xCCC36F71,
-	0xB843C213, 0x6C0743F1, 0x8309893C, 0x0FEDDD5F,
-	0x2F7FE850, 0xD7C07F7E, 0x02507FBF, 0x5AFB9A04,
-	0xA747D2D0, 0x1651192E, 0xAF70BF3E, 0x58C31380,
-	0x5F98302E, 0x727CC3C4, 0x0A0FB402, 0x0F7FEF82,
-	0x8C96FDAD, 0x5D2C2AAE, 0x8EE99A49, 0x50DA88B8,
-	0x8427F4A0, 0x1EAC5790, 0x796FB449, 0x8252DC15,
-	0xEFBD7D9B, 0xA672597D, 0xADA840D8, 0x45F54504,
-	0xFA5D7403, 0xE83EC305, 0x4F91751A, 0x925669C2,
-	0x23EFE941, 0xA903F12E, 0x60270DF2, 0x0276E4B6,
-	0x94FD6574, 0x927985B2, 0x8276DBCB, 0x02778176,
-	0xF8AF918D, 0x4E48F79E, 0x8F616DDF, 0xE29D840E,
-	0x842F7D83, 0x340CE5C8, 0x96BBB682, 0x93B4B148,
-	0xEF303CAB, 0x984FAF28, 0x779FAF9B, 0x92DC560D,
-	0x224D1E20, 0x8437AA88, 0x7D29DC96, 0x2756D3DC,
-	0x8B907CEE, 0xB51FD240, 0xE7C07CE3, 0xE566B4A1,
-	0xC3E9615E, 0x3CF8209D, 0x6094D1E3, 0xCD9CA341,
-	0x5C76460E, 0x00EA983B, 0xD4D67881, 0xFD47572C,
-	0xF76CEDD9, 0xBDA8229C, 0x127DADAA, 0x438A074E,
-	0x1F97C090, 0x081BDB8A, 0x93A07EBE, 0xB938CA15,
-	0x97B03CFF, 0x3DC2C0F8, 0x8D1AB2EC, 0x64380E51,
-	0x68CC7BFB, 0xD90F2788, 0x12490181, 0x5DE5FFD4,
-	0xDD7EF86A, 0x76A2E214, 0xB9A40368, 0x925D958F,
-	0x4B39FFFA, 0xBA39AEE9, 0xA4FFD30B, 0xFAF7933B,
-	0x6D498623, 0x193CBCFA, 0x27627545, 0x825CF47A,
-	0x61BD8BA0, 0xD11E42D1, 0xCEAD04F4, 0x127EA392,
-	0x10428DB7, 0x8272A972, 0x9270C4A8, 0x127DE50B,
-	0x285BA1C8, 0x3C62F44F, 0x35C0EAA5, 0xE805D231,
-	0x428929FB, 0xB4FCDF82, 0x4FB66A53, 0x0E7DC15B,
-	0x1F081FAB, 0x108618AE, 0xFCFD086D, 0xF9FF2889,
-	0x694BCC11, 0x236A5CAE, 0x12DECA4D, 0x2C3F8CC5,
-	0xD2D02DFE, 0xF8EF5896, 0xE4CF52DA, 0x95155B67,
-	0x494A488C, 0xB9B6A80C, 0x5C8F82BC, 0x89D36B45,
-	0x3A609437, 0xEC00C9A9, 0x44715253, 0x0A874B49,
-	0xD773BC40, 0x7C34671C, 0x02717EF6, 0x4FEB5536,
-	0xA2D02FFF, 0xD2BF60C4, 0xD43F03C0, 0x50B4EF6D,
-	0x07478CD1, 0x006E1888, 0xA2E53F55, 0xB9E6D4BC,
-	0xA2048016, 0x97573833, 0xD7207D67, 0xDE0F8F3D,
-	0x72F87B33, 0xABCC4F33, 0x7688C55D, 0x7B00A6B0,
-	0x947B0001, 0x570075D2, 0xF9BB88F8, 0x8942019E,
-	0x4264A5FF, 0x856302E0, 0x72DBD92B, 0xEE971B69,
-	0x6EA22FDE, 0x5F08AE2B, 0xAF7A616D, 0xE5C98767,
-	0xCF1FEBD2, 0x61EFC8C2, 0xF1AC2571, 0xCC8239C2,
-	0x67214CB8, 0xB1E583D1, 0xB7DC3E62, 0x7F10BDCE,
-	0xF90A5C38, 0x0FF0443D, 0x606E6DC6, 0x60543A49,
-	0x5727C148, 0x2BE98A1D, 0x8AB41738, 0x20E1BE24,
-	0xAF96DA0F, 0x68458425, 0x99833BE5, 0x600D457D,
-	0x282F9350, 0x8334B362, 0xD91D1120, 0x2B6D8DA0,
-	0x642B1E31, 0x9C305A00, 0x52BCE688, 0x1B03588A,
-	0xF7BAEFD5, 0x4142ED9C, 0xA4315C11, 0x83323EC5,
-	0xDFEF4636, 0xA133C501, 0xE9D3531C, 0xEE353783
-};
-
-static const u_int32_t cast_sbox4[256] = {
-	0x9DB30420, 0x1FB6E9DE, 0xA7BE7BEF, 0xD273A298,
-	0x4A4F7BDB, 0x64AD8C57, 0x85510443, 0xFA020ED1,
-	0x7E287AFF, 0xE60FB663, 0x095F35A1, 0x79EBF120,
-	0xFD059D43, 0x6497B7B1, 0xF3641F63, 0x241E4ADF,
-	0x28147F5F, 0x4FA2B8CD, 0xC9430040, 0x0CC32220,
-	0xFDD30B30, 0xC0A5374F, 0x1D2D00D9, 0x24147B15,
-	0xEE4D111A, 0x0FCA5167, 0x71FF904C, 0x2D195FFE,
-	0x1A05645F, 0x0C13FEFE, 0x081B08CA, 0x05170121,
-	0x80530100, 0xE83E5EFE, 0xAC9AF4F8, 0x7FE72701,
-	0xD2B8EE5F, 0x06DF4261, 0xBB9E9B8A, 0x7293EA25,
-	0xCE84FFDF, 0xF5718801, 0x3DD64B04, 0xA26F263B,
-	0x7ED48400, 0x547EEBE6, 0x446D4CA0, 0x6CF3D6F5,
-	0x2649ABDF, 0xAEA0C7F5, 0x36338CC1, 0x503F7E93,
-	0xD3772061, 0x11B638E1, 0x72500E03, 0xF80EB2BB,
-	0xABE0502E, 0xEC8D77DE, 0x57971E81, 0xE14F6746,
-	0xC9335400, 0x6920318F, 0x081DBB99, 0xFFC304A5,
-	0x4D351805, 0x7F3D5CE3, 0xA6C866C6, 0x5D5BCCA9,
-	0xDAEC6FEA, 0x9F926F91, 0x9F46222F, 0x3991467D,
-	0xA5BF6D8E, 0x1143C44F, 0x43958302, 0xD0214EEB,
-	0x022083B8, 0x3FB6180C, 0x18F8931E, 0x281658E6,
-	0x26486E3E, 0x8BD78A70, 0x7477E4C1, 0xB506E07C,
-	0xF32D0A25, 0x79098B02, 0xE4EABB81, 0x28123B23,
-	0x69DEAD38, 0x1574CA16, 0xDF871B62, 0x211C40B7,
-	0xA51A9EF9, 0x0014377B, 0x041E8AC8, 0x09114003,
-	0xBD59E4D2, 0xE3D156D5, 0x4FE876D5, 0x2F91A340,
-	0x557BE8DE, 0x00EAE4A7, 0x0CE5C2EC, 0x4DB4BBA6,
-	0xE756BDFF, 0xDD3369AC, 0xEC17B035, 0x06572327,
-	0x99AFC8B0, 0x56C8C391, 0x6B65811C, 0x5E146119,
-	0x6E85CB75, 0xBE07C002, 0xC2325577, 0x893FF4EC,
-	0x5BBFC92D, 0xD0EC3B25, 0xB7801AB7, 0x8D6D3B24,
-	0x20C763EF, 0xC366A5FC, 0x9C382880, 0x0ACE3205,
-	0xAAC9548A, 0xECA1D7C7, 0x041AFA32, 0x1D16625A,
-	0x6701902C, 0x9B757A54, 0x31D477F7, 0x9126B031,
-	0x36CC6FDB, 0xC70B8B46, 0xD9E66A48, 0x56E55A79,
-	0x026A4CEB, 0x52437EFF, 0x2F8F76B4, 0x0DF980A5,
-	0x8674CDE3, 0xEDDA04EB, 0x17A9BE04, 0x2C18F4DF,
-	0xB7747F9D, 0xAB2AF7B4, 0xEFC34D20, 0x2E096B7C,
-	0x1741A254, 0xE5B6A035, 0x213D42F6, 0x2C1C7C26,
-	0x61C2F50F, 0x6552DAF9, 0xD2C231F8, 0x25130F69,
-	0xD8167FA2, 0x0418F2C8, 0x001A96A6, 0x0D1526AB,
-	0x63315C21, 0x5E0A72EC, 0x49BAFEFD, 0x187908D9,
-	0x8D0DBD86, 0x311170A7, 0x3E9B640C, 0xCC3E10D7,
-	0xD5CAD3B6, 0x0CAEC388, 0xF73001E1, 0x6C728AFF,
-	0x71EAE2A1, 0x1F9AF36E, 0xCFCBD12F, 0xC1DE8417,
-	0xAC07BE6B, 0xCB44A1D8, 0x8B9B0F56, 0x013988C3,
-	0xB1C52FCA, 0xB4BE31CD, 0xD8782806, 0x12A3A4E2,
-	0x6F7DE532, 0x58FD7EB6, 0xD01EE900, 0x24ADFFC2,
-	0xF4990FC5, 0x9711AAC5, 0x001D7B95, 0x82E5E7D2,
-	0x109873F6, 0x00613096, 0xC32D9521, 0xADA121FF,
-	0x29908415, 0x7FBB977F, 0xAF9EB3DB, 0x29C9ED2A,
-	0x5CE2A465, 0xA730F32C, 0xD0AA3FE8, 0x8A5CC091,
-	0xD49E2CE7, 0x0CE454A9, 0xD60ACD86, 0x015F1919,
-	0x77079103, 0xDEA03AF6, 0x78A8565E, 0xDEE356DF,
-	0x21F05CBE, 0x8B75E387, 0xB3C50651, 0xB8A5C3EF,
-	0xD8EEB6D2, 0xE523BE77, 0xC2154529, 0x2F69EFDF,
-	0xAFE67AFB, 0xF470C4B2, 0xF3E0EB5B, 0xD6CC9876,
-	0x39E4460C, 0x1FDA8538, 0x1987832F, 0xCA007367,
-	0xA99144F8, 0x296B299E, 0x492FC295, 0x9266BEAB,
-	0xB5676E69, 0x9BD3DDDA, 0xDF7E052F, 0xDB25701C,
-	0x1B5E51EE, 0xF65324E6, 0x6AFCE36C, 0x0316CC04,
-	0x8644213E, 0xB7DC59D0, 0x7965291F, 0xCCD6FD43,
-	0x41823979, 0x932BCDF6, 0xB657C34D, 0x4EDFD282,
-	0x7AE5290C, 0x3CB9536B, 0x851E20FE, 0x9833557E,
-	0x13ECF0B0, 0xD3FFB372, 0x3F85C5C1, 0x0AEF7ED2
-};
-
-static const u_int32_t cast_sbox5[256] = {
-	0x7EC90C04, 0x2C6E74B9, 0x9B0E66DF, 0xA6337911,
-	0xB86A7FFF, 0x1DD358F5, 0x44DD9D44, 0x1731167F,
-	0x08FBF1FA, 0xE7F511CC, 0xD2051B00, 0x735ABA00,
-	0x2AB722D8, 0x386381CB, 0xACF6243A, 0x69BEFD7A,
-	0xE6A2E77F, 0xF0C720CD, 0xC4494816, 0xCCF5C180,
-	0x38851640, 0x15B0A848, 0xE68B18CB, 0x4CAADEFF,
-	0x5F480A01, 0x0412B2AA, 0x259814FC, 0x41D0EFE2,
-	0x4E40B48D, 0x248EB6FB, 0x8DBA1CFE, 0x41A99B02,
-	0x1A550A04, 0xBA8F65CB, 0x7251F4E7, 0x95A51725,
-	0xC106ECD7, 0x97A5980A, 0xC539B9AA, 0x4D79FE6A,
-	0xF2F3F763, 0x68AF8040, 0xED0C9E56, 0x11B4958B,
-	0xE1EB5A88, 0x8709E6B0, 0xD7E07156, 0x4E29FEA7,
-	0x6366E52D, 0x02D1C000, 0xC4AC8E05, 0x9377F571,
-	0x0C05372A, 0x578535F2, 0x2261BE02, 0xD642A0C9,
-	0xDF13A280, 0x74B55BD2, 0x682199C0, 0xD421E5EC,
-	0x53FB3CE8, 0xC8ADEDB3, 0x28A87FC9, 0x3D959981,
-	0x5C1FF900, 0xFE38D399, 0x0C4EFF0B, 0x062407EA,
-	0xAA2F4FB1, 0x4FB96976, 0x90C79505, 0xB0A8A774,
-	0xEF55A1FF, 0xE59CA2C2, 0xA6B62D27, 0xE66A4263,
-	0xDF65001F, 0x0EC50966, 0xDFDD55BC, 0x29DE0655,
-	0x911E739A, 0x17AF8975, 0x32C7911C, 0x89F89468,
-	0x0D01E980, 0x524755F4, 0x03B63CC9, 0x0CC844B2,
-	0xBCF3F0AA, 0x87AC36E9, 0xE53A7426, 0x01B3D82B,
-	0x1A9E7449, 0x64EE2D7E, 0xCDDBB1DA, 0x01C94910,
-	0xB868BF80, 0x0D26F3FD, 0x9342EDE7, 0x04A5C284,
-	0x636737B6, 0x50F5B616, 0xF24766E3, 0x8ECA36C1,
-	0x136E05DB, 0xFEF18391, 0xFB887A37, 0xD6E7F7D4,
-	0xC7FB7DC9, 0x3063FCDF, 0xB6F589DE, 0xEC2941DA,
-	0x26E46695, 0xB7566419, 0xF654EFC5, 0xD08D58B7,
-	0x48925401, 0xC1BACB7F, 0xE5FF550F, 0xB6083049,
-	0x5BB5D0E8, 0x87D72E5A, 0xAB6A6EE1, 0x223A66CE,
-	0xC62BF3CD, 0x9E0885F9, 0x68CB3E47, 0x086C010F,
-	0xA21DE820, 0xD18B69DE, 0xF3F65777, 0xFA02C3F6,
-	0x407EDAC3, 0xCBB3D550, 0x1793084D, 0xB0D70EBA,
-	0x0AB378D5, 0xD951FB0C, 0xDED7DA56, 0x4124BBE4,
-	0x94CA0B56, 0x0F5755D1, 0xE0E1E56E, 0x6184B5BE,
-	0x580A249F, 0x94F74BC0, 0xE327888E, 0x9F7B5561,
-	0xC3DC0280, 0x05687715, 0x646C6BD7, 0x44904DB3,
-	0x66B4F0A3, 0xC0F1648A, 0x697ED5AF, 0x49E92FF6,
-	0x309E374F, 0x2CB6356A, 0x85808573, 0x4991F840,
-	0x76F0AE02, 0x083BE84D, 0x28421C9A, 0x44489406,
-	0x736E4CB8, 0xC1092910, 0x8BC95FC6, 0x7D869CF4,
-	0x134F616F, 0x2E77118D, 0xB31B2BE1, 0xAA90B472,
-	0x3CA5D717, 0x7D161BBA, 0x9CAD9010, 0xAF462BA2,
-	0x9FE459D2, 0x45D34559, 0xD9F2DA13, 0xDBC65487,
-	0xF3E4F94E, 0x176D486F, 0x097C13EA, 0x631DA5C7,
-	0x445F7382, 0x175683F4, 0xCDC66A97, 0x70BE0288,
-	0xB3CDCF72, 0x6E5DD2F3, 0x20936079, 0x459B80A5,
-	0xBE60E2DB, 0xA9C23101, 0xEBA5315C, 0x224E42F2,
-	0x1C5C1572, 0xF6721B2C, 0x1AD2FFF3, 0x8C25404E,
-	0x324ED72F, 0x4067B7FD, 0x0523138E, 0x5CA3BC78,
-	0xDC0FD66E, 0x75922283, 0x784D6B17, 0x58EBB16E,
-	0x44094F85, 0x3F481D87, 0xFCFEAE7B, 0x77B5FF76,
-	0x8C2302BF, 0xAAF47556, 0x5F46B02A, 0x2B092801,
-	0x3D38F5F7, 0x0CA81F36, 0x52AF4A8A, 0x66D5E7C0,
-	0xDF3B0874, 0x95055110, 0x1B5AD7A8, 0xF61ED5AD,
-	0x6CF6E479, 0x20758184, 0xD0CEFA65, 0x88F7BE58,
-	0x4A046826, 0x0FF6F8F3, 0xA09C7F70, 0x5346ABA0,
-	0x5CE96C28, 0xE176EDA3, 0x6BAC307F, 0x376829D2,
-	0x85360FA9, 0x17E3FE2A, 0x24B79767, 0xF5A96B20,
-	0xD6CD2595, 0x68FF1EBF, 0x7555442C, 0xF19F06BE,
-	0xF9E0659A, 0xEEB9491D, 0x34010718, 0xBB30CAB8,
-	0xE822FE15, 0x88570983, 0x750E6249, 0xDA627E55,
-	0x5E76FFA8, 0xB1534546, 0x6D47DE08, 0xEFE9E7D4
-};
-
-static const u_int32_t cast_sbox6[256] = {
-	0xF6FA8F9D, 0x2CAC6CE1, 0x4CA34867, 0xE2337F7C,
-	0x95DB08E7, 0x016843B4, 0xECED5CBC, 0x325553AC,
-	0xBF9F0960, 0xDFA1E2ED, 0x83F0579D, 0x63ED86B9,
-	0x1AB6A6B8, 0xDE5EBE39, 0xF38FF732, 0x8989B138,
-	0x33F14961, 0xC01937BD, 0xF506C6DA, 0xE4625E7E,
-	0xA308EA99, 0x4E23E33C, 0x79CBD7CC, 0x48A14367,
-	0xA3149619, 0xFEC94BD5, 0xA114174A, 0xEAA01866,
-	0xA084DB2D, 0x09A8486F, 0xA888614A, 0x2900AF98,
-	0x01665991, 0xE1992863, 0xC8F30C60, 0x2E78EF3C,
-	0xD0D51932, 0xCF0FEC14, 0xF7CA07D2, 0xD0A82072,
-	0xFD41197E, 0x9305A6B0, 0xE86BE3DA, 0x74BED3CD,
-	0x372DA53C, 0x4C7F4448, 0xDAB5D440, 0x6DBA0EC3,
-	0x083919A7, 0x9FBAEED9, 0x49DBCFB0, 0x4E670C53,
-	0x5C3D9C01, 0x64BDB941, 0x2C0E636A, 0xBA7DD9CD,
-	0xEA6F7388, 0xE70BC762, 0x35F29ADB, 0x5C4CDD8D,
-	0xF0D48D8C, 0xB88153E2, 0x08A19866, 0x1AE2EAC8,
-	0x284CAF89, 0xAA928223, 0x9334BE53, 0x3B3A21BF,
-	0x16434BE3, 0x9AEA3906, 0xEFE8C36E, 0xF890CDD9,
-	0x80226DAE, 0xC340A4A3, 0xDF7E9C09, 0xA694A807,
-	0x5B7C5ECC, 0x221DB3A6, 0x9A69A02F, 0x68818A54,
-	0xCEB2296F, 0x53C0843A, 0xFE893655, 0x25BFE68A,
-	0xB4628ABC, 0xCF222EBF, 0x25AC6F48, 0xA9A99387,
-	0x53BDDB65, 0xE76FFBE7, 0xE967FD78, 0x0BA93563,
-	0x8E342BC1, 0xE8A11BE9, 0x4980740D, 0xC8087DFC,
-	0x8DE4BF99, 0xA11101A0, 0x7FD37975, 0xDA5A26C0,
-	0xE81F994F, 0x9528CD89, 0xFD339FED, 0xB87834BF,
-	0x5F04456D, 0x22258698, 0xC9C4C83B, 0x2DC156BE,
-	0x4F628DAA, 0x57F55EC5, 0xE2220ABE, 0xD2916EBF,
-	0x4EC75B95, 0x24F2C3C0, 0x42D15D99, 0xCD0D7FA0,
-	0x7B6E27FF, 0xA8DC8AF0, 0x7345C106, 0xF41E232F,
-	0x35162386, 0xE6EA8926, 0x3333B094, 0x157EC6F2,
-	0x372B74AF, 0x692573E4, 0xE9A9D848, 0xF3160289,
-	0x3A62EF1D, 0xA787E238, 0xF3A5F676, 0x74364853,
-	0x20951063, 0x4576698D, 0xB6FAD407, 0x592AF950,
-	0x36F73523, 0x4CFB6E87, 0x7DA4CEC0, 0x6C152DAA,
-	0xCB0396A8, 0xC50DFE5D, 0xFCD707AB, 0x0921C42F,
-	0x89DFF0BB, 0x5FE2BE78, 0x448F4F33, 0x754613C9,
-	0x2B05D08D, 0x48B9D585, 0xDC049441, 0xC8098F9B,
-	0x7DEDE786, 0xC39A3373, 0x42410005, 0x6A091751,
-	0x0EF3C8A6, 0x890072D6, 0x28207682, 0xA9A9F7BE,
-	0xBF32679D, 0xD45B5B75, 0xB353FD00, 0xCBB0E358,
-	0x830F220A, 0x1F8FB214, 0xD372CF08, 0xCC3C4A13,
-	0x8CF63166, 0x061C87BE, 0x88C98F88, 0x6062E397,
-	0x47CF8E7A, 0xB6C85283, 0x3CC2ACFB, 0x3FC06976,
-	0x4E8F0252, 0x64D8314D, 0xDA3870E3, 0x1E665459,
-	0xC10908F0, 0x513021A5, 0x6C5B68B7, 0x822F8AA0,
-	0x3007CD3E, 0x74719EEF, 0xDC872681, 0x073340D4,
-	0x7E432FD9, 0x0C5EC241, 0x8809286C, 0xF592D891,
-	0x08A930F6, 0x957EF305, 0xB7FBFFBD, 0xC266E96F,
-	0x6FE4AC98, 0xB173ECC0, 0xBC60B42A, 0x953498DA,
-	0xFBA1AE12, 0x2D4BD736, 0x0F25FAAB, 0xA4F3FCEB,
-	0xE2969123, 0x257F0C3D, 0x9348AF49, 0x361400BC,
-	0xE8816F4A, 0x3814F200, 0xA3F94043, 0x9C7A54C2,
-	0xBC704F57, 0xDA41E7F9, 0xC25AD33A, 0x54F4A084,
-	0xB17F5505, 0x59357CBE, 0xEDBD15C8, 0x7F97C5AB,
-	0xBA5AC7B5, 0xB6F6DEAF, 0x3A479C3A, 0x5302DA25,
-	0x653D7E6A, 0x54268D49, 0x51A477EA, 0x5017D55B,
-	0xD7D25D88, 0x44136C76, 0x0404A8C8, 0xB8E5A121,
-	0xB81A928A, 0x60ED5869, 0x97C55B96, 0xEAEC991B,
-	0x29935913, 0x01FDB7F1, 0x088E8DFA, 0x9AB6F6F5,
-	0x3B4CBF9F, 0x4A5DE3AB, 0xE6051D35, 0xA0E1D855,
-	0xD36B4CF1, 0xF544EDEB, 0xB0E93524, 0xBEBB8FBD,
-	0xA2D762CF, 0x49C92F54, 0x38B5F331, 0x7128A454,
-	0x48392905, 0xA65B1DB8, 0x851C97BD, 0xD675CF2F
-};
-
-static const u_int32_t cast_sbox7[256] = {
-	0x85E04019, 0x332BF567, 0x662DBFFF, 0xCFC65693,
-	0x2A8D7F6F, 0xAB9BC912, 0xDE6008A1, 0x2028DA1F,
-	0x0227BCE7, 0x4D642916, 0x18FAC300, 0x50F18B82,
-	0x2CB2CB11, 0xB232E75C, 0x4B3695F2, 0xB28707DE,
-	0xA05FBCF6, 0xCD4181E9, 0xE150210C, 0xE24EF1BD,
-	0xB168C381, 0xFDE4E789, 0x5C79B0D8, 0x1E8BFD43,
-	0x4D495001, 0x38BE4341, 0x913CEE1D, 0x92A79C3F,
-	0x089766BE, 0xBAEEADF4, 0x1286BECF, 0xB6EACB19,
-	0x2660C200, 0x7565BDE4, 0x64241F7A, 0x8248DCA9,
-	0xC3B3AD66, 0x28136086, 0x0BD8DFA8, 0x356D1CF2,
-	0x107789BE, 0xB3B2E9CE, 0x0502AA8F, 0x0BC0351E,
-	0x166BF52A, 0xEB12FF82, 0xE3486911, 0xD34D7516,
-	0x4E7B3AFF, 0x5F43671B, 0x9CF6E037, 0x4981AC83,
-	0x334266CE, 0x8C9341B7, 0xD0D854C0, 0xCB3A6C88,
-	0x47BC2829, 0x4725BA37, 0xA66AD22B, 0x7AD61F1E,
-	0x0C5CBAFA, 0x4437F107, 0xB6E79962, 0x42D2D816,
-	0x0A961288, 0xE1A5C06E, 0x13749E67, 0x72FC081A,
-	0xB1D139F7, 0xF9583745, 0xCF19DF58, 0xBEC3F756,
-	0xC06EBA30, 0x07211B24, 0x45C28829, 0xC95E317F,
-	0xBC8EC511, 0x38BC46E9, 0xC6E6FA14, 0xBAE8584A,
-	0xAD4EBC46, 0x468F508B, 0x7829435F, 0xF124183B,
-	0x821DBA9F, 0xAFF60FF4, 0xEA2C4E6D, 0x16E39264,
-	0x92544A8B, 0x009B4FC3, 0xABA68CED, 0x9AC96F78,
-	0x06A5B79A, 0xB2856E6E, 0x1AEC3CA9, 0xBE838688,
-	0x0E0804E9, 0x55F1BE56, 0xE7E5363B, 0xB3A1F25D,
-	0xF7DEBB85, 0x61FE033C, 0x16746233, 0x3C034C28,
-	0xDA6D0C74, 0x79AAC56C, 0x3CE4E1AD, 0x51F0C802,
-	0x98F8F35A, 0x1626A49F, 0xEED82B29, 0x1D382FE3,
-	0x0C4FB99A, 0xBB325778, 0x3EC6D97B, 0x6E77A6A9,
-	0xCB658B5C, 0xD45230C7, 0x2BD1408B, 0x60C03EB7,
-	0xB9068D78, 0xA33754F4, 0xF430C87D, 0xC8A71302,
-	0xB96D8C32, 0xEBD4E7BE, 0xBE8B9D2D, 0x7979FB06,
-	0xE7225308, 0x8B75CF77, 0x11EF8DA4, 0xE083C858,
-	0x8D6B786F, 0x5A6317A6, 0xFA5CF7A0, 0x5DDA0033,
-	0xF28EBFB0, 0xF5B9C310, 0xA0EAC280, 0x08B9767A,
-	0xA3D9D2B0, 0x79D34217, 0x021A718D, 0x9AC6336A,
-	0x2711FD60, 0x438050E3, 0x069908A8, 0x3D7FEDC4,
-	0x826D2BEF, 0x4EEB8476, 0x488DCF25, 0x36C9D566,
-	0x28E74E41, 0xC2610ACA, 0x3D49A9CF, 0xBAE3B9DF,
-	0xB65F8DE6, 0x92AEAF64, 0x3AC7D5E6, 0x9EA80509,
-	0xF22B017D, 0xA4173F70, 0xDD1E16C3, 0x15E0D7F9,
-	0x50B1B887, 0x2B9F4FD5, 0x625ABA82, 0x6A017962,
-	0x2EC01B9C, 0x15488AA9, 0xD716E740, 0x40055A2C,
-	0x93D29A22, 0xE32DBF9A, 0x058745B9, 0x3453DC1E,
-	0xD699296E, 0x496CFF6F, 0x1C9F4986, 0xDFE2ED07,
-	0xB87242D1, 0x19DE7EAE, 0x053E561A, 0x15AD6F8C,
-	0x66626C1C, 0x7154C24C, 0xEA082B2A, 0x93EB2939,
-	0x17DCB0F0, 0x58D4F2AE, 0x9EA294FB, 0x52CF564C,
-	0x9883FE66, 0x2EC40581, 0x763953C3, 0x01D6692E,
-	0xD3A0C108, 0xA1E7160E, 0xE4F2DFA6, 0x693ED285,
-	0x74904698, 0x4C2B0EDD, 0x4F757656, 0x5D393378,
-	0xA132234F, 0x3D321C5D, 0xC3F5E194, 0x4B269301,
-	0xC79F022F, 0x3C997E7E, 0x5E4F9504, 0x3FFAFBBD,
-	0x76F7AD0E, 0x296693F4, 0x3D1FCE6F, 0xC61E45BE,
-	0xD3B5AB34, 0xF72BF9B7, 0x1B0434C0, 0x4E72B567,
-	0x5592A33D, 0xB5229301, 0xCFD2A87F, 0x60AEB767,
-	0x1814386B, 0x30BCC33D, 0x38A0C07D, 0xFD1606F2,
-	0xC363519B, 0x589DD390, 0x5479F8E6, 0x1CB8D647,
-	0x97FD61A9, 0xEA7759F4, 0x2D57539D, 0x569A58CF,
-	0xE84E63AD, 0x462E1B78, 0x6580F87E, 0xF3817914,
-	0x91DA55F4, 0x40A230F3, 0xD1988F35, 0xB6E318D2,
-	0x3FFA50BC, 0x3D40F021, 0xC3C0BDAE, 0x4958C24C,
-	0x518F36B2, 0x84B1D370, 0x0FEDCE83, 0x878DDADA,
-	0xF2A279C7, 0x94E01BE8, 0x90716F4B, 0x954B8AA3
-};
-
-static const u_int32_t cast_sbox8[256] = {
-	0xE216300D, 0xBBDDFFFC, 0xA7EBDABD, 0x35648095,
-	0x7789F8B7, 0xE6C1121B, 0x0E241600, 0x052CE8B5,
-	0x11A9CFB0, 0xE5952F11, 0xECE7990A, 0x9386D174,
-	0x2A42931C, 0x76E38111, 0xB12DEF3A, 0x37DDDDFC,
-	0xDE9ADEB1, 0x0A0CC32C, 0xBE197029, 0x84A00940,
-	0xBB243A0F, 0xB4D137CF, 0xB44E79F0, 0x049EEDFD,
-	0x0B15A15D, 0x480D3168, 0x8BBBDE5A, 0x669DED42,
-	0xC7ECE831, 0x3F8F95E7, 0x72DF191B, 0x7580330D,
-	0x94074251, 0x5C7DCDFA, 0xABBE6D63, 0xAA402164,
-	0xB301D40A, 0x02E7D1CA, 0x53571DAE, 0x7A3182A2,
-	0x12A8DDEC, 0xFDAA335D, 0x176F43E8, 0x71FB46D4,
-	0x38129022, 0xCE949AD4, 0xB84769AD, 0x965BD862,
-	0x82F3D055, 0x66FB9767, 0x15B80B4E, 0x1D5B47A0,
-	0x4CFDE06F, 0xC28EC4B8, 0x57E8726E, 0x647A78FC,
-	0x99865D44, 0x608BD593, 0x6C200E03, 0x39DC5FF6,
-	0x5D0B00A3, 0xAE63AFF2, 0x7E8BD632, 0x70108C0C,
-	0xBBD35049, 0x2998DF04, 0x980CF42A, 0x9B6DF491,
-	0x9E7EDD53, 0x06918548, 0x58CB7E07, 0x3B74EF2E,
-	0x522FFFB1, 0xD24708CC, 0x1C7E27CD, 0xA4EB215B,
-	0x3CF1D2E2, 0x19B47A38, 0x424F7618, 0x35856039,
-	0x9D17DEE7, 0x27EB35E6, 0xC9AFF67B, 0x36BAF5B8,
-	0x09C467CD, 0xC18910B1, 0xE11DBF7B, 0x06CD1AF8,
-	0x7170C608, 0x2D5E3354, 0xD4DE495A, 0x64C6D006,
-	0xBCC0C62C, 0x3DD00DB3, 0x708F8F34, 0x77D51B42,
-	0x264F620F, 0x24B8D2BF, 0x15C1B79E, 0x46A52564,
-	0xF8D7E54E, 0x3E378160, 0x7895CDA5, 0x859C15A5,
-	0xE6459788, 0xC37BC75F, 0xDB07BA0C, 0x0676A3AB,
-	0x7F229B1E, 0x31842E7B, 0x24259FD7, 0xF8BEF472,
-	0x835FFCB8, 0x6DF4C1F2, 0x96F5B195, 0xFD0AF0FC,
-	0xB0FE134C, 0xE2506D3D, 0x4F9B12EA, 0xF215F225,
-	0xA223736F, 0x9FB4C428, 0x25D04979, 0x34C713F8,
-	0xC4618187, 0xEA7A6E98, 0x7CD16EFC, 0x1436876C,
-	0xF1544107, 0xBEDEEE14, 0x56E9AF27, 0xA04AA441,
-	0x3CF7C899, 0x92ECBAE6, 0xDD67016D, 0x151682EB,
-	0xA842EEDF, 0xFDBA60B4, 0xF1907B75, 0x20E3030F,
-	0x24D8C29E, 0xE139673B, 0xEFA63FB8, 0x71873054,
-	0xB6F2CF3B, 0x9F326442, 0xCB15A4CC, 0xB01A4504,
-	0xF1E47D8D, 0x844A1BE5, 0xBAE7DFDC, 0x42CBDA70,
-	0xCD7DAE0A, 0x57E85B7A, 0xD53F5AF6, 0x20CF4D8C,
-	0xCEA4D428, 0x79D130A4, 0x3486EBFB, 0x33D3CDDC,
-	0x77853B53, 0x37EFFCB5, 0xC5068778, 0xE580B3E6,
-	0x4E68B8F4, 0xC5C8B37E, 0x0D809EA2, 0x398FEB7C,
-	0x132A4F94, 0x43B7950E, 0x2FEE7D1C, 0x223613BD,
-	0xDD06CAA2, 0x37DF932B, 0xC4248289, 0xACF3EBC3,
-	0x5715F6B7, 0xEF3478DD, 0xF267616F, 0xC148CBE4,
-	0x9052815E, 0x5E410FAB, 0xB48A2465, 0x2EDA7FA4,
-	0xE87B40E4, 0xE98EA084, 0x5889E9E1, 0xEFD390FC,
-	0xDD07D35B, 0xDB485694, 0x38D7E5B2, 0x57720101,
-	0x730EDEBC, 0x5B643113, 0x94917E4F, 0x503C2FBA,
-	0x646F1282, 0x7523D24A, 0xE0779695, 0xF9C17A8F,
-	0x7A5B2121, 0xD187B896, 0x29263A4D, 0xBA510CDF,
-	0x81F47C9F, 0xAD1163ED, 0xEA7B5965, 0x1A00726E,
-	0x11403092, 0x00DA6D77, 0x4A0CDD61, 0xAD1F4603,
-	0x605BDFB0, 0x9EEDC364, 0x22EBE6A8, 0xCEE7D28A,
-	0xA0E736A0, 0x5564A6B9, 0x10853209, 0xC7EB8F37,
-	0x2DE705CA, 0x8951570F, 0xDF09822B, 0xBD691A6C,
-	0xAA12E4F2, 0x87451C0F, 0xE0F6A27A, 0x3ADA4819,
-	0x4CF1764F, 0x0D771C2B, 0x67CDB156, 0x350D8384,
-	0x5938FA0F, 0x42399EF3, 0x36997B07, 0x0E84093D,
-	0x4AA93E61, 0x8360D87B, 0x1FA98B0C, 0x1149382C,
-	0xE97625A5, 0x0614D1B7, 0x0E25244B, 0x0C768347,
-	0x589E8D82, 0x0D2059D1, 0xA466BB1E, 0xF8DA0A82,
-	0x04F19130, 0xBA6E4EC0, 0x99265164, 0x1EE7230D,
-	0x50B2AD80, 0xEAEE6801, 0x8DB2A283, 0xEA8BF59E
-};
-
-/* Macros to access 8-bit bytes out of a 32-bit word */
-#define U8a(x) ( (u_int8_t) (x>>24) )
-#define U8b(x) ( (u_int8_t) ((x>>16)&255) )
-#define U8c(x) ( (u_int8_t) ((x>>8)&255) )
-#define U8d(x) ( (u_int8_t) ((x)&255) )
-
-/* Circular left shift */
-#define ROL(x, n) ( ((x)<<(n)) | ((x)>>(32-(n))) )
-
-/* CAST-128 uses three different round functions */
-#define F1(l, r, i) \
-	t = ROL(key->xkey[i] + r, key->xkey[i+16]); \
-	l ^= ((cast_sbox1[U8a(t)] ^ cast_sbox2[U8b(t)]) - \
-	 cast_sbox3[U8c(t)]) + cast_sbox4[U8d(t)];
-#define F2(l, r, i) \
-	t = ROL(key->xkey[i] ^ r, key->xkey[i+16]); \
-	l ^= ((cast_sbox1[U8a(t)] - cast_sbox2[U8b(t)]) + \
-	 cast_sbox3[U8c(t)]) ^ cast_sbox4[U8d(t)];
-#define F3(l, r, i) \
-	t = ROL(key->xkey[i] - r, key->xkey[i+16]); \
-	l ^= ((cast_sbox1[U8a(t)] + cast_sbox2[U8b(t)]) ^ \
-	 cast_sbox3[U8c(t)]) - cast_sbox4[U8d(t)];
-
-
-/***** Encryption Function *****/
-
-void cast_encrypt(cast_key* key, u_int8_t* inblock, u_int8_t* outblock)
-{
-u_int32_t t, l, r;
-
-	/* Get inblock into l,r */
-	l = ((u_int32_t)inblock[0] << 24) | ((u_int32_t)inblock[1] << 16) |
-	 ((u_int32_t)inblock[2] << 8) | (u_int32_t)inblock[3];
-	r = ((u_int32_t)inblock[4] << 24) | ((u_int32_t)inblock[5] << 16) |
-	 ((u_int32_t)inblock[6] << 8) | (u_int32_t)inblock[7];
-	/* Do the work */
-	F1(l, r,  0);
-	F2(r, l,  1);
-	F3(l, r,  2);
-	F1(r, l,  3);
-	F2(l, r,  4);
-	F3(r, l,  5);
-	F1(l, r,  6);
-	F2(r, l,  7);
-	F3(l, r,  8);
-	F1(r, l,  9);
-	F2(l, r, 10);
-	F3(r, l, 11);
-	/* Only do full 16 rounds if key length > 80 bits */
-	if (key->rounds > 12) {
-		F1(l, r, 12);
-		F2(r, l, 13);
-		F3(l, r, 14);
-		F1(r, l, 15);
-	}
-	/* Put l,r into outblock */
-	outblock[0] = U8a(r);
-	outblock[1] = U8b(r);
-	outblock[2] = U8c(r);
-	outblock[3] = U8d(r);
-	outblock[4] = U8a(l);
-	outblock[5] = U8b(l);
-	outblock[6] = U8c(l);
-	outblock[7] = U8d(l);
-	/* Wipe clean */
-	t = l = r = 0;
-}
-
-
-/***** Decryption Function *****/
-
-void cast_decrypt(cast_key* key, u_int8_t* inblock, u_int8_t* outblock)
-{
-u_int32_t t, l, r;
-
-	/* Get inblock into l,r */
-	r = ((u_int32_t)inblock[0] << 24) | ((u_int32_t)inblock[1] << 16) |
-	 ((u_int32_t)inblock[2] << 8) | (u_int32_t)inblock[3];
-	l = ((u_int32_t)inblock[4] << 24) | ((u_int32_t)inblock[5] << 16) |
-	 ((u_int32_t)inblock[6] << 8) | (u_int32_t)inblock[7];
-	/* Do the work */
-	/* Only do full 16 rounds if key length > 80 bits */
-	if (key->rounds > 12) {
-		F1(r, l, 15);
-		F3(l, r, 14);
-		F2(r, l, 13);
-		F1(l, r, 12);
-	}
-	F3(r, l, 11);
-	F2(l, r, 10);
-	F1(r, l,  9);
-	F3(l, r,  8);
-	F2(r, l,  7);
-	F1(l, r,  6);
-	F3(r, l,  5);
-	F2(l, r,  4);
-	F1(r, l,  3);
-	F3(l, r,  2);
-	F2(r, l,  1);
-	F1(l, r,  0);
-	/* Put l,r into outblock */
-	outblock[0] = U8a(l);
-	outblock[1] = U8b(l);
-	outblock[2] = U8c(l);
-	outblock[3] = U8d(l);
-	outblock[4] = U8a(r);
-	outblock[5] = U8b(r);
-	outblock[6] = U8c(r);
-	outblock[7] = U8d(r);
-	/* Wipe clean */
-	t = l = r = 0;
-}
-
-
-/***** Key Schedual *****/
-
-void cast_setkey(cast_key* key, u_int8_t* rawkey, int keybytes)
-{
-u_int32_t t[4], z[4], x[4];
-int i;
-
-	/* Set number of rounds to 12 or 16, depending on key length */
-	key->rounds = (keybytes <= 10 ? 12 : 16);
-
-	/* Copy key to workspace x */
-	for (i = 0; i < 4; i++) {
-		x[i] = 0;
-		if ((i*4+0) < keybytes) x[i] = (u_int32_t)rawkey[i*4+0] << 24;
-		if ((i*4+1) < keybytes) x[i] |= (u_int32_t)rawkey[i*4+1] << 16;
-		if ((i*4+2) < keybytes) x[i] |= (u_int32_t)rawkey[i*4+2] << 8;
-		if ((i*4+3) < keybytes) x[i] |= (u_int32_t)rawkey[i*4+3];
-	}
-	/* Generate 32 subkeys, four at a time */
-	for (i = 0; i < 32; i+=4) {
-		switch (i & 4) {
-		 case 0:
-			t[0] = z[0] = x[0] ^ cast_sbox5[U8b(x[3])] ^
-			 cast_sbox6[U8d(x[3])] ^ cast_sbox7[U8a(x[3])] ^
-			 cast_sbox8[U8c(x[3])] ^ cast_sbox7[U8a(x[2])];
-			t[1] = z[1] = x[2] ^ cast_sbox5[U8a(z[0])] ^
-			 cast_sbox6[U8c(z[0])] ^ cast_sbox7[U8b(z[0])] ^
-			 cast_sbox8[U8d(z[0])] ^ cast_sbox8[U8c(x[2])];
-			t[2] = z[2] = x[3] ^ cast_sbox5[U8d(z[1])] ^
-			 cast_sbox6[U8c(z[1])] ^ cast_sbox7[U8b(z[1])] ^
-			 cast_sbox8[U8a(z[1])] ^ cast_sbox5[U8b(x[2])];
-			t[3] = z[3] = x[1] ^ cast_sbox5[U8c(z[2])] ^
-			 cast_sbox6[U8b(z[2])] ^ cast_sbox7[U8d(z[2])] ^
-			 cast_sbox8[U8a(z[2])] ^ cast_sbox6[U8d(x[2])];
-			break;
-		 case 4:
-			t[0] = x[0] = z[2] ^ cast_sbox5[U8b(z[1])] ^
-			 cast_sbox6[U8d(z[1])] ^ cast_sbox7[U8a(z[1])] ^
-			 cast_sbox8[U8c(z[1])] ^ cast_sbox7[U8a(z[0])];
-			t[1] = x[1] = z[0] ^ cast_sbox5[U8a(x[0])] ^
-			 cast_sbox6[U8c(x[0])] ^ cast_sbox7[U8b(x[0])] ^
-			 cast_sbox8[U8d(x[0])] ^ cast_sbox8[U8c(z[0])];
-			t[2] = x[2] = z[1] ^ cast_sbox5[U8d(x[1])] ^
-			 cast_sbox6[U8c(x[1])] ^ cast_sbox7[U8b(x[1])] ^
-			 cast_sbox8[U8a(x[1])] ^ cast_sbox5[U8b(z[0])];
-			t[3] = x[3] = z[3] ^ cast_sbox5[U8c(x[2])] ^
-			 cast_sbox6[U8b(x[2])] ^ cast_sbox7[U8d(x[2])] ^
-			 cast_sbox8[U8a(x[2])] ^ cast_sbox6[U8d(z[0])];
-			break;
-		}
-		switch (i & 12) {
-		 case 0:
-		 case 12:
-			key->xkey[i+0] = cast_sbox5[U8a(t[2])] ^ cast_sbox6[U8b(t[2])] ^
-			 cast_sbox7[U8d(t[1])] ^ cast_sbox8[U8c(t[1])];
-			key->xkey[i+1] = cast_sbox5[U8c(t[2])] ^ cast_sbox6[U8d(t[2])] ^
-			 cast_sbox7[U8b(t[1])] ^ cast_sbox8[U8a(t[1])];
-			key->xkey[i+2] = cast_sbox5[U8a(t[3])] ^ cast_sbox6[U8b(t[3])] ^
-			 cast_sbox7[U8d(t[0])] ^ cast_sbox8[U8c(t[0])];
-			key->xkey[i+3] = cast_sbox5[U8c(t[3])] ^ cast_sbox6[U8d(t[3])] ^
-			 cast_sbox7[U8b(t[0])] ^ cast_sbox8[U8a(t[0])];
-			break;
-		 case 4:
-		 case 8:
-			key->xkey[i+0] = cast_sbox5[U8d(t[0])] ^ cast_sbox6[U8c(t[0])] ^
-			 cast_sbox7[U8a(t[3])] ^ cast_sbox8[U8b(t[3])];
-			key->xkey[i+1] = cast_sbox5[U8b(t[0])] ^ cast_sbox6[U8a(t[0])] ^
-			 cast_sbox7[U8c(t[3])] ^ cast_sbox8[U8d(t[3])];
-			key->xkey[i+2] = cast_sbox5[U8d(t[1])] ^ cast_sbox6[U8c(t[1])] ^
-			 cast_sbox7[U8a(t[2])] ^ cast_sbox8[U8b(t[2])];
-			key->xkey[i+3] = cast_sbox5[U8b(t[1])] ^ cast_sbox6[U8a(t[1])] ^
-			 cast_sbox7[U8c(t[2])] ^ cast_sbox8[U8d(t[2])];
-			break;
-		}
-		switch (i & 12) {
-		 case 0:
-			key->xkey[i+0] ^= cast_sbox5[U8c(z[0])];
-			key->xkey[i+1] ^= cast_sbox6[U8c(z[1])];
-			key->xkey[i+2] ^= cast_sbox7[U8b(z[2])];
-			key->xkey[i+3] ^= cast_sbox8[U8a(z[3])];
-			break;
-		 case 4:
-			key->xkey[i+0] ^= cast_sbox5[U8a(x[2])];
-			key->xkey[i+1] ^= cast_sbox6[U8b(x[3])];
-			key->xkey[i+2] ^= cast_sbox7[U8d(x[0])];
-			key->xkey[i+3] ^= cast_sbox8[U8d(x[1])];
-			break;
-		 case 8:
-			key->xkey[i+0] ^= cast_sbox5[U8b(z[2])];
-			key->xkey[i+1] ^= cast_sbox6[U8a(z[3])];
-			key->xkey[i+2] ^= cast_sbox7[U8c(z[0])];
-			key->xkey[i+3] ^= cast_sbox8[U8c(z[1])];
-			break;
-		 case 12:
-			key->xkey[i+0] ^= cast_sbox5[U8d(x[0])];
-			key->xkey[i+1] ^= cast_sbox6[U8d(x[1])];
-			key->xkey[i+2] ^= cast_sbox7[U8a(x[2])];
-			key->xkey[i+3] ^= cast_sbox8[U8b(x[3])];
-			break;
-		}
-		if (i >= 16) {
-			key->xkey[i+0] &= 31;
-			key->xkey[i+1] &= 31;
-			key->xkey[i+2] &= 31;
-			key->xkey[i+3] &= 31;
-		}
-	}
-	/* Wipe clean */
-	for (i = 0; i < 4; i++) {
-		t[i] = x[i] = z[i] = 0;
-	}
-}
-
-/* Made in Canada */
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/md5.c b/sbin/isakmpd/sysdep/common/libsysdep/md5.c
deleted file mode 100644
index 8a7a483dcc9..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/md5.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/*	$OpenBSD: md5.c,v 1.3 2002/06/14 21:34:58 todd Exp $	*/
-
-/*
- * The rest of the code is derived from MD5C.C by RSADSI. Minor cosmetic
- * changes to accommodate it in the kernel by ji.
- */
-
-/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-/*
- * Additions by JI
- *
- * HAVEMEMCOPY is defined if mem* routines are available
- *
- * HAVEHTON is defined if htons() and htonl() can be used
- * for big/little endian conversions
- *
- */
-
-#include <stddef.h>
-#include <string.h>
-
-#include "md5.h"
-
-#ifndef WIN32
-#include "endian.h"   /* sets BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN */
-#endif
-
-#define HAVEMEMCOPY 1	/* use ISO C's memcpy and memset */
-
-/* Constants for MD5Transform routine.
- */
-
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-#define MD5Transform _MD5Transform
-
-static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64]));
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define Encode MD5_memcpy
-#define Decode MD5_memcpy
-#else
-static void Encode PROTO_LIST
-  ((unsigned char *, UINT4 *, unsigned int));
-static void Decode PROTO_LIST
-  ((UINT4 *, unsigned char *, unsigned int));
-#endif
-
-#ifdef HAVEMEMCOPY
-#include <memory.h>
-#define MD5_memcpy	memcpy
-#define MD5_memset	memset
-#else
-#ifdef HAVEBCOPY
-#define MD5_memcpy(_a,_b,_c) memcpy((_a), (_b),(_c))
-#define MD5_memset(_a,_b,_c) memset((_a), '\0',(_c))
-#else
-static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
-static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int));
-#endif
-#endif
-static unsigned char PADDING[64] = {
-  0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/* F, G, H and I are basic MD5 functions.
- */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits.
- */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-Rotation is separate from addition to prevent recomputation.
- */
-#define FF(a, b, c, d, x, s, ac) { \
- (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define GG(a, b, c, d, x, s, ac) { \
- (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define HH(a, b, c, d, x, s, ac) { \
- (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define II(a, b, c, d, x, s, ac) { \
- (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-
-/* MD5 initialization. Begins an MD5 operation, writing a new context.
- */
-void MD5Init (context)
-MD5_CTX *context;                                        /* context */
-{
-  context->count[0] = context->count[1] = 0;
-  /* Load magic initialization constants.
-*/
-  context->state[0] = 0x67452301;
-  context->state[1] = 0xefcdab89;
-  context->state[2] = 0x98badcfe;
-  context->state[3] = 0x10325476;
-}
-
-/* MD5 block update operation. Continues an MD5 message-digest
-  operation, processing another message block, and updating the
-  context.
- */
-void MD5Update (context, input, inputLen)
-MD5_CTX *context;                                        /* context */
-unsigned char *input;                                /* input block */
-unsigned int inputLen;                     /* length of input block */
-{
-  unsigned int i, index, partLen;
-
-  /* Compute number of bytes mod 64 */
-  index = (unsigned int)((context->count[0] >> 3) & 0x3F);
-
-  /* Update number of bits */
-  if ((context->count[0] += ((UINT4)inputLen << 3))
-   < ((UINT4)inputLen << 3))
- context->count[1]++;
-  context->count[1] += ((UINT4)inputLen >> 29);
-
-  partLen = 64 - index;
-
-  /* Transform as many times as possible.
-*/
-  if (inputLen >= partLen) {
- MD5_memcpy
-   ((POINTER)&context->buffer[index], (POINTER)input, partLen);
- MD5Transform (context->state, context->buffer);
-
- for (i = partLen; i + 63 < inputLen; i += 64)
-   MD5Transform (context->state, &input[i]);
-
- index = 0;
-  }
-  else
- i = 0;
-
-  /* Buffer remaining input */
-  MD5_memcpy
- ((POINTER)&context->buffer[index], (POINTER)&input[i],
-  inputLen-i);
-}
-
-/* MD5 finalization. Ends an MD5 message-digest operation, writing the
-  the message digest and zeroizing the context.
- */
-void MD5Final (digest, context)
-unsigned char digest[16];                         /* message digest */
-MD5_CTX *context;                                       /* context */
-{
-  unsigned char bits[8];
-  unsigned int index, padLen;
-
-  /* Save number of bits */
-  Encode (bits, context->count, 8);
-
-  /* Pad out to 56 mod 64.
-*/
-  index = (unsigned int)((context->count[0] >> 3) & 0x3f);
-  padLen = (index < 56) ? (56 - index) : (120 - index);
-  MD5Update (context, PADDING, padLen);
-
-  /* Append length (before padding) */
-  MD5Update (context, bits, 8);
-
-  if (digest != NULL)			/* Bill Simpson's padding */
-  {
-	  /* store state in digest */
-	  Encode (digest, context->state, 16);
-
-	  /* Zeroize sensitive information.
-	   */
-	  MD5_memset ((POINTER)context, 0, sizeof (*context));
-  }
-}
-
-/* MD5 basic transformation. Transforms state based on block.
- */
-static void MD5Transform (state, block)
-UINT4 state[4];
-unsigned char block[64];
-{
-  UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-  Decode (x, block, 64);
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-
-  /* Zeroize sensitive information.
-*/
-  MD5_memset ((POINTER)x, 0, sizeof (x));
-}
-
-#if BYTE_ORDER != LITTLE_ENDIAN
-
-/* Encodes input (UINT4) into output (unsigned char). Assumes len is
-  a multiple of 4.
- */
-static void Encode (output, input, len)
-unsigned char *output;
-UINT4 *input;
-unsigned int len;
-{
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4) {
- output[j] = (unsigned char)(input[i] & 0xff);
- output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
- output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
- output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
-  }
-}
-
-/* Decodes input (unsigned char) into output (UINT4). Assumes len is
-  a multiple of 4.
- */
-static void Decode (output, input, len)
-UINT4 *output;
-unsigned char *input;
-unsigned int len;
-{
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4)
- output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
-   (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
-}
-
-#endif
-
-#ifndef HAVEMEMCOPY
-#ifndef HAVEBCOPY
-/* Note: Replace "for loop" with standard memcpy if possible.
- */
-
-static void MD5_memcpy (output, input, len)
-POINTER output;
-POINTER input;
-unsigned int len;
-{
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
-
- output[i] = input[i];
-}
-
-/* Note: Replace "for loop" with standard memset if possible.
- */
-static void MD5_memset (output, value, len)
-POINTER output;
-int value;
-unsigned int len;
-{
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
- ((char *)output)[i] = (char)value;
-}
-#endif
-#endif
-
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/sha1.c b/sbin/isakmpd/sysdep/common/libsysdep/sha1.c
deleted file mode 100644
index da635637b3b..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/sha1.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*	$OpenBSD: sha1.c,v 1.2 2001/01/28 22:38:48 niklas Exp $	*/
-
-/*
-SHA-1 in C
-By Steve Reid <steve@edmweb.com>
-100% Public Domain
-
-Test Vectors (from FIPS PUB 180-1)
-"abc"
-  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
-"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
-A million repetitions of "a"
-  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
-*/
-
-/* #define LITTLE_ENDIAN * This should be #define'd already, if true. */
-/* #define SHA1HANDSOFF * Copies data before messing with it. */
-
-#define SHA1HANDSOFF
-
-#include <string.h>
-
-#include "sha1.h"
-#ifndef WIN32
-  #include "endian.h"   /* sets BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN */
-#endif
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
-    |(rol(block->l[i],8)&0x00FF00FF))
-#elif BYTE_ORDER == BIG_ENDIAN
-#define blk0(i) block->l[i]
-#else
-#error "Endianness not defined!"
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-    ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-
-/* Hash a single 512-bit block. This is the core of the algorithm. */
-
-void SHA1Transform(unsigned long state[5], unsigned char buffer[64])
-{
-unsigned long a, b, c, d, e;
-typedef union {
-    unsigned char c[64];
-    unsigned long l[16];
-} CHAR64LONG16;
-CHAR64LONG16* block;
-#ifdef SHA1HANDSOFF
-static CHAR64LONG16 workspace;
-    block = &workspace;
-    memcpy(block, buffer, 64);
-#else
-    block = (CHAR64LONG16*)buffer;
-#endif
-    /* Copy context->state[] to working vars */
-    a = state[0];
-    b = state[1];
-    c = state[2];
-    d = state[3];
-    e = state[4];
-    /* 4 rounds of 20 operations each. Loop unrolled. */
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-    /* Add the working vars back into context.state[] */
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    state[4] += e;
-    /* Wipe variables */
-    a = b = c = d = e = 0;
-}
-
-
-/* SHA1Init - Initialize new context */
-
-void SHA1Init(SHA1_CTX* context)
-{
-    /* SHA1 initialization constants */
-    context->state[0] = 0x67452301;
-    context->state[1] = 0xEFCDAB89;
-    context->state[2] = 0x98BADCFE;
-    context->state[3] = 0x10325476;
-    context->state[4] = 0xC3D2E1F0;
-    context->count[0] = context->count[1] = 0;
-}
-
-
-/* Run your data through this. */
-
-void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len)
-{
-unsigned int i;
-unsigned long j;
-
-    j = context->count[0];
-    if ((context->count[0] += len << 3) < j) context->count[1] += (len>>29)+1;
-    j = (j >> 3) & 63;
-    if ((j + len) > 63) {
-        memcpy(&context->buffer[j], data, (i = 64-j));
-        SHA1Transform(context->state, context->buffer);
-        for ( ; i + 63 < len; i += 64) {
-            SHA1Transform(context->state, &data[i]);
-        }
-        j = 0;
-    }
-    else i = 0;
-    memcpy(&context->buffer[j], &data[i], len - i);
-}
-
-
-/* Add padding and return the message digest. */
-
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
-{
-unsigned long i, j;
-unsigned char finalcount[8];
-
-    for (i = 0; i < 8; i++) {
-        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
-         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
-    }
-    SHA1Update(context, (unsigned char *)"\200", 1);
-    while ((context->count[0] & 504) != 448) {
-        SHA1Update(context, (unsigned char *)"\0", 1);
-    }
-    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
-    for (i = 0; i < 20; i++) {
-        digest[i] = (unsigned char)
-         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
-    }
-    /* Wipe variables */
-    i = j = 0;
-    memset(context->buffer, '\0', 64);
-    memset(context->state, '\0', 20);
-    memset(context->count, '\0', 8);
-    memset(&finalcount, '\0', 8);
-#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite it's own static vars */
-    SHA1Transform(context->state, context->buffer);
-#endif
-}
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/strlcat.c b/sbin/isakmpd/sysdep/common/libsysdep/strlcat.c
deleted file mode 100644
index 3b55428efc8..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/strlcat.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$OpenBSD: strlcat.c,v 1.3 2003/06/17 21:56:24 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcat.c,v 1.3 2003/06/17 21:56:24 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat(dst, src, siz)
-	char *dst;
-	const char *src;
-	size_t siz;
-{
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
-	size_t dlen;
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/strlcpy.c b/sbin/isakmpd/sysdep/common/libsysdep/strlcpy.c
deleted file mode 100644
index ef7db1300b0..00000000000
--- a/sbin/isakmpd/sysdep/common/libsysdep/strlcpy.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$OpenBSD: strlcpy.c,v 1.3 2003/06/17 21:56:24 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.3 2003/06/17 21:56:24 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-strlcpy(dst, src, siz)
-	char *dst;
-	const char *src;
-	size_t siz;
-{
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
diff --git a/sbin/isakmpd/sysdep/common/md5.h b/sbin/isakmpd/sysdep/common/md5.h
deleted file mode 100644
index ea703c3b2c5..00000000000
--- a/sbin/isakmpd/sysdep/common/md5.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$OpenBSD: md5.h,v 1.2 2001/01/28 22:38:47 niklas Exp $	*/
-
-/* GLOBAL.H - RSAREF types and constants
- */
-
-/* PROTOTYPES should be set to one if and only if the compiler supports
-     function argument prototyping.
-   The following makes PROTOTYPES default to 0 if it has not already
-     been defined with C compiler flags.
- */
-#ifndef PROTOTYPES
-#define PROTOTYPES 1
-#endif
-
-/* POINTER defines a generic pointer type */
-typedef unsigned char *POINTER;
-
-/* UINT2 defines a two byte word */
-typedef unsigned short int UINT2;
-
-/* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
-
-/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
-   If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
-     returns an empty list.
- */
-
-#if PROTOTYPES
-#define PROTO_LIST(list) list
-#else
-#define PROTO_LIST(list) ()
-#endif
-
-
-/* MD5.H - header file for MD5C.C
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-/* MD5 context. */
-typedef struct {
-  UINT4 state[4];                                   /* state (ABCD) */
-  UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
-  unsigned char buffer[64];                         /* input buffer */
-} MD5_CTX;
-
-void MD5Init PROTO_LIST ((MD5_CTX *));
-void MD5Update PROTO_LIST
-  ((MD5_CTX *, unsigned char *, unsigned int));
-void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
-
-#define _MD5_H_
diff --git a/sbin/isakmpd/sysdep/common/pcap.h b/sbin/isakmpd/sysdep/common/pcap.h
deleted file mode 100644
index fafe47a2e27..00000000000
--- a/sbin/isakmpd/sysdep/common/pcap.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$OpenBSD: pcap.h,v 1.2 2002/05/10 15:09:00 ho Exp $	*/
-
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#) $Header: /cvs/OpenBSD/src/sbin/isakmpd/sysdep/common/Attic/pcap.h,v 1.2 2002/05/10 15:09:00 ho Exp $ (LBL)
- */
-
-#ifndef lib_pcap_h
-#define lib_pcap_h
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#define PCAP_VERSION_MAJOR	2
-#define PCAP_VERSION_MINOR	4
-#define DLT_LOOP		12	/* from /usr/include/net/bpf.h */
-
-struct pcap_file_header {
-	u_int32_t magic;
-	u_int16_t version_major;
-	u_int16_t version_minor;
-	int32_t	thiszone;	/* gmt to local correction */
-	u_int32_t sigfigs;	/* accuracy of timestamps */
-	u_int32_t snaplen;	/* max length saved portion of each pkt */
-	u_int32_t linktype;	/* data link type (DLT_*) */
-};
-
-struct pcap_pkthdr {
-	struct timeval ts;	/* time stamp */
-	u_int32_t caplen;	/* length of portion present */
-	u_int32_t len;		/* length this packet (off wire) */
-};
-
-#endif /* lib_pcap_h */
diff --git a/sbin/isakmpd/sysdep/common/sha1.h b/sbin/isakmpd/sysdep/common/sha1.h
deleted file mode 100644
index c706c6ee762..00000000000
--- a/sbin/isakmpd/sysdep/common/sha1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$OpenBSD: sha1.h,v 1.2 2001/01/28 22:38:47 niklas Exp $	*/
-
-/*
-SHA-1 in C
-By Steve Reid <steve@edmweb.com>
-100% Public Domain
-*/
-
-typedef struct {
-    unsigned long state[5];
-    unsigned long count[2];
-    unsigned char buffer[64];
-} SHA1_CTX;
-
-void SHA1Transform(unsigned long state[5], unsigned char buffer[64]);
-void SHA1Init(SHA1_CTX* context);
-void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len);
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context);