125 files changed, 10 insertions, 10 deletions

diff --git a/src/libfreeswan/libfreeswan/.cvsignore b/src/libfreeswan/freeswan/.cvsignore
index 49cc19caa..49cc19caa 100644
--- a/src/libfreeswan/libfreeswan/.cvsignore
+++ b/src/libfreeswan/freeswan/.cvsignore
diff --git a/src/libfreeswan/libfreeswan/Makefile b/src/libfreeswan/freeswan/Makefile
index 50a98b40d..50a98b40d 100644
--- a/src/libfreeswan/libfreeswan/Makefile
+++ b/src/libfreeswan/freeswan/Makefile
diff --git a/src/libfreeswan/libfreeswan/Makefile.objs b/src/libfreeswan/freeswan/Makefile.objs
index 41a89dba9..41a89dba9 100644
--- a/src/libfreeswan/libfreeswan/Makefile.objs
+++ b/src/libfreeswan/freeswan/Makefile.objs
diff --git a/src/libfreeswan/libfreeswan/addrtoa.c b/src/libfreeswan/freeswan/addrtoa.c
index b1cc038ed..b1cc038ed 100644
--- a/src/libfreeswan/libfreeswan/addrtoa.c
+++ b/src/libfreeswan/freeswan/addrtoa.c
diff --git a/src/libfreeswan/libfreeswan/addrtot.c b/src/libfreeswan/freeswan/addrtot.c
index f229789f0..f229789f0 100644
--- a/src/libfreeswan/libfreeswan/addrtot.c
+++ b/src/libfreeswan/freeswan/addrtot.c
diff --git a/src/libfreeswan/libfreeswan/addrtypeof.c b/src/libfreeswan/freeswan/addrtypeof.c
index e63509911..e63509911 100644
--- a/src/libfreeswan/libfreeswan/addrtypeof.c
+++ b/src/libfreeswan/freeswan/addrtypeof.c
diff --git a/src/libfreeswan/libfreeswan/anyaddr.3 b/src/libfreeswan/freeswan/anyaddr.3
index 4594a9ff9..4594a9ff9 100644
--- a/src/libfreeswan/libfreeswan/anyaddr.3
+++ b/src/libfreeswan/freeswan/anyaddr.3
diff --git a/src/libfreeswan/libfreeswan/anyaddr.c b/src/libfreeswan/freeswan/anyaddr.c
index 08aae6334..08aae6334 100644
--- a/src/libfreeswan/libfreeswan/anyaddr.c
+++ b/src/libfreeswan/freeswan/anyaddr.c
diff --git a/src/libfreeswan/libfreeswan/atoaddr.3 b/src/libfreeswan/freeswan/atoaddr.3
index a7dc8dca3..a7dc8dca3 100644
--- a/src/libfreeswan/libfreeswan/atoaddr.3
+++ b/src/libfreeswan/freeswan/atoaddr.3
diff --git a/src/libfreeswan/libfreeswan/atoaddr.c b/src/libfreeswan/freeswan/atoaddr.c
index 0c787b10d..0c787b10d 100644
--- a/src/libfreeswan/libfreeswan/atoaddr.c
+++ b/src/libfreeswan/freeswan/atoaddr.c
diff --git a/src/libfreeswan/libfreeswan/atoasr.3 b/src/libfreeswan/freeswan/atoasr.3
index 1bd805db1..1bd805db1 100644
--- a/src/libfreeswan/libfreeswan/atoasr.3
+++ b/src/libfreeswan/freeswan/atoasr.3
diff --git a/src/libfreeswan/libfreeswan/atoasr.c b/src/libfreeswan/freeswan/atoasr.c
index a68409bfb..a68409bfb 100644
--- a/src/libfreeswan/libfreeswan/atoasr.c
+++ b/src/libfreeswan/freeswan/atoasr.c
diff --git a/src/libfreeswan/libfreeswan/atosa.3 b/src/libfreeswan/freeswan/atosa.3
index 116483a73..116483a73 100644
--- a/src/libfreeswan/libfreeswan/atosa.3
+++ b/src/libfreeswan/freeswan/atosa.3
diff --git a/src/libfreeswan/libfreeswan/atosa.c b/src/libfreeswan/freeswan/atosa.c
index cc3b055d0..cc3b055d0 100644
--- a/src/libfreeswan/libfreeswan/atosa.c
+++ b/src/libfreeswan/freeswan/atosa.c
diff --git a/src/libfreeswan/libfreeswan/atosubnet.c b/src/libfreeswan/freeswan/atosubnet.c
index 9300c2895..9300c2895 100644
--- a/src/libfreeswan/libfreeswan/atosubnet.c
+++ b/src/libfreeswan/freeswan/atosubnet.c
diff --git a/src/libfreeswan/libfreeswan/atoul.3 b/src/libfreeswan/freeswan/atoul.3
index a606fa4a9..a606fa4a9 100644
--- a/src/libfreeswan/libfreeswan/atoul.3
+++ b/src/libfreeswan/freeswan/atoul.3
diff --git a/src/libfreeswan/libfreeswan/atoul.c b/src/libfreeswan/freeswan/atoul.c
index e32a8cdab..e32a8cdab 100644
--- a/src/libfreeswan/libfreeswan/atoul.c
+++ b/src/libfreeswan/freeswan/atoul.c
diff --git a/src/libfreeswan/libfreeswan/copyright.c b/src/libfreeswan/freeswan/copyright.c
index 0e836f6c2..0e836f6c2 100644
--- a/src/libfreeswan/libfreeswan/copyright.c
+++ b/src/libfreeswan/freeswan/copyright.c
diff --git a/src/libfreeswan/libfreeswan/datatot.c b/src/libfreeswan/freeswan/datatot.c
index fbeb35fa9..fbeb35fa9 100644
--- a/src/libfreeswan/libfreeswan/datatot.c
+++ b/src/libfreeswan/freeswan/datatot.c
diff --git a/src/libfreeswan/libfreeswan/goodmask.3 b/src/libfreeswan/freeswan/goodmask.3
index 4a573e51e..4a573e51e 100644
--- a/src/libfreeswan/libfreeswan/goodmask.3
+++ b/src/libfreeswan/freeswan/goodmask.3
diff --git a/src/libfreeswan/libfreeswan/goodmask.c b/src/libfreeswan/freeswan/goodmask.c
index fe7a42335..fe7a42335 100644
--- a/src/libfreeswan/libfreeswan/goodmask.c
+++ b/src/libfreeswan/freeswan/goodmask.c
diff --git a/src/libfreeswan/libfreeswan/initaddr.3 b/src/libfreeswan/freeswan/initaddr.3
index b963f21cc..b963f21cc 100644
--- a/src/libfreeswan/libfreeswan/initaddr.3
+++ b/src/libfreeswan/freeswan/initaddr.3
diff --git a/src/libfreeswan/libfreeswan/initaddr.c b/src/libfreeswan/freeswan/initaddr.c
index c215f6bdf..c215f6bdf 100644
--- a/src/libfreeswan/libfreeswan/initaddr.c
+++ b/src/libfreeswan/freeswan/initaddr.c
diff --git a/src/libfreeswan/libfreeswan/initsaid.c b/src/libfreeswan/freeswan/initsaid.c
index 4790f6981..4790f6981 100644
--- a/src/libfreeswan/libfreeswan/initsaid.c
+++ b/src/libfreeswan/freeswan/initsaid.c
diff --git a/src/libfreeswan/libfreeswan/initsubnet.3 b/src/libfreeswan/freeswan/initsubnet.3
index 670f71778..670f71778 100644
--- a/src/libfreeswan/libfreeswan/initsubnet.3
+++ b/src/libfreeswan/freeswan/initsubnet.3
diff --git a/src/libfreeswan/libfreeswan/initsubnet.c b/src/libfreeswan/freeswan/initsubnet.c
index 75ca72f36..75ca72f36 100644
--- a/src/libfreeswan/libfreeswan/initsubnet.c
+++ b/src/libfreeswan/freeswan/initsubnet.c
diff --git a/src/libfreeswan/libfreeswan/internal.h b/src/libfreeswan/freeswan/internal.h
index 16ad78da0..16ad78da0 100644
--- a/src/libfreeswan/libfreeswan/internal.h
+++ b/src/libfreeswan/freeswan/internal.h
diff --git a/src/libfreeswan/libfreeswan/ipcomp.h b/src/libfreeswan/freeswan/ipcomp.h
index ed8095517..ed8095517 100644
--- a/src/libfreeswan/libfreeswan/ipcomp.h
+++ b/src/libfreeswan/freeswan/ipcomp.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_ah.h b/src/libfreeswan/freeswan/ipsec_ah.h
index e088288d3..e088288d3 100644
--- a/src/libfreeswan/libfreeswan/ipsec_ah.h
+++ b/src/libfreeswan/freeswan/ipsec_ah.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_alg.h b/src/libfreeswan/freeswan/ipsec_alg.h
index a393784b1..a393784b1 100644
--- a/src/libfreeswan/libfreeswan/ipsec_alg.h
+++ b/src/libfreeswan/freeswan/ipsec_alg.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_encap.h b/src/libfreeswan/freeswan/ipsec_encap.h
index 17cd69269..17cd69269 100644
--- a/src/libfreeswan/libfreeswan/ipsec_encap.h
+++ b/src/libfreeswan/freeswan/ipsec_encap.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_eroute.h b/src/libfreeswan/freeswan/ipsec_eroute.h
index 2ee2a10b8..2ee2a10b8 100644
--- a/src/libfreeswan/libfreeswan/ipsec_eroute.h
+++ b/src/libfreeswan/freeswan/ipsec_eroute.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_errs.h b/src/libfreeswan/freeswan/ipsec_errs.h
index f14b5e675..f14b5e675 100644
--- a/src/libfreeswan/libfreeswan/ipsec_errs.h
+++ b/src/libfreeswan/freeswan/ipsec_errs.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_esp.h b/src/libfreeswan/freeswan/ipsec_esp.h
index c7d5ea15d..c7d5ea15d 100644
--- a/src/libfreeswan/libfreeswan/ipsec_esp.h
+++ b/src/libfreeswan/freeswan/ipsec_esp.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_ipe4.h b/src/libfreeswan/freeswan/ipsec_ipe4.h
index 73b6ae899..73b6ae899 100644
--- a/src/libfreeswan/libfreeswan/ipsec_ipe4.h
+++ b/src/libfreeswan/freeswan/ipsec_ipe4.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_kversion.h b/src/libfreeswan/freeswan/ipsec_kversion.h
index 7bf56ac7f..7bf56ac7f 100644
--- a/src/libfreeswan/libfreeswan/ipsec_kversion.h
+++ b/src/libfreeswan/freeswan/ipsec_kversion.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_life.h b/src/libfreeswan/freeswan/ipsec_life.h
index 4cf270272..4cf270272 100644
--- a/src/libfreeswan/libfreeswan/ipsec_life.h
+++ b/src/libfreeswan/freeswan/ipsec_life.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_md5h.h b/src/libfreeswan/freeswan/ipsec_md5h.h
index 3fc54bc82..3fc54bc82 100644
--- a/src/libfreeswan/libfreeswan/ipsec_md5h.h
+++ b/src/libfreeswan/freeswan/ipsec_md5h.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_param.h b/src/libfreeswan/freeswan/ipsec_param.h
index 02b36e6a3..02b36e6a3 100644
--- a/src/libfreeswan/libfreeswan/ipsec_param.h
+++ b/src/libfreeswan/freeswan/ipsec_param.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_policy.h b/src/libfreeswan/freeswan/ipsec_policy.h
index 90b58ad52..90b58ad52 100644
--- a/src/libfreeswan/libfreeswan/ipsec_policy.h
+++ b/src/libfreeswan/freeswan/ipsec_policy.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_proto.h b/src/libfreeswan/freeswan/ipsec_proto.h
index 55f947512..55f947512 100644
--- a/src/libfreeswan/libfreeswan/ipsec_proto.h
+++ b/src/libfreeswan/freeswan/ipsec_proto.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_radij.h b/src/libfreeswan/freeswan/ipsec_radij.h
index 7776dd8e4..7776dd8e4 100644
--- a/src/libfreeswan/libfreeswan/ipsec_radij.h
+++ b/src/libfreeswan/freeswan/ipsec_radij.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_rcv.h b/src/libfreeswan/freeswan/ipsec_rcv.h
index 3ae239bf9..3ae239bf9 100644
--- a/src/libfreeswan/libfreeswan/ipsec_rcv.h
+++ b/src/libfreeswan/freeswan/ipsec_rcv.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_sa.h b/src/libfreeswan/freeswan/ipsec_sa.h
index 555df42d3..555df42d3 100644
--- a/src/libfreeswan/libfreeswan/ipsec_sa.h
+++ b/src/libfreeswan/freeswan/ipsec_sa.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_sha1.h b/src/libfreeswan/freeswan/ipsec_sha1.h
index 116170e6b..116170e6b 100644
--- a/src/libfreeswan/libfreeswan/ipsec_sha1.h
+++ b/src/libfreeswan/freeswan/ipsec_sha1.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_stats.h b/src/libfreeswan/freeswan/ipsec_stats.h
index e4be11d29..e4be11d29 100644
--- a/src/libfreeswan/libfreeswan/ipsec_stats.h
+++ b/src/libfreeswan/freeswan/ipsec_stats.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_tunnel.h b/src/libfreeswan/freeswan/ipsec_tunnel.h
index 3b25e95e1..3b25e95e1 100644
--- a/src/libfreeswan/libfreeswan/ipsec_tunnel.h
+++ b/src/libfreeswan/freeswan/ipsec_tunnel.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_xform.h b/src/libfreeswan/freeswan/ipsec_xform.h
index 1dc6b6083..1dc6b6083 100644
--- a/src/libfreeswan/libfreeswan/ipsec_xform.h
+++ b/src/libfreeswan/freeswan/ipsec_xform.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_xmit.h b/src/libfreeswan/freeswan/ipsec_xmit.h
index 033984886..033984886 100644
--- a/src/libfreeswan/libfreeswan/ipsec_xmit.h
+++ b/src/libfreeswan/freeswan/ipsec_xmit.h
diff --git a/src/libfreeswan/libfreeswan/keyblobtoid.3 b/src/libfreeswan/freeswan/keyblobtoid.3
index be381531a..be381531a 100644
--- a/src/libfreeswan/libfreeswan/keyblobtoid.3
+++ b/src/libfreeswan/freeswan/keyblobtoid.3
diff --git a/src/libfreeswan/libfreeswan/keyblobtoid.c b/src/libfreeswan/freeswan/keyblobtoid.c
index 7798601cf..7798601cf 100644
--- a/src/libfreeswan/libfreeswan/keyblobtoid.c
+++ b/src/libfreeswan/freeswan/keyblobtoid.c
diff --git a/src/libfreeswan/libfreeswan/optionsfrom.3 b/src/libfreeswan/freeswan/optionsfrom.3
index e270475bd..e270475bd 100644
--- a/src/libfreeswan/libfreeswan/optionsfrom.3
+++ b/src/libfreeswan/freeswan/optionsfrom.3
diff --git a/src/libfreeswan/libfreeswan/optionsfrom.c b/src/libfreeswan/freeswan/optionsfrom.c
index d96a3124d..d96a3124d 100644
--- a/src/libfreeswan/libfreeswan/optionsfrom.c
+++ b/src/libfreeswan/freeswan/optionsfrom.c
diff --git a/src/libfreeswan/libfreeswan/pfkey_v2_build.c b/src/libfreeswan/freeswan/pfkey_v2_build.c
index be58c552f..be58c552f 100644
--- a/src/libfreeswan/libfreeswan/pfkey_v2_build.c
+++ b/src/libfreeswan/freeswan/pfkey_v2_build.c
diff --git a/src/libfreeswan/libfreeswan/pfkey_v2_debug.c b/src/libfreeswan/freeswan/pfkey_v2_debug.c
index 2f2ddd3b1..2f2ddd3b1 100644
--- a/src/libfreeswan/libfreeswan/pfkey_v2_debug.c
+++ b/src/libfreeswan/freeswan/pfkey_v2_debug.c
diff --git a/src/libfreeswan/libfreeswan/pfkey_v2_ext_bits.c b/src/libfreeswan/freeswan/pfkey_v2_ext_bits.c
index fe3f45306..fe3f45306 100644
--- a/src/libfreeswan/libfreeswan/pfkey_v2_ext_bits.c
+++ b/src/libfreeswan/freeswan/pfkey_v2_ext_bits.c
diff --git a/src/libfreeswan/libfreeswan/pfkey_v2_parse.c b/src/libfreeswan/freeswan/pfkey_v2_parse.c
index 5d1f5a3d8..5d1f5a3d8 100644
--- a/src/libfreeswan/libfreeswan/pfkey_v2_parse.c
+++ b/src/libfreeswan/freeswan/pfkey_v2_parse.c
diff --git a/src/libfreeswan/libfreeswan/portof.3 b/src/libfreeswan/freeswan/portof.3
index fac0d8bc3..fac0d8bc3 100644
--- a/src/libfreeswan/libfreeswan/portof.3
+++ b/src/libfreeswan/freeswan/portof.3
diff --git a/src/libfreeswan/libfreeswan/portof.c b/src/libfreeswan/freeswan/portof.c
index d028ea034..d028ea034 100644
--- a/src/libfreeswan/libfreeswan/portof.c
+++ b/src/libfreeswan/freeswan/portof.c
diff --git a/src/libfreeswan/libfreeswan/prng.3 b/src/libfreeswan/freeswan/prng.3
index 51f19364f..51f19364f 100644
--- a/src/libfreeswan/libfreeswan/prng.3
+++ b/src/libfreeswan/freeswan/prng.3
diff --git a/src/libfreeswan/libfreeswan/prng.c b/src/libfreeswan/freeswan/prng.c
index e31836783..e31836783 100644
--- a/src/libfreeswan/libfreeswan/prng.c
+++ b/src/libfreeswan/freeswan/prng.c
diff --git a/src/libfreeswan/libfreeswan/radij.h b/src/libfreeswan/freeswan/radij.h
index 2a66093a0..2a66093a0 100644
--- a/src/libfreeswan/libfreeswan/radij.h
+++ b/src/libfreeswan/freeswan/radij.h
diff --git a/src/libfreeswan/libfreeswan/rangetoa.c b/src/libfreeswan/freeswan/rangetoa.c
index e63b432f8..e63b432f8 100644
--- a/src/libfreeswan/libfreeswan/rangetoa.c
+++ b/src/libfreeswan/freeswan/rangetoa.c
diff --git a/src/libfreeswan/libfreeswan/rangetosubnet.3 b/src/libfreeswan/freeswan/rangetosubnet.3
index 7d707545e..7d707545e 100644
--- a/src/libfreeswan/libfreeswan/rangetosubnet.3
+++ b/src/libfreeswan/freeswan/rangetosubnet.3
diff --git a/src/libfreeswan/libfreeswan/rangetosubnet.c b/src/libfreeswan/freeswan/rangetosubnet.c
index 048b10556..048b10556 100644
--- a/src/libfreeswan/libfreeswan/rangetosubnet.c
+++ b/src/libfreeswan/freeswan/rangetosubnet.c
diff --git a/src/libfreeswan/libfreeswan/sameaddr.3 b/src/libfreeswan/freeswan/sameaddr.3
index 71be10761..71be10761 100644
--- a/src/libfreeswan/libfreeswan/sameaddr.3
+++ b/src/libfreeswan/freeswan/sameaddr.3
diff --git a/src/libfreeswan/libfreeswan/sameaddr.c b/src/libfreeswan/freeswan/sameaddr.c
index efc40796e..efc40796e 100644
--- a/src/libfreeswan/libfreeswan/sameaddr.c
+++ b/src/libfreeswan/freeswan/sameaddr.c
diff --git a/src/libfreeswan/libfreeswan/satoa.c b/src/libfreeswan/freeswan/satoa.c
index 410fb8437..410fb8437 100644
--- a/src/libfreeswan/libfreeswan/satoa.c
+++ b/src/libfreeswan/freeswan/satoa.c
diff --git a/src/libfreeswan/libfreeswan/satot.c b/src/libfreeswan/freeswan/satot.c
index 927f4ca1f..927f4ca1f 100644
--- a/src/libfreeswan/libfreeswan/satot.c
+++ b/src/libfreeswan/freeswan/satot.c
diff --git a/src/libfreeswan/libfreeswan/subnetof.3 b/src/libfreeswan/freeswan/subnetof.3
index 1911e499f..1911e499f 100644
--- a/src/libfreeswan/libfreeswan/subnetof.3
+++ b/src/libfreeswan/freeswan/subnetof.3
diff --git a/src/libfreeswan/libfreeswan/subnetof.c b/src/libfreeswan/freeswan/subnetof.c
index 1b288c591..1b288c591 100644
--- a/src/libfreeswan/libfreeswan/subnetof.c
+++ b/src/libfreeswan/freeswan/subnetof.c
diff --git a/src/libfreeswan/libfreeswan/subnettoa.c b/src/libfreeswan/freeswan/subnettoa.c
index 36cad8b88..36cad8b88 100644
--- a/src/libfreeswan/libfreeswan/subnettoa.c
+++ b/src/libfreeswan/freeswan/subnettoa.c
diff --git a/src/libfreeswan/libfreeswan/subnettot.c b/src/libfreeswan/freeswan/subnettot.c
index 0385d25e5..0385d25e5 100644
--- a/src/libfreeswan/libfreeswan/subnettot.c
+++ b/src/libfreeswan/freeswan/subnettot.c
diff --git a/src/libfreeswan/libfreeswan/subnettypeof.c b/src/libfreeswan/freeswan/subnettypeof.c
index 6f44b2e4b..6f44b2e4b 100644
--- a/src/libfreeswan/libfreeswan/subnettypeof.c
+++ b/src/libfreeswan/freeswan/subnettypeof.c
diff --git a/src/libfreeswan/libfreeswan/ttoaddr.3 b/src/libfreeswan/freeswan/ttoaddr.3
index 5bf48d4b2..5bf48d4b2 100644
--- a/src/libfreeswan/libfreeswan/ttoaddr.3
+++ b/src/libfreeswan/freeswan/ttoaddr.3
diff --git a/src/libfreeswan/libfreeswan/ttoaddr.c b/src/libfreeswan/freeswan/ttoaddr.c
index efcb33e9f..efcb33e9f 100644
--- a/src/libfreeswan/libfreeswan/ttoaddr.c
+++ b/src/libfreeswan/freeswan/ttoaddr.c
diff --git a/src/libfreeswan/libfreeswan/ttodata.3 b/src/libfreeswan/freeswan/ttodata.3
index 98bbe4ab3..98bbe4ab3 100644
--- a/src/libfreeswan/libfreeswan/ttodata.3
+++ b/src/libfreeswan/freeswan/ttodata.3
diff --git a/src/libfreeswan/libfreeswan/ttodata.c b/src/libfreeswan/freeswan/ttodata.c
index e1bf7606a..e1bf7606a 100644
--- a/src/libfreeswan/libfreeswan/ttodata.c
+++ b/src/libfreeswan/freeswan/ttodata.c
diff --git a/src/libfreeswan/libfreeswan/ttoprotoport.c b/src/libfreeswan/freeswan/ttoprotoport.c
index 46321838c..46321838c 100644
--- a/src/libfreeswan/libfreeswan/ttoprotoport.c
+++ b/src/libfreeswan/freeswan/ttoprotoport.c
diff --git a/src/libfreeswan/libfreeswan/ttosa.3 b/src/libfreeswan/freeswan/ttosa.3
index bf918e108..bf918e108 100644
--- a/src/libfreeswan/libfreeswan/ttosa.3
+++ b/src/libfreeswan/freeswan/ttosa.3
diff --git a/src/libfreeswan/libfreeswan/ttosa.c b/src/libfreeswan/freeswan/ttosa.c
index aa2283694..aa2283694 100644
--- a/src/libfreeswan/libfreeswan/ttosa.c
+++ b/src/libfreeswan/freeswan/ttosa.c
diff --git a/src/libfreeswan/libfreeswan/ttosubnet.c b/src/libfreeswan/freeswan/ttosubnet.c
index 7f5cddb82..7f5cddb82 100644
--- a/src/libfreeswan/libfreeswan/ttosubnet.c
+++ b/src/libfreeswan/freeswan/ttosubnet.c
diff --git a/src/libfreeswan/libfreeswan/ttoul.3 b/src/libfreeswan/freeswan/ttoul.3
index 67d4bd34f..67d4bd34f 100644
--- a/src/libfreeswan/libfreeswan/ttoul.3
+++ b/src/libfreeswan/freeswan/ttoul.3
diff --git a/src/libfreeswan/libfreeswan/ttoul.c b/src/libfreeswan/freeswan/ttoul.c
index 9c6193c68..9c6193c68 100644
--- a/src/libfreeswan/libfreeswan/ttoul.c
+++ b/src/libfreeswan/freeswan/ttoul.c
diff --git a/src/libfreeswan/libfreeswan/ultoa.c b/src/libfreeswan/freeswan/ultoa.c
index 2c2644826..2c2644826 100644
--- a/src/libfreeswan/libfreeswan/ultoa.c
+++ b/src/libfreeswan/freeswan/ultoa.c
diff --git a/src/libfreeswan/libfreeswan/ultot.c b/src/libfreeswan/freeswan/ultot.c
index edffa4a2d..edffa4a2d 100644
--- a/src/libfreeswan/libfreeswan/ultot.c
+++ b/src/libfreeswan/freeswan/ultot.c
diff --git a/src/libfreeswan/libfreeswan/version.3 b/src/libfreeswan/freeswan/version.3
index 06c5f01e3..06c5f01e3 100644
--- a/src/libfreeswan/libfreeswan/version.3
+++ b/src/libfreeswan/freeswan/version.3
diff --git a/src/libfreeswan/libfreeswan/version.in.c b/src/libfreeswan/freeswan/version.in.c
index b3556f721..b3556f721 100644
--- a/src/libfreeswan/libfreeswan/version.in.c
+++ b/src/libfreeswan/freeswan/version.in.c
diff --git a/src/libfreeswan/libdes/.cvsignore b/src/libfreeswan/libcrypto/libdes/.cvsignore
index e06b80457..e06b80457 100644
--- a/src/libfreeswan/libdes/.cvsignore
+++ b/src/libfreeswan/libcrypto/libdes/.cvsignore
diff --git a/src/libfreeswan/libdes/Makefile b/src/libfreeswan/libcrypto/libdes/Makefile
index e00bb0073..7b48beb19 100644
--- a/src/libfreeswan/libdes/Makefile
+++ b/src/libfreeswan/libcrypto/libdes/Makefile
@@ -1,13 +1,13 @@
-ifndef FREESWANSRCDIR
-FREESWANSRCDIR=../..
-endif
-
-include ${FREESWANSRCDIR}/Makefile.inc
-
-KLIPSD=${FREESWANSRCDIR}/linux
-SRCDIR=${KLIPSD}/crypto/ciphers/des
-
-VPATH =${SRCDIR}
+#ifndef FREESWANSRCDIR
+#FREESWANSRCDIR=../..
+#endif
+#
+#include ${FREESWANSRCDIR}/Makefile.inc
+#
+#KLIPSD=${FREESWANSRCDIR}/linux
+#SRCDIR=${KLIPSD}/crypto/ciphers/des
+#
+#VPATH =${SRCDIR}
 
 # You must select the correct terminal control system to be used to
 # turn character echo off when reading passwords.  There a 5 systems
diff --git a/src/libfreeswan/libdes/des.h b/src/libfreeswan/libcrypto/libdes/des.h
index baddf8647..baddf8647 100644
--- a/src/libfreeswan/libdes/des.h
+++ b/src/libfreeswan/libcrypto/libdes/des.h
diff --git a/src/libfreeswan/libdes/des/COPYRIGHT b/src/libfreeswan/libcrypto/libdes/des/COPYRIGHT
index 5469e1e46..5469e1e46 100644
--- a/src/libfreeswan/libdes/des/COPYRIGHT
+++ b/src/libfreeswan/libcrypto/libdes/des/COPYRIGHT
diff --git a/src/libfreeswan/libdes/des/INSTALL b/src/libfreeswan/libcrypto/libdes/des/INSTALL
index 32457d775..32457d775 100644
--- a/src/libfreeswan/libdes/des/INSTALL
+++ b/src/libfreeswan/libcrypto/libdes/des/INSTALL
diff --git a/src/libfreeswan/libdes/des/Makefile.objs b/src/libfreeswan/libcrypto/libdes/des/Makefile.objs
index 4cef95963..4cef95963 100644
--- a/src/libfreeswan/libdes/des/Makefile.objs
+++ b/src/libfreeswan/libcrypto/libdes/des/Makefile.objs
diff --git a/src/libfreeswan/libdes/des/README b/src/libfreeswan/libcrypto/libdes/des/README
index 621a5ab46..621a5ab46 100644
--- a/src/libfreeswan/libdes/des/README
+++ b/src/libfreeswan/libcrypto/libdes/des/README
diff --git a/src/libfreeswan/libdes/des/README.freeswan b/src/libfreeswan/libcrypto/libdes/des/README.freeswan
index 40874d5f8..40874d5f8 100644
--- a/src/libfreeswan/libdes/des/README.freeswan
+++ b/src/libfreeswan/libcrypto/libdes/des/README.freeswan
diff --git a/src/libfreeswan/libdes/des/VERSION b/src/libfreeswan/libcrypto/libdes/des/VERSION
index 345035195..345035195 100644
--- a/src/libfreeswan/libdes/des/VERSION
+++ b/src/libfreeswan/libcrypto/libdes/des/VERSION
diff --git a/src/libfreeswan/libdes/des/asm/crypt586.pl b/src/libfreeswan/libcrypto/libdes/des/asm/crypt586.pl
index 297e38dec..297e38dec 100644
--- a/src/libfreeswan/libdes/des/asm/crypt586.pl
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/crypt586.pl
diff --git a/src/libfreeswan/libdes/des/asm/des-586.pl b/src/libfreeswan/libcrypto/libdes/des/asm/des-586.pl
index 7f2e09fa7..7f2e09fa7 100644
--- a/src/libfreeswan/libdes/des/asm/des-586.pl
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/des-586.pl
diff --git a/src/libfreeswan/libdes/des/asm/des686.pl b/src/libfreeswan/libcrypto/libdes/des/asm/des686.pl
index cf1a82fb5..cf1a82fb5 100644
--- a/src/libfreeswan/libdes/des/asm/des686.pl
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/des686.pl
diff --git a/src/libfreeswan/libdes/des/asm/desboth.pl b/src/libfreeswan/libcrypto/libdes/des/asm/desboth.pl
index 8f939953a..8f939953a 100644
--- a/src/libfreeswan/libdes/des/asm/desboth.pl
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/desboth.pl
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/cbc.pl b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/cbc.pl
index 278930579..278930579 100644
--- a/src/libfreeswan/libdes/des/asm/perlasm/cbc.pl
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/cbc.pl
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/readme b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/readme
index f02bbee75..f02bbee75 100644
--- a/src/libfreeswan/libdes/des/asm/perlasm/readme
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/readme
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/x86asm.pl b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86asm.pl
index 164a942c5..164a942c5 100644
--- a/src/libfreeswan/libdes/des/asm/perlasm/x86asm.pl
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86asm.pl
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/x86ms.pl b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86ms.pl
index 0681ea18c..0681ea18c 100644
--- a/src/libfreeswan/libdes/des/asm/perlasm/x86ms.pl
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86ms.pl
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/x86unix.pl b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86unix.pl
index 1d661221c..1d661221c 100644
--- a/src/libfreeswan/libdes/des/asm/perlasm/x86unix.pl
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86unix.pl
diff --git a/src/libfreeswan/libdes/des/asm/readme b/src/libfreeswan/libcrypto/libdes/des/asm/readme
index f8529d930..f8529d930 100644
--- a/src/libfreeswan/libdes/des/asm/readme
+++ b/src/libfreeswan/libcrypto/libdes/des/asm/readme
diff --git a/src/libfreeswan/libdes/des/cbc_enc.c b/src/libfreeswan/libcrypto/libdes/des/cbc_enc.c
index a06f9f99e..a06f9f99e 100644
--- a/src/libfreeswan/libdes/des/cbc_enc.c
+++ b/src/libfreeswan/libcrypto/libdes/des/cbc_enc.c
diff --git a/src/libfreeswan/libdes/des/des.doc b/src/libfreeswan/libcrypto/libdes/des/des.doc
index 1e3015812..1e3015812 100644
--- a/src/libfreeswan/libdes/des/des.doc
+++ b/src/libfreeswan/libcrypto/libdes/des/des.doc
diff --git a/src/libfreeswan/libdes/des/des_crypt.man b/src/libfreeswan/libcrypto/libdes/des/des_crypt.man
index 0ecc41687..0ecc41687 100644
--- a/src/libfreeswan/libdes/des/des_crypt.man
+++ b/src/libfreeswan/libcrypto/libdes/des/des_crypt.man
diff --git a/src/libfreeswan/libdes/des/des_enc.c b/src/libfreeswan/libcrypto/libdes/des/des_enc.c
index 1e1906d25..1e1906d25 100644
--- a/src/libfreeswan/libdes/des/des_enc.c
+++ b/src/libfreeswan/libcrypto/libdes/des/des_enc.c
diff --git a/src/libfreeswan/libdes/des/des_locl.h b/src/libfreeswan/libcrypto/libdes/des/des_locl.h
index 020d6b7ca..020d6b7ca 100644
--- a/src/libfreeswan/libdes/des/des_locl.h
+++ b/src/libfreeswan/libcrypto/libdes/des/des_locl.h
diff --git a/src/libfreeswan/libdes/des/des_opts.c b/src/libfreeswan/libcrypto/libdes/des/des_opts.c
index b6693c405..b6693c405 100644
--- a/src/libfreeswan/libdes/des/des_opts.c
+++ b/src/libfreeswan/libcrypto/libdes/des/des_opts.c
diff --git a/src/libfreeswan/libdes/des/des_ver.h b/src/libfreeswan/libcrypto/libdes/des/des_ver.h
index 98352bc0d..98352bc0d 100644
--- a/src/libfreeswan/libdes/des/des_ver.h
+++ b/src/libfreeswan/libcrypto/libdes/des/des_ver.h
diff --git a/src/libfreeswan/libdes/des/destest.c b/src/libfreeswan/libcrypto/libdes/des/destest.c
index ae896499e..ae896499e 100644
--- a/src/libfreeswan/libdes/des/destest.c
+++ b/src/libfreeswan/libcrypto/libdes/des/destest.c
diff --git a/src/libfreeswan/libdes/des/dx86unix.S b/src/libfreeswan/libcrypto/libdes/des/dx86unix.S
index 31dc0d0e1..31dc0d0e1 100644
--- a/src/libfreeswan/libdes/des/dx86unix.S
+++ b/src/libfreeswan/libcrypto/libdes/des/dx86unix.S
diff --git a/src/libfreeswan/libdes/des/ecb_enc.c b/src/libfreeswan/libcrypto/libdes/des/ecb_enc.c
index 0b7afcf3a..0b7afcf3a 100644
--- a/src/libfreeswan/libdes/des/ecb_enc.c
+++ b/src/libfreeswan/libcrypto/libdes/des/ecb_enc.c
diff --git a/src/libfreeswan/libdes/des/fcrypt.c b/src/libfreeswan/libcrypto/libdes/des/fcrypt.c
index 8b9d0495b..8b9d0495b 100644
--- a/src/libfreeswan/libdes/des/fcrypt.c
+++ b/src/libfreeswan/libcrypto/libdes/des/fcrypt.c
diff --git a/src/libfreeswan/libdes/des/fcrypt_b.c b/src/libfreeswan/libcrypto/libdes/des/fcrypt_b.c
index 5900645e7..5900645e7 100644
--- a/src/libfreeswan/libdes/des/fcrypt_b.c
+++ b/src/libfreeswan/libcrypto/libdes/des/fcrypt_b.c
diff --git a/src/libfreeswan/libdes/des/options.txt b/src/libfreeswan/libcrypto/libdes/des/options.txt
index 6e2b50f76..6e2b50f76 100644
--- a/src/libfreeswan/libdes/des/options.txt
+++ b/src/libfreeswan/libcrypto/libdes/des/options.txt
diff --git a/src/libfreeswan/libdes/des/podd.h b/src/libfreeswan/libcrypto/libdes/des/podd.h
index c00cd6ba0..c00cd6ba0 100644
--- a/src/libfreeswan/libdes/des/podd.h
+++ b/src/libfreeswan/libcrypto/libdes/des/podd.h
diff --git a/src/libfreeswan/libdes/des/set_key.c b/src/libfreeswan/libcrypto/libdes/des/set_key.c
index 99ac27348..99ac27348 100644
--- a/src/libfreeswan/libdes/des/set_key.c
+++ b/src/libfreeswan/libcrypto/libdes/des/set_key.c
diff --git a/src/libfreeswan/libdes/des/sk.h b/src/libfreeswan/libcrypto/libdes/des/sk.h
index 240703070..240703070 100644
--- a/src/libfreeswan/libdes/des/sk.h
+++ b/src/libfreeswan/libcrypto/libdes/des/sk.h
diff --git a/src/libfreeswan/libdes/des/speed.c b/src/libfreeswan/libcrypto/libdes/des/speed.c
index e3d753b2e..e3d753b2e 100644
--- a/src/libfreeswan/libdes/des/speed.c
+++ b/src/libfreeswan/libcrypto/libdes/des/speed.c
diff --git a/src/libfreeswan/libdes/des/spr.h b/src/libfreeswan/libcrypto/libdes/des/spr.h
index a84d6a723..a84d6a723 100644
--- a/src/libfreeswan/libdes/des/spr.h
+++ b/src/libfreeswan/libcrypto/libdes/des/spr.h