diff options
author | Hakan Olsson <ho@cvs.openbsd.org> | 2003-05-14 20:49:38 +0000 |
---|---|---|
committer | Hakan Olsson <ho@cvs.openbsd.org> | 2003-05-14 20:49:38 +0000 |
commit | e469ab1e91029867b5504f2442f9c2eb9075ce3a (patch) | |
tree | 59480200e1acadbc3987d361c042f772545196f3 /sbin/isakmpd | |
parent | 9620beffc361fc69278b095f4d3cf19fb617d3e4 (diff) |
Call the FreeS/WAN sysdep 'freeswan'. The 'linux' sysdep will be native Linux IPSec.
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r-- | sbin/isakmpd/GNUmakefile | 6 | ||||
-rw-r--r-- | sbin/isakmpd/Makefile | 6 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/freeswan/GNUmakefile.sysdep (renamed from sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep) | 2 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/freeswan/Makefile.sysdep (renamed from sbin/isakmpd/sysdep/linux/Makefile.sysdep) | 2 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/freeswan/README | 16 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/freeswan/klips.c (renamed from sbin/isakmpd/sysdep/linux/klips.c) | 2 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/freeswan/klips.h (renamed from sbin/isakmpd/sysdep/linux/klips.h) | 2 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/freeswan/sys/queue.h (renamed from sbin/isakmpd/sysdep/linux/sys/queue.h) | 2 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/freeswan/sysdep-os.h (renamed from sbin/isakmpd/sysdep/linux/sysdep-os.h) | 2 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/freeswan/sysdep.c (renamed from sbin/isakmpd/sysdep/linux/sysdep.c) | 2 | ||||
-rw-r--r-- | sbin/isakmpd/sysdep/linux/README | 17 |
11 files changed, 31 insertions, 28 deletions
diff --git a/sbin/isakmpd/GNUmakefile b/sbin/isakmpd/GNUmakefile index 6e3ac7b0b02..228e6897034 100644 --- a/sbin/isakmpd/GNUmakefile +++ b/sbin/isakmpd/GNUmakefile @@ -1,4 +1,4 @@ -# $OpenBSD: GNUmakefile,v 1.4 2002/08/23 18:17:17 ho Exp $ +# $OpenBSD: GNUmakefile,v 1.5 2003/05/14 20:49:36 ho Exp $ # # Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -41,13 +41,13 @@ # produce similar behaviour. # -# openbsd means 2.5 or newer, linux is the name for Linux with FreeS/WAN +# openbsd means 2.5 or newer, freeswan 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= netbsd #OS= freebsd -#OS= linux +#OS= freeswan #OS= darwin .CURDIR:= $(shell pwd) diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile index ac9e35cf432..145ae0b11b8 100644 --- a/sbin/isakmpd/Makefile +++ b/sbin/isakmpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2002/06/10 18:08:58 ho Exp $ +# $OpenBSD: Makefile,v 1.47 2003/05/14 20:49:36 ho Exp $ # $EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $ # @@ -41,12 +41,12 @@ # may provide this make variant as "pmake" or maybe "bsdmake". # -# openbsd means OpenBSD 2.5 or newer. linux is the name for Linux with +# openbsd means OpenBSD 2.5 or newer. freeswan is the name for Linux with # FreeS/WAN integrated, freebsd/netbsd means FreeBSD/NetBSD with KAME IPsec. OS= openbsd #OS= netbsd #OS= freebsd -#OS= linux +#OS= freeswan #OS= bsdi # Compile-time configuration of otherwise optional features diff --git a/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/freeswan/GNUmakefile.sysdep index 92c2cfb1e07..814ad8b1d18 100644 --- a/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep +++ b/sbin/isakmpd/sysdep/freeswan/GNUmakefile.sysdep @@ -1,4 +1,4 @@ -# $OpenBSD: GNUmakefile.sysdep,v 1.4 2002/06/10 18:08:59 ho Exp $ +# $OpenBSD: GNUmakefile.sysdep,v 1.1 2003/05/14 20:49:37 ho Exp $ # # Copyright (c) 1999 Niklas Hallqvist. All rights reserved. diff --git a/sbin/isakmpd/sysdep/linux/Makefile.sysdep b/sbin/isakmpd/sysdep/freeswan/Makefile.sysdep index b4f6a37a319..cf7c436d2c5 100644 --- a/sbin/isakmpd/sysdep/linux/Makefile.sysdep +++ b/sbin/isakmpd/sysdep/freeswan/Makefile.sysdep @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sysdep,v 1.3 2002/06/10 18:08:59 ho Exp $ +# $OpenBSD: Makefile.sysdep,v 1.1 2003/05/14 20:49:37 ho Exp $ # # Copyright (c) 1999 Niklas Hallqvist. All rights reserved. diff --git a/sbin/isakmpd/sysdep/freeswan/README b/sbin/isakmpd/sysdep/freeswan/README new file mode 100644 index 00000000000..3990ab3e2e4 --- /dev/null +++ b/sbin/isakmpd/sysdep/freeswan/README @@ -0,0 +1,16 @@ +$OpenBSD: README,v 1.1 2003/05/14 20:49:37 ho Exp $ + +Currently, you have to manually configure any IPsec interfaces and do the +association betweent these and the physical ones. This is done like +this in FreeS/WAN: + +ipsec tncfg --attach --virtual ipsec0 --physical eth0 +ifconfig ipsec0 A.B.C.D netmask E.F.G.H + +Then there is one special configuration option in the IPsec-connection +sections for Phase 2 of the configuration file, named Next-hop, which +should be set to the next hop's IP address along the way to the peer: + +Next-hop= I.J.K.L + +This is specific to the way FreeS/WAN works. diff --git a/sbin/isakmpd/sysdep/linux/klips.c b/sbin/isakmpd/sysdep/freeswan/klips.c index 1393629ba2c..716f9ecba83 100644 --- a/sbin/isakmpd/sysdep/linux/klips.c +++ b/sbin/isakmpd/sysdep/freeswan/klips.c @@ -1,4 +1,4 @@ -/* $OpenBSD: klips.c,v 1.9 2002/06/09 08:13:07 todd Exp $ */ +/* $OpenBSD: klips.c,v 1.1 2003/05/14 20:49:37 ho Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. diff --git a/sbin/isakmpd/sysdep/linux/klips.h b/sbin/isakmpd/sysdep/freeswan/klips.h index 80536fd95cd..3b39c4754c7 100644 --- a/sbin/isakmpd/sysdep/linux/klips.h +++ b/sbin/isakmpd/sysdep/freeswan/klips.h @@ -1,4 +1,4 @@ -/* $OpenBSD: klips.h,v 1.3 2001/02/24 03:59:57 angelos Exp $ */ +/* $OpenBSD: klips.h,v 1.1 2003/05/14 20:49:37 ho Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. diff --git a/sbin/isakmpd/sysdep/linux/sys/queue.h b/sbin/isakmpd/sysdep/freeswan/sys/queue.h index eb35990304c..8d053d96662 100644 --- a/sbin/isakmpd/sysdep/linux/sys/queue.h +++ b/sbin/isakmpd/sysdep/freeswan/sys/queue.h @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.h,v 1.4 2002/06/09 08:13:07 todd Exp $ */ +/* $OpenBSD: queue.h,v 1.1 2003/05/14 20:49:37 ho Exp $ */ /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ /* diff --git a/sbin/isakmpd/sysdep/linux/sysdep-os.h b/sbin/isakmpd/sysdep/freeswan/sysdep-os.h index bdf9e25a979..bb9aa6cc991 100644 --- a/sbin/isakmpd/sysdep/linux/sysdep-os.h +++ b/sbin/isakmpd/sysdep/freeswan/sysdep-os.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysdep-os.h,v 1.5 2002/02/16 21:27:35 millert Exp $ */ +/* $OpenBSD: sysdep-os.h,v 1.1 2003/05/14 20:49:37 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. diff --git a/sbin/isakmpd/sysdep/linux/sysdep.c b/sbin/isakmpd/sysdep/freeswan/sysdep.c index b51ed820010..e97f4bfad4e 100644 --- a/sbin/isakmpd/sysdep/linux/sysdep.c +++ b/sbin/isakmpd/sysdep/freeswan/sysdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysdep.c,v 1.11 2002/06/09 08:13:07 todd Exp $ */ +/* $OpenBSD: sysdep.c,v 1.1 2003/05/14 20:49:37 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. diff --git a/sbin/isakmpd/sysdep/linux/README b/sbin/isakmpd/sysdep/linux/README index aa1ebc6199d..b33848300c1 100644 --- a/sbin/isakmpd/sysdep/linux/README +++ b/sbin/isakmpd/sysdep/linux/README @@ -1,16 +1,3 @@ -$OpenBSD: README,v 1.3 2001/06/27 03:31:44 angelos Exp $ +$OpenBSD: README,v 1.4 2003/05/14 20:49:37 ho Exp $ -Currently, you have to manually configure any IPsec interfaces and do the -association betweent these and the physical ones. This is done like -this in FreeS/WAN: - -ipsec tncfg --attach --virtual ipsec0 --physical eth0 -ifconfig ipsec0 A.B.C.D netmask E.F.G.H - -Then there is one special configuration option in the IPsec-connection -sections for Phase 2 of the configuration file, named Next-hop, which -should be set to the next hop's IP address along the way to the peer: - -Next-hop= I.J.K.L - -This is specific to the way FreeS/WAN works. +Eventually, this sysdep directory will contain support for Linux IPSec. |