ec and privsep always on

3 files changed, 8 insertions, 66 deletions

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 0447a1f001e..9db0922e988 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.64 2005/04/08 16:37:14 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.65 2005/04/08 16:41:54 deraadt Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -44,10 +44,10 @@ OS=		openbsd
 #OS=		bsdi
 
 # Compile-time configuration of otherwise optional features
-#FEATURES+=	policy ec aggressive debug gmp
-#FEATURES+=	rawkey isakmp_cfg dnssec privsep dpd
-FEATURES+=	policy ec aggressive debug
-FEATURES+=	rawkey isakmp_cfg privsep dpd
+#FEATURES+=	policy aggressive debug gmp
+#FEATURES+=	rawkey isakmp_cfg dnssec dpd
+FEATURES+=	policy aggressive debug
+FEATURES+=	rawkey isakmp_cfg dpd
 
 .PATH:		${.CURDIR}/sysdep/${OS}
 
@@ -150,8 +150,9 @@ LDADD+=		-ldes
 DPADD+=		${LIBDES}
 .endif
 
-SRCS+=		${IPSEC_SRCS} ${POLICY} ${EC} ${AGGRESSIVE} ${DNSSEC} \
-		${ISAKMP_CFG} ${PRIVSEP} ${DPD} nat_traversal.c udp_encap.c
+SRCS+=		${IPSEC_SRCS} ${POLICY} math_ec2n.c ${AGGRESSIVE} ${DNSSEC} \
+		${ISAKMP_CFG} ${DPD} monitor.c monitor_fdpass.c \
+		nat_traversal.c udp_encap.c
 CFLAGS+=	${IPSEC_CFLAGS} ${DNSSEC_CFLAGS}
 
 LDADD+=		${DESLIB} ${LWRESLIB}
diff --git a/sbin/isakmpd/features/ec b/sbin/isakmpd/features/ec
deleted file mode 100644
index 6452a8e576b..00000000000
--- a/sbin/isakmpd/features/ec
+++ /dev/null
@@ -1,32 +0,0 @@
-#	$OpenBSD: ec,v 1.4 2003/06/03 14:29:41 ho Exp $
-#	$EOM: ec,v 1.3 2000/02/20 16:38:15 niklas Exp $
-
-#
-# Copyright (c) 2000 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 Wireless Networks Inc.
-#
-
-EC=		math_ec2n.c
diff --git a/sbin/isakmpd/features/privsep b/sbin/isakmpd/features/privsep
deleted file mode 100644
index 20690a09508..00000000000
--- a/sbin/isakmpd/features/privsep
+++ /dev/null
@@ -1,27 +0,0 @@
-#	$OpenBSD: privsep,v 1.2 2003/06/03 14:29:41 ho Exp $
-
-#
-# Copyright (c) 2003 Håkan Olsson.  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.
-#
-
-PRIVSEP=		monitor.c monitor_fdpass.c