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

3 files changed, 0 insertions, 349 deletions

diff --git a/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep
deleted file mode 100644
index 1e58d6b8862..00000000000
--- a/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$OpenBSD: GNUmakefile.sysdep,v 1.12 2005/04/05 22:53:50 cloder Exp $
-
-#
-# Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
-# Copyright (c) 2003 Thomas Walpuski.  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.
-#
-
-LIBGMP:=	/usr/lib/libgmp.a
-LIBCRYPTO:=	/usr/lib/libcrypto.a
-LIBSYSDEPDIR:=	${.CURDIR}/sysdep/common/libsysdep
-LIBSYSDEP:=	${LIBSYSDEPDIR}/libsysdep.a
-
-LDADD+=		-lgmp ${LIBSYSDEP} ${LIBCRYPTO}
-DPADD+=		${LIBGMP} ${LIBSYSDEP}
-
-CFLAGS+=	-DUSE_OLD_SOCKADDR -DHAVE_PCAP \
-		-DNEED_SYSDEP_APP -DMP_FLAVOUR=MP_FLAVOUR_GMP \
-		-I/usr/src/linux/include -I${.CURDIR}/sysdep/common \
-		-I/usr/include/openssl
-
-FEATURES=	debug tripledes blowfish cast ec aggressive x509 policy
-FEATURES+=	des aes nat_traversal dpd
-
-IPSEC_SRCS=	pf_key_v2.c
-IPSEC_CFLAGS=	-DUSE_PF_KEY_V2
-
-USE_LIBCRYPO=	defined
-USE_KEYNOTE=	defined
-
-# hack libsysdep.a dependenc
-${LIBSYSDEPDIR}/.depend ${LIBSYSDEP}:
-	cd ${LIBSYSDEPDIR} && \
-		${MAKE} --no-print-directory ${MAKEFLAGS} \
-			CFLAGS="${CFLAGS}" MKDEP="${MKDEP}" ${MAKECMDGOALS}
-
-ifeq ($(findstring clean,$(MAKECMDGOALS)),clean)
-SUBDIR+=	sysdep/common/libsysdep
-MAKEFLAGS+=	--no-print-directory
-endif
diff --git a/sbin/isakmpd/sysdep/linux/sysdep-os.h b/sbin/isakmpd/sysdep/linux/sysdep-os.h
deleted file mode 100644
index 4bd5dfddd90..00000000000
--- a/sbin/isakmpd/sysdep/linux/sysdep-os.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$OpenBSD: sysdep-os.h,v 1.8 2003/06/03 15:20:41 ho Exp $	*/
-
-/*
- * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
- * Copyright (c) 2003 Thomas Walpuski.  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 _SYSDEP_OS_H_
-#define _SYSDEP_OS_H_
-
-#include <netinet/in.h>
-#include <time.h>
-#include <sys/types.h>
-#include <linux/ipsec.h>
-
-#define KAME
-
-#define LINUX_IPSEC
-
-#define uh_sport source
-#define uh_dport dest
-#define uh_ulen len
-#define uh_sum check
-
-#ifndef CPI_RESERVED_MAX
-#define CPI_RESERVED_MIN		1
-#define CPI_RESERVED_MAX		255
-#define CPI_PRIVATE_MIN			61440
-#define CPI_PRIVATE_MAX			65536
-#endif
-
-#define SADB_X_EALG_AES			SADB_X_EALG_AESCBC
-#define SADB_X_EALG_CAST		SADB_X_EALG_CASTCBC
-#define SADB_X_EALG_BLF			SADB_X_EALG_BLOWFISHCBC
-
-#define IP_IPSEC_POLICY			16
-#define IPV6_IPSEC_POLICY		34
-
-#define IPV6_VERSION			0x1
-
-size_t strlcat(char *dst, const char *src, size_t siz);
-size_t strlcpy(char *dst, const char *src, size_t siz);
-
-#endif
diff --git a/sbin/isakmpd/sysdep/linux/sysdep.c b/sbin/isakmpd/sysdep/linux/sysdep.c
deleted file mode 100644
index 4eab40b3878..00000000000
--- a/sbin/isakmpd/sysdep/linux/sysdep.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*	$OpenBSD: sysdep.c,v 1.16 2004/08/10 15:59:10 ho Exp $	*/
-
-/*
- * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
- * Copyright (c) 2003 Thomas Walpuski.  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.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "sysdep.h"
-
-#include "util.h"
-
-#ifdef NEED_SYSDEP_APP
-#include "app.h"
-#include "conf.h"
-#include "ipsec.h"
-#include <linux/pfkeyv2.h>
-#include <linux/ipsec.h>
-
-#ifdef USE_PF_KEY_V2
-#include "pf_key_v2.h"
-#define KEY_API(x) pf_key_v2_##x
-#endif
-
-#endif /* NEED_SYSDEP_APP */
-#include "log.h"
-
-extern char *__progname;
-
-/*
- * An as strong as possible random number generator, reverting to a
- * deterministic pseudo-random one if regrand is set.
- */
-u_int32_t
-sysdep_random ()
-{
-  return arc4random();
-}
-
-/* Return the basename of the command used to invoke us.  */
-char *
-sysdep_progname ()
-{
-  return __progname;
-}
-
-/* Return the length of the sockaddr struct.  */
-u_int8_t
-sysdep_sa_len (struct sockaddr *sa)
-{
-  switch (sa->sa_family)
-    {
-    case AF_INET:
-      return sizeof (struct sockaddr_in);
-    case AF_INET6:
-      return sizeof (struct sockaddr_in6);
-    default:
-      log_print ("sysdep_sa_len: unknown sa family %d", sa->sa_family);
-    }
-  return sizeof (struct sockaddr_in);
-}
-
-/* As regress/ use this file I protect the sysdep_app_* stuff like this.  */
-#ifdef NEED_SYSDEP_APP
-/*
- * Prepare the application we negotiate SAs for (i.e. the IPsec stack)
- * for communication.  We return a file descriptor useable to select(2) on.
- */
-int
-sysdep_app_open ()
-{
-  return KEY_API(open) ();
-}
-
-/*
- * When select(2) has noticed our application needs attendance, this is what
- * gets called.  FD is the file descriptor causing the alarm.
- */
-void
-sysdep_app_handler (int fd)
-{
-  KEY_API (handler) (fd);
-}
-
-/* Check that the connection named NAME is active, or else make it active.  */
-void
-sysdep_connection_check (char *name)
-{
-  KEY_API (connection_check) (name);
-}
-
-/*
- * Generate a SPI for protocol PROTO and the source/destination pair given by
- * SRC, SRCLEN, DST & DSTLEN.  Stash the SPI size in SZ.
- */
-u_int8_t *
-sysdep_ipsec_get_spi (size_t *sz, u_int8_t proto, struct sockaddr *src,
-		      struct sockaddr *dst, u_int32_t seq)
-{
-  if (app_none)
-    {
-      *sz = IPSEC_SPI_SIZE;
-      /* XXX should be random instead I think.  */
-      return strdup ("\x12\x34\x56\x78");
-    }
-  return KEY_API (get_spi) (sz, proto, src, dst, seq);
-}
-
-struct sa_kinfo *
-sysdep_ipsec_get_kernel_sa(u_int8_t *spi, size_t spi_sz, u_int8_t proto,
-    struct sockaddr *dst)
-{
-	if (app_none)
-		return 0;
-	/* XXX return KEY_API(get_kernel_sa)(spi, spi_sz, proto, dst); */
-	return 0;
-}
-
-/* Force communication on socket FD to go in the clear.  */
-int
-sysdep_cleartext (int fd, int af)
-{
-  struct sadb_x_policy pol_in = {
-    SADB_UPDATE,
-    SADB_EXT_SENSITIVITY,
-    IPSEC_POLICY_BYPASS,
-    IPSEC_DIR_INBOUND,
-    0,
-    0,
-    0
-  };
-  struct sadb_x_policy pol_out = {
-    SADB_UPDATE,
-    SADB_EXT_SENSITIVITY,
-    IPSEC_POLICY_BYPASS,
-    IPSEC_DIR_OUTBOUND,
-    0,
-    0,
-    0
-  };
-
-  if (app_none)
-    return 0;
-
-  if (!(af == AF_INET || af == AF_INET6))
-    {
-      log_print ("sysdep_cleartext: unsupported protocol family %d", af);
-      return -1;
-    }
-
-  if (setsockopt (fd, af == AF_INET ? IPPROTO_IP : IPPROTO_IPV6,
-		  af == AF_INET ? IP_IPSEC_POLICY : IPV6_IPSEC_POLICY,
-		  &pol_in, sizeof pol_in) < 0 ||
-      setsockopt (fd, af == AF_INET ? IPPROTO_IP : IPPROTO_IPV6,
-		  af == AF_INET ? IP_IPSEC_POLICY : IPV6_IPSEC_POLICY,
-		  &pol_out, sizeof pol_out) < 0)
-    {
-      log_error ("sysdep_cleartext: "
-		 "setsockopt (%d, IPPROTO_IP%s, IP%s_IPSEC_POLICY, ...) "
-		 "failed", fd, af == AF_INET ? "" : "V6",
-		 af == AF_INET ? "" : "V6");
-      return -1;
-    }
-  return 0;
-}
-
-int
-sysdep_ipsec_delete_spi (struct sa *sa, struct proto *proto, int incoming)
-{
-  if (app_none)
-    return 0;
-  return KEY_API (delete_spi) (sa, proto, incoming);
-}
-
-int
-sysdep_ipsec_enable_sa (struct sa *sa, struct sa *isakmp_sa)
-{
-  if (app_none)
-    return 0;
-  return KEY_API (enable_sa) (sa, isakmp_sa);
-}
-
-int
-sysdep_ipsec_group_spis (struct sa *sa, struct proto *proto1,
-			 struct proto *proto2, int incoming)
-{
-  if (app_none)
-    return 0;
-  return KEY_API (group_spis) (sa, proto1, proto2, incoming);
-}
-
-int
-sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming,
-		      struct sa *isakmp_sa)
-{
-  if (app_none)
-    return 0;
-  return KEY_API (set_spi) (sa, proto, incoming, isakmp_sa);
-}
-#endif