Remove support for PF_ENCAP (deprecated since OpenBSD2.5).

8 files changed, 4 insertions, 410 deletions

diff --git a/sbin/isakmpd/sysdep/bsdi/sysdep.c b/sbin/isakmpd/sysdep/bsdi/sysdep.c
index 3a68f070787..3b1a2615550 100644
--- a/sbin/isakmpd/sysdep/bsdi/sysdep.c
+++ b/sbin/isakmpd/sysdep/bsdi/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.6 2001/07/03 14:54:15 markus Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.7 2001/07/06 09:35:57 ho Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -46,10 +46,6 @@
 #ifdef USE_PF_KEY_V2
 #include "pf_key_v2.h"
 #define KEY_API(x) pf_key_v2_##x
-#else
-#include <net/encap.h>
-#include "pf_encap.h"
-#define KEY_API(x) pf_encap_##x
 #endif
 
 #endif NEED_SYSDEP_APP
diff --git a/sbin/isakmpd/sysdep/freebsd/sysdep.c b/sbin/isakmpd/sysdep/freebsd/sysdep.c
index bb69e0e2957..0a4647ea392 100644
--- a/sbin/isakmpd/sysdep/freebsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/freebsd/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.7 2001/06/29 22:12:56 ho Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.8 2001/07/06 09:35:58 ho Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -52,10 +52,6 @@
 #ifdef USE_PF_KEY_V2
 #include "pf_key_v2.h"
 #define KEY_API(x) pf_key_v2_##x
-#else
-#include <net/encap.h>
-#include "pf_encap.h"
-#define KEY_API(x) pf_encap_##x
 #endif
 
 #endif NEED_SYSDEP_APP
diff --git a/sbin/isakmpd/sysdep/netbsd/sysdep.c b/sbin/isakmpd/sysdep/netbsd/sysdep.c
index 5978f3368d8..fe5037c8669 100644
--- a/sbin/isakmpd/sysdep/netbsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/netbsd/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.7 2001/06/29 22:12:55 ho Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.8 2001/07/06 09:35:58 ho Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -46,10 +46,6 @@
 #ifdef USE_PF_KEY_V2
 #include "pf_key_v2.h"
 #define KEY_API(x) pf_key_v2_##x
-#else
-#include <net/encap.h>
-#include "pf_encap.h"
-#define KEY_API(x) pf_encap_##x
 #endif
 
 #endif NEED_SYSDEP_APP
diff --git a/sbin/isakmpd/sysdep/openbsd-encap/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/openbsd-encap/GNUmakefile.sysdep
deleted file mode 100644
index 775b2cd215a..00000000000
--- a/sbin/isakmpd/sysdep/openbsd-encap/GNUmakefile.sysdep
+++ /dev/null
@@ -1,60 +0,0 @@
-#	$OpenBSD: GNUmakefile.sysdep,v 1.3 2001/02/24 04:42:49 angelos 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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Ericsson Radio Systems.
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# 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.
-#
-
-# Compile-time configuration of otherwise optional features
-FEATURES=	tripledes des blowfish cast policy x509 ec aggressive debug
-
-LIBGMP:=	/usr/lib/libgmp.a
-LIBDES:=	/usr/lib/libdes.a
-
-LDADD+=		-lgmp
-DPADD+=		${LIBGMP}
-
-IPSEC_SRCS=	pf_encap.c
-
-# XXX This test does not work as MACHINE_ARCH does not get defined by GNU make.
-# Furthermore these defines should not happen for neither mips, powerpc nor vax
-# just like alpha.
-#ifneq (${MACHINE_ARCH},alpha)
-#HAVE_DLOPEN=	defined
-#CFLAGS+=	-DSYMBOL_PREFIX='"_"'
-#endif
-
-USE_LIBCRYPTO=	defined
-
-ifndef USE_LIBCRYPTO
-DESLIB=		-ldes
-DESLIBDEP=	${LIBDES}
-endif
diff --git a/sbin/isakmpd/sysdep/openbsd-encap/Makefile.sysdep b/sbin/isakmpd/sysdep/openbsd-encap/Makefile.sysdep
deleted file mode 100644
index df92ed19e48..00000000000
--- a/sbin/isakmpd/sysdep/openbsd-encap/Makefile.sysdep
+++ /dev/null
@@ -1,57 +0,0 @@
-#	$OpenBSD: Makefile.sysdep,v 1.3 2001/02/24 04:42:49 angelos 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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Ericsson Radio Systems.
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# 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.
-#
-
-FEATURES+=	gmp tripledes des
-
-IPSEC_SRCS=	pf_encap.c
-
-# Some OpenBSD systems do not provide dlopen(3).
-.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "vax"
-HAVE_DLOPEN=	defined
-CFLAGS+=	-DSYMBOL_PREFIX='"_"'
-.endif
-
-#USE_LIBCRYPTO=	defined
-#USE_KEYNOTE=	defined
-
-.ifndef USE_LIBCRYPTO
-DESLIB=		-ldes
-DESLIBDEP=	${LIBDES}
-
-# The apps/ and regress/ subdirs are broken in the openbsd-encap environment
-# unless libcrypto is available (and even then they are not tested).
-SUBDIR:=	${SUBDIR:Napps}
-NO_REGRESS=	defined
-.endif
diff --git a/sbin/isakmpd/sysdep/openbsd-encap/sysdep-os.h b/sbin/isakmpd/sysdep/openbsd-encap/sysdep-os.h
deleted file mode 100644
index 70b7a0cd950..00000000000
--- a/sbin/isakmpd/sysdep/openbsd-encap/sysdep-os.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$OpenBSD: sysdep-os.h,v 1.2 2001/01/28 22:38:49 niklas Exp $	*/
-
-/*
- * Copyright (c) 1998, 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Ericsson Radio Systems.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * 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.
- */
-
-#ifndef _SYSDEP_OS_H_
-#define _SYSDEP_OS_H_
-
-/* We need socklen_t.  */
-typedef u_int32_t socklen_t;
-
-#endif /* _SYSDEP_OS_H_ */
diff --git a/sbin/isakmpd/sysdep/openbsd-encap/sysdep.c b/sbin/isakmpd/sysdep/openbsd-encap/sysdep.c
deleted file mode 100644
index e4f49cd789b..00000000000
--- a/sbin/isakmpd/sysdep/openbsd-encap/sysdep.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*	$OpenBSD: sysdep.c,v 1.7 2001/06/29 22:12:56 ho Exp $	*/
-
-/*
- * Copyright (c) 1998, 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Ericsson Radio Systems.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * 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.
- */
-
-#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"
-
-#ifdef USE_PF_KEY_V2
-#include "pf_key_v2.h"
-#define KEY_API(x) pf_key_v2_##x
-#else
-#include <net/encap.h>
-#include "pf_encap.h"
-#define KEY_API(x) pf_encap_##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 ()
-{
-  if (!regrand)
-    return arc4random ();
-  else
-    return random();
-}
-
-/* Return the basename of the command used to invoke us.  */
-char *
-sysdep_progname ()
-{
-  return __progname;
-}
-
-/* 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);
-}
-
-/* Force communication on socket FD to go in the clear.  */
-int
-sysdep_cleartext (int fd, int af)
-{
-  int level, int sw;
-  struct 
-  { 
-    int ip_proto;		/* IP protocol */
-    int auth_level;
-    int esp_trans_level;
-    int esp_network_level;
-  } optsw[] = 
-    { 
-      { IPPROTO_IP, IP_AUTH_LEVEL, IP_ESP_TRANS_LEVEL, IP_ESP_NETWORK_LEVEL },
-      { IPPROTO_IPV6, IPV6_AUTH_LEVEL, IPV6_ESP_TRANS_LEVEL,
-	IPV6_ESP_NETWORK_LEVEL },
-    };
-
-  if (app_none)
-    return 0;
-
-  switch (af)
-    {
-    case AF_INET:
-      sw = 0;
-      break;
-    case AF_INET6:
-      sw = 1;
-      break;
-    default:
-      log_print ("sysdep_cleartext: unsupported protocol family %d", af);
-      return -1;
-    }
-
-  /*
-   * Need to bypass system security policy, so I can send and
-   * receive key management datagrams in the clear.
-   */
-  level = IPSEC_LEVEL_BYPASS;
-  if (setsockopt (fd, optsw[sw].ip_proto, optsw[sw].auth_level, (char *)&level,
-		  sizeof level) == -1)
-    {
-      log_error ("sysdep_cleartext: "
-		 "setsockopt (%d, %d, IP_AUTH_LEVEL, ...) failed", fd,
-		 optsw[sw].ip_proto);
-      return -1;
-    }
-  if (setsockopt (fd, optsw[sw].ip_proto, optsw[sw].esp_trans_level,
-		  (char *)&level, sizeof level) == -1)
-    {
-      log_error ("sysdep_cleartext: "
-		 "setsockopt (%d, %d, IP_ESP_TRANS_LEVEL, ...) "
-		 "failed", fd, optsw[sw].ip_proto);
-      return -1;
-    }
-  if (setsockopt (fd, optsw[sw].ip_proto, optsw[sw].esp_network_level,
-		  (char *)&level, sizeof level) == -1)
-    {
-      log_error("sysdep_cleartext: "
-		"setsockopt (%d, %d, IP_ESP_NETWORK_LEVEL, ...) "
-		 "failed", fd, optsw[sw].ip_proto);
-      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
diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep.c b/sbin/isakmpd/sysdep/openbsd/sysdep.c
index 823e017a643..b2187a98a5f 100644
--- a/sbin/isakmpd/sysdep/openbsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/openbsd/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.12 2001/06/29 22:01:28 ho Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.13 2001/07/06 09:35:58 ho Exp $	*/
 /*	$EOM: sysdep.c,v 1.9 2000/12/04 04:46:35 angelos Exp $	*/
 
 /*
@@ -53,10 +53,6 @@
 #ifdef USE_PF_KEY_V2
 #include "pf_key_v2.h"
 #define KEY_API(x) pf_key_v2_##x
-#else
-#include <net/encap.h>
-#include "pf_encap.h"
-#define KEY_API(x) pf_encap_##x
 #endif
 
 #endif NEED_SYSDEP_APP