Initial support for MacOS X (v10.2 and later).

7 files changed, 438 insertions, 20 deletions

diff --git a/sbin/isakmpd/GNUmakefile b/sbin/isakmpd/GNUmakefile
index ffd524891ac..6e3ac7b0b02 100644
--- a/sbin/isakmpd/GNUmakefile
+++ b/sbin/isakmpd/GNUmakefile
@@ -1,4 +1,4 @@
-#    $OpenBSD: GNUmakefile,v 1.3 2002/06/09 08:13:06 todd Exp $
+#    $OpenBSD: GNUmakefile,v 1.4 2002/08/23 18:17:17 ho Exp $
 
 #
 # Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -41,14 +41,14 @@
 # produce similar behaviour.
 #
 
-# openbsd means 2.5 or newer, openbsd-encap is for older kernels with PF_ENCAP
-# linux is the name for Linux with FreeS/WAN integrated, freebsd/netbsd means
-# FreeBSD/NetBSD with KAME IPsec.
+# openbsd means 2.5 or newer, linux is the name for Linux with FreeS/WAN
+# integrated, freebsd/netbsd means FreeBSD/NetBSD with KAME IPsec.
+# darwin means MacOS X 10.2 and later with KAME IPsec.
 OS=		openbsd
-#OS=		openbsd-encap
 #OS=		netbsd
 #OS=		freebsd
 #OS=		linux
+#OS=		darwin
 
 .CURDIR:=	$(shell pwd)
 VPATH=		${.CURDIR}/sysdep/${OS}
@@ -65,12 +65,11 @@ endif
 SRCS=		app.c attribute.c cert.c connection.c \
 		constants.c conf.c cookie.c crypto.c dh.c doi.c exchange.c \
 		exchange_num.c field.c gmp_util.c hash.c if.c ike_auth.c \
-		ike_aggressive.c ike_main_mode.c ike_phase_1.c \
-		ike_quick_mode.c init.c ipsec.c ipsec_fld.c ipsec_num.c \
-		isakmpd.c isakmp_doi.c isakmp_fld.c isakmp_num.c libcrypto.c \
-		log.c message.c math_2n.c math_ec2n.c math_group.c \
-		prf.c sa.c sysdep.c timer.c transport.c udp.c ui.c \
-		util.c
+		ike_main_mode.c ike_phase_1.c ike_quick_mode.c init.c \
+		ipsec.c ipsec_fld.c ipsec_num.c isakmpd.c isakmp_doi.c \
+		isakmp_fld.c isakmp_num.c key.c libcrypto.c log.c message.c \
+		math_2n.c math_group.c prf.c sa.c sysdep.c timer.c \
+		transport.c udp.c ui.c util.c
 
 GENERATED=	exchange_num.h ipsec_fld.h ipsec_num.h isakmp_fld.h \
 		isakmp_num.h
@@ -156,12 +155,6 @@ FEATURES_UC=	$(shell echo ${FEATURES} | tr '[:lower:]' '[:upper:]')
 CFLAGS+=	$(foreach F, ${FEATURES_UC}, -DUSE_${F})
 -include	$(foreach F, ${FEATURES}, features/${F})
 
-ifdef HAVE_DLOPEN
-X509=		x509.c
-CFLAGS+=	-DHAVE_DLOPEN
-SRCS+=		dyn.c
-endif
-
 ifdef USE_KEYNOTE
 USE_LIBCRYPTO=	yes
 LDADD+=		-lkeynote -lm
@@ -177,7 +170,13 @@ LDADD+=		-lcrypto
 DPADD+=		${LIBCRYPTO}
 endif
 
-SRCS+=		${IPSEC_SRCS} ${X509} ${POLICY}
+ifdef USE_RAWKEY
+USE_LIBCRYPTO=  yes
+CFLAGS+=        -DUSE_RAWKEY
+endif
+
+SRCS+=		${IPSEC_SRCS} ${X509} ${POLICY} ${EC} ${AGGRESSIVE} ${DNSSEC} \
+		$(ISAKMP_CFG)
 CFLAGS+=	${IPSEC_CFLAGS}
 LDADD+=		${DESLIB}
 DPADD+=		${DESLIBDEP}
diff --git a/sbin/isakmpd/crypto.h b/sbin/isakmpd/crypto.h
index c15fcdd05b6..69fc36015df 100644
--- a/sbin/isakmpd/crypto.h
+++ b/sbin/isakmpd/crypto.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto.h,v 1.5 2002/06/09 08:13:06 todd Exp $	*/
+/*	$OpenBSD: crypto.h,v 1.6 2002/08/23 18:17:17 ho Exp $	*/
 /*	$EOM: crypto.h,v 1.12 2000/10/15 21:56:41 niklas Exp $	*/
 
 /*
@@ -37,6 +37,18 @@
 #ifndef _CRYPTO_H_
 #define _CRYPTO_H_
 
+#if defined (__APPLE__)
+
+#include <openssl/des.h>
+#ifdef USE_BLOWFISH
+#include <openssl/blowfish.h>
+#endif
+#ifdef USE_CAST
+#include <openssl/cast.h>
+#endif
+
+#else
+
 #include <des.h>
 #ifdef USE_BLOWFISH
 #include <blf.h>
@@ -45,6 +57,8 @@
 #include <cast.h>
 #endif
 
+#endif /* __APPLE__ */
+
 #define USE_32BIT
 #if defined (USE_64BIT)
 
diff --git a/sbin/isakmpd/hash.c b/sbin/isakmpd/hash.c
index c0a2b12c508..862e2675a3b 100644
--- a/sbin/isakmpd/hash.c
+++ b/sbin/isakmpd/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.9 2002/06/09 08:13:06 todd Exp $	*/
+/*	$OpenBSD: hash.c,v 1.10 2002/08/23 18:17:17 ho Exp $	*/
 /*	$EOM: hash.c,v 1.10 1999/04/17 23:20:34 niklas Exp $	*/
 
 /*
@@ -37,8 +37,13 @@
 
 #include <sys/param.h>
 #include <string.h>
+#if defined (__APPLE__)
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#else
 #include <md5.h>
 #include <sha1.h>
+#endif /* __APPLE__ */
 
 #include "sysdep.h"
 
diff --git a/sbin/isakmpd/sysdep/darwin/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/darwin/GNUmakefile.sysdep
new file mode 100644
index 00000000000..7135180e035
--- /dev/null
+++ b/sbin/isakmpd/sysdep/darwin/GNUmakefile.sysdep
@@ -0,0 +1,53 @@
+#	$OpenBSD: GNUmakefile.sysdep,v 1.1 2002/08/23 18:17:17 ho Exp $
+
+#
+# Copyright (c) 1999,2002 Håkan Olsson.  All rights reserved.
+# 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.
+#
+
+LDADD+=		-lipsec
+
+# gcc under MacOS X does not seem to like building things -static
+LDSTATIC=	
+
+CFLAGS+=	-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL -DHAVE_GETNAMEINFO
+CFLAGS+=	-DHAVE_GETIFADDRS
+
+FEATURES=	debug tripledes des blowdish cast ec aggressive x509
+FEATURES+=	rawkey isakmp_cfg	
+# Not yet
+#FEATURES+=	policy
+
+IPSEC_SRCS=	pf_key_v2.c
+IPSEC_CFLAGS=	-DUSE_PF_KEY_V2
+
+USE_LIBCRYPTO=	defined
diff --git a/sbin/isakmpd/sysdep/darwin/Makefile.sysdep b/sbin/isakmpd/sysdep/darwin/Makefile.sysdep
new file mode 100644
index 00000000000..bdf666e5825
--- /dev/null
+++ b/sbin/isakmpd/sysdep/darwin/Makefile.sysdep
@@ -0,0 +1,51 @@
+#	$OpenBSD: Makefile.sysdep,v 1.1 2002/08/23 18:17:17 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.
+# 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 INN 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.
+#
+
+# Override default features
+FEATURES=	tripledes des blowfish cast x509 ec aggressive debug
+FEATURES+=	rawkey isakmp_cfg
+
+LDADD+=		-lipsec
+
+CFLAGS+=	-DHAVE_GETNAMEINFO -DHAVE_GETIFADDRS \
+		-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL
+
+IPSEC_SRCS=	pf_key_v2.c
+IPSEC_CFLAGS=	-DUSE_PF_KEY_V2
+
+USE_LIBCRYPTO=	defined
+
+obj:
+	mkdir obj
diff --git a/sbin/isakmpd/sysdep/darwin/sysdep-os.h b/sbin/isakmpd/sysdep/darwin/sysdep-os.h
new file mode 100644
index 00000000000..550aecd70fd
--- /dev/null
+++ b/sbin/isakmpd/sysdep/darwin/sysdep-os.h
@@ -0,0 +1,78 @@
+/*	$OpenBSD: sysdep-os.h,v 1.1 2002/08/23 18:17:17 ho Exp $	*/
+
+/*
+ * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2002 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.
+ * 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_
+
+#define KAME
+
+#include <netinet6/ipsec.h>
+
+typedef u_int32_t socklen_t;
+
+#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
+
+#if 1
+/* OpenSSL differs from OpenBSD very slightly... */
+
+#define MD5Init MD5_Init
+#define MD5Update MD5_Update
+#define MD5Final MD5_Final
+
+#define SHA1Init SHA1_Init
+#define SHA1Update SHA1_Update
+#define SHA1Final SHA1_Final
+#define SHA1_CTX SHA_CTX
+
+#define cast_key CAST_KEY
+#define cast_setkey(k, d, l) CAST_set_key ((k), (l), (d))
+#define cast_encrypt(k, i, o) do { \
+  memcpy ((o), (i), BLOCKSIZE); \
+  CAST_encrypt ((CAST_LONG *)(o), (k)); \
+} while (0)
+#define cast_decrypt(k, i, o) do { \
+  memcpy ((o), (i), BLOCKSIZE); \
+  CAST_decrypt ((CAST_LONG *)(o), (k)); \
+} while (0)
+#endif
+
+#endif /* _SYSDEP_OS_H_ */
diff --git a/sbin/isakmpd/sysdep/darwin/sysdep.c b/sbin/isakmpd/sysdep/darwin/sysdep.c
new file mode 100644
index 00000000000..26b087a8fbf
--- /dev/null
+++ b/sbin/isakmpd/sysdep/darwin/sysdep.c
@@ -0,0 +1,218 @@
+/*	$OpenBSD: sysdep.c,v 1.1 2002/08/23 18:17:17 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
+#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 random();
+}
+
+/* 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)
+{
+  return sa->sa_len;
+}
+
+/* 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)
+{
+  char *buf;
+  char *policy[] = { "in bypass", "out bypass", NULL };
+  char **p;
+  int ipp;
+
+  if (app_none)
+    return 0;
+
+  switch (af)
+    {
+    case AF_INET:
+      ipp = IPPROTO_IP;
+      break;
+    case AF_INET6:
+      ipp = IPPROTO_IPV6;
+      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.
+   */
+
+  for (p = policy; p && *p; p++)
+    {
+      buf = ipsec_set_policy (*p, strlen(*p));
+      if (buf == NULL)
+	{
+	  log_error ("sysdep_cleartext: %s: %s", *p, ipsec_strerror());
+	  return -1;
+	}
+
+      if (setsockopt(fd, ipp, IP_IPSEC_POLICY, buf,
+		     ipsec_get_policylen(buf)) < 0)
+	{
+	  log_error ("sysdep_cleartext: "
+		     "setsockopt (%d, IPPROTO_IP, IP_IPSEC_POLICY, ...) failed",
+		     fd);
+	  return -1;
+	}
+      free(buf);
+    }
+
+  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