diff options
| -rw-r--r-- | sbin/isakmpd/Makefile | 3 | ||||
| -rw-r--r-- | sbin/isakmpd/sysdep/bsdi/GNUmakefile.sysdep | 67 | ||||
| -rw-r--r-- | sbin/isakmpd/sysdep/bsdi/Makefile.sysdep | 77 | ||||
| -rw-r--r-- | sbin/isakmpd/sysdep/bsdi/sysdep-os.h | 52 | ||||
| -rw-r--r-- | sbin/isakmpd/sysdep/bsdi/sysdep.c | 195 |
5 files changed, 393 insertions, 1 deletions
diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile index 531fbd33a29..2cfff5f9da8 100644 --- a/sbin/isakmpd/Makefile +++ b/sbin/isakmpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2001/03/22 15:16:44 markus Exp $ +# $OpenBSD: Makefile,v 1.34 2001/03/23 16:14:34 markus Exp $ # $EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $ # @@ -49,6 +49,7 @@ OS= openbsd #OS= netbsd #OS= freebsd #OS= linux +#OS= bsdi # Compile-time configuration of otherwise optional features #FEATURES= tripledes des blowfish cast policy x509 ec aggressive debug gmp diff --git a/sbin/isakmpd/sysdep/bsdi/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/bsdi/GNUmakefile.sysdep new file mode 100644 index 00000000000..35630dd1d19 --- /dev/null +++ b/sbin/isakmpd/sysdep/bsdi/GNUmakefile.sysdep @@ -0,0 +1,67 @@ +# $OpenBSD: GNUmakefile.sysdep,v 1.1 2001/03/23 16:14:35 markus Exp $ +# +# XXX UNTESTED + +# +# Copyright (c) 1999 Niklas Hallqvist. All rights reserved. +# Copyright (c) 2000 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. 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. +# + +LIBGMP:= +LIBCRYPTO:= /usr/contrib/lib/libcrypto.a + +LIBSYSDEPDIR:= ${.CURDIR}/sysdep/common/libsysdep +LIBSYSDEP:= ${LIBSYSDEPDIR}/libsysdep.a + +LDADD+= ${LIBGMP} ${LIBSYSDEP} +DPADD+= ${LIBGMP} ${LIBSYSDEP} + +FEATURES= debug tripledes blowfish cast ec aggressive +# Not yet +#FEATURES+= policy x509 + +CFLAGS+= -DNO_RSA -DNO_RC5 -DNO_IDEA \ + -I${.CURDIR}/sysdep/common -I/usr/contrib/include \ + +IPSEC_SRCS= pf_key_v2.c +IPSEC_CFLAGS= -DUSE_PF_KEY_V2 + +USE_LIBCRYPTO= defined +#HAVE_DLOPEN= defined + +# +# hack libsysdep.a dependency +# +${LIBSYSDEPDIR}/.depend ${LIBSYSDEP}: + @cd ${LIBSYSDEPDIR} && \ + ${MAKE} --no-print-directory ${MAKEFLAGS} \ + CFLAGS="${CFLAGS}" MKDEP="${MKDEP}" ${MAKECMDGOALS} + +depend: ${LIBSYSDEPDIR}/.depend + +ifeq ($(findstring clean, $(MAKECMDGOALS)), clean) +SUBDIR+= sysdep/common/libsysdep +MAKEFLAGS+= --no-print-directory +endif diff --git a/sbin/isakmpd/sysdep/bsdi/Makefile.sysdep b/sbin/isakmpd/sysdep/bsdi/Makefile.sysdep new file mode 100644 index 00000000000..1b3e2745fc5 --- /dev/null +++ b/sbin/isakmpd/sysdep/bsdi/Makefile.sysdep @@ -0,0 +1,77 @@ +# $OpenBSD: Makefile.sysdep,v 1.1 2001/03/23 16:14:35 markus Exp $ + +# +# Copyright (c) 1999 Niklas Hallqvist. All rights reserved. +# Copyright (c) 2000 H\xe5kan Olsson. All rights reserved. +# Copyright (c) 2001 Markus Friedl. 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. 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. +# + +# Override default features +FEATURES= tripledes des blowfish cast ec aggressive debug x509 +# Not yet +#FEATURES+= policy +FEATURES+= policy + +LIBCRYPTO= /usr/contrib/lib/libcrypto.a +LIBSYSDEPDIR= ${.CURDIR}/sysdep/common/libsysdep + +LDADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a -lipsec +DPADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a ${LIBIPSEC} + +.if exists(/usr/build/kame/bsdi4/sys/net/pfkeyv2.h) +CFLAGS+= -I/usr/build/kame/bsdi4/sys +.endif + +.if exists(/usr/build/keynote/keynote.h) +CFLAGS+= -I/usr/build/keynote +LDFLAGS+= -L/usr/build/keynote +.endif + +CFLAGS+= -DNO_IDEA -DNO_RC5 \ + -I${.CURDIR}/sysdep/common +CFLAGS+= -I/usr/include -I/usr/contrib/include + +LDADD+= -L/usr/contrib/lib + +IPSEC_SRCS= pf_key_v2.c +IPSEC_CFLAGS= -DUSE_PF_KEY_V2 + +USE_LIBCRYPTO= defined +USE_GMP= defined +USE_KEYNOTE= defined + +# This is a hack in order to make sure libsysdep is built before the +# linkstage of isakmpd. As a side effect the link is always done even if +# not necessary. Well, I just don't care. +GENERATED+= sysdep-target +sysdep-target: + cd ${.CURDIR}/sysdep/common/libsysdep; ${MAKE} ${.MAKEFLAGS} + +.if make(clean) || make(cleandir) +SUBDIR+= sysdep/common/libsysdep +.endif + +# Kludge around bug in /usr/share/mk/bsd.subdir.mk +NO_REGRESS= defined diff --git a/sbin/isakmpd/sysdep/bsdi/sysdep-os.h b/sbin/isakmpd/sysdep/bsdi/sysdep-os.h new file mode 100644 index 00000000000..8af4aec299c --- /dev/null +++ b/sbin/isakmpd/sysdep/bsdi/sysdep-os.h @@ -0,0 +1,52 @@ +/* $OpenBSD: sysdep-os.h,v 1.1 2001/03/23 16:14:35 markus Exp $ */ + +/* + * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 2000 H\xe5kan Olsson. All rights reserved. + * Copyright (c) 2001 Markus Friedl. 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. 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. + */ + +#ifndef _SYSDEP_OS_H_ + +#define _SYSDEP_OS_H_ + +#define KAME + +#include <netinet6/ipsec.h> + +/* in_port_t */ +#include <netinet/in.h> + +#define timersub (tvp, uvp, vvp) \ + do { \ + (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ + (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ + if ((vvp)->tv_usec < 0) { \ + (vvp)->tv_sec--; \ + (vvp)->tv_usec += 1000000; \ + } \ + } while (0) + +#endif /* _SYSDEP_OS_H_ */ diff --git a/sbin/isakmpd/sysdep/bsdi/sysdep.c b/sbin/isakmpd/sysdep/bsdi/sysdep.c new file mode 100644 index 00000000000..c394a874699 --- /dev/null +++ b/sbin/isakmpd/sysdep/bsdi/sysdep.c @@ -0,0 +1,195 @@ +/* $OpenBSD: sysdep.c,v 1.1 2001/03/23 16:14:35 markus Exp $ */ + +/* + * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 2000 H\xe5kan 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. 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. + */ + +#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 () +{ + 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, + int srclen, struct sockaddr *dst, int dstlen, + 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, srclen, dst, dstlen, seq); +} + +/* Force communication on socket FD to go in the clear. */ +int +sysdep_cleartext (int fd) +{ + char *buf; + char *policy[] = { "in bypass", "out bypass", NULL }; + char **p; + + if (app_none) + return 0; + + /* + * 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, IPPROTO_IP, 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) +{ + if (app_none) + return 0; + return KEY_API (set_spi) (sa, proto, incoming); +} +#endif |