[svn-upgrade] Integrating new upstream version, strongswan (4.2.12)

7 files changed, 38 insertions, 23 deletions

diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index c28fbf6e0..f788bc3d1 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -68,8 +68,8 @@ rsaref/pkcs11t.h rsaref/pkcs11.h rsaref/unix.h rsaref/pkcs11f.h
 _pluto_adns_SOURCES = adns.c adns.h
 
 LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan
-LIBFREESWANDIR=$(top_srcdir)/src/libfreeswan
-LIBCRYPTODIR=$(top_srcdir)/src/libcrypto
+LIBFREESWANDIR=$(top_builddir)/src/libfreeswan
+LIBCRYPTODIR=$(top_builddir)/src/libcrypto
 
 
 INCLUDES = \
@@ -85,7 +85,7 @@ AM_CFLAGS = \
 -DIPSEC_PIDDIR=\"${piddir}\" \
 -DSHARED_SECRETS_FILE=\"${confdir}/ipsec.secrets\" \
 -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES \
--DPLUTO -DKLIPS -DDEBUG -DTHREADS
+-DPLUTO -DKLIPS -DDEBUG
 
 pluto_LDADD = \
 oid.o \
@@ -143,3 +143,6 @@ if USE_CAPABILITIES
   pluto_LDADD += -lcap
 endif
 
+if USE_THREADS
+  AM_CFLAGS += -DTHREADS
+endif
diff --git a/src/pluto/Makefile.in b/src/pluto/Makefile.in
index 6ea863973..457f93d9f 100644
--- a/src/pluto/Makefile.in
+++ b/src/pluto/Makefile.in
@@ -61,6 +61,7 @@ ipsec_PROGRAMS = pluto$(EXEEXT) _pluto_adns$(EXEEXT)
 # This compile option activates smartcard support
 @USE_SMARTCARD_TRUE@am__append_9 = -DSMARTCARD
 @USE_CAPABILITIES_TRUE@am__append_10 = -lcap
+@USE_THREADS_TRUE@am__append_11 = -DTHREADS
 subdir = src/pluto
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in TODO
@@ -137,22 +138,17 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GPERF = @GPERF@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -162,6 +158,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 IPSEC_ROUTING_TABLE = @IPSEC_ROUTING_TABLE@
 IPSEC_ROUTING_TABLE_PRIO = @IPSEC_ROUTING_TABLE_PRIO@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -170,12 +167,16 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LINUX_HEADERS = @LINUX_HEADERS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -198,8 +199,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -238,6 +238,7 @@ libstrongswan_plugins = @libstrongswan_plugins@
 linuxdir = @linuxdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 nm_CFLAGS = @nm_CFLAGS@
@@ -324,8 +325,8 @@ rsaref/pkcs11t.h rsaref/pkcs11.h rsaref/unix.h rsaref/pkcs11f.h
 
 _pluto_adns_SOURCES = adns.c adns.h
 LIBSTRONGSWANDIR = $(top_srcdir)/src/libstrongswan
-LIBFREESWANDIR = $(top_srcdir)/src/libfreeswan
-LIBCRYPTODIR = $(top_srcdir)/src/libcrypto
+LIBFREESWANDIR = $(top_builddir)/src/libfreeswan
+LIBCRYPTODIR = $(top_builddir)/src/libcrypto
 INCLUDES = \
 -I${linuxdir} \
 -I$(LIBSTRONGSWANDIR)\
@@ -337,9 +338,9 @@ AM_CFLAGS = -DIPSEC_DIR=\"${ipsecdir}\" -DIPSEC_CONFDIR=\"${confdir}\" \
 	-DIPSEC_PIDDIR=\"${piddir}\" \
 	-DSHARED_SECRETS_FILE=\"${confdir}/ipsec.secrets\" \
 	-DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES -DPLUTO \
-	-DKLIPS -DDEBUG -DTHREADS $(am__append_1) $(am__append_2) \
+	-DKLIPS -DDEBUG $(am__append_1) $(am__append_2) \
 	$(am__append_3) $(am__append_4) $(am__append_6) \
-	$(am__append_8) $(am__append_9)
+	$(am__append_8) $(am__append_9) $(am__append_11)
 pluto_LDADD = oid.o $(LIBFREESWANDIR)/libfreeswan.a \
 	$(LIBCRYPTODIR)/libcrypto.a -lgmp -lresolv -lpthread -ldl \
 	$(am__append_5) $(am__append_7) $(am__append_10)
diff --git a/src/pluto/ca.c b/src/pluto/ca.c
index 70b26c32c..816db53a8 100644
--- a/src/pluto/ca.c
+++ b/src/pluto/ca.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ca.c 4632 2008-11-11 18:37:19Z martin $
+ * RCSID $Id: ca.c 4709 2008-11-27 10:20:25Z martin $
  */
 
 #include <stdlib.h>
@@ -33,6 +33,7 @@
 #include "certs.h"
 #include "whack.h"
 #include "fetch.h"
+#include "smartcard.h"
 
 /* chained list of X.509 authority certificates (ca, aa, and ocsp) */
 
diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c
index 7dedbf1f7..74b86bf19 100644
--- a/src/pluto/ocsp.c
+++ b/src/pluto/ocsp.c
@@ -12,7 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ocsp.c 3253 2007-10-06 21:39:00Z andreas $
+ * RCSID $Id: ocsp.c 4827 2009-01-09 01:36:13Z andreas $
  */
 
 #include <unistd.h>
@@ -58,6 +58,7 @@ static const char *const response_status_names[] = {
     "malformed request",
     "internal error",
     "try later",
+    "status #4",
     "signature required",
     "unauthorized"
 };
diff --git a/src/pluto/smartcard.h b/src/pluto/smartcard.h
index a2978a929..69510171c 100644
--- a/src/pluto/smartcard.h
+++ b/src/pluto/smartcard.h
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: smartcard.h 3252 2007-10-06 21:24:50Z andreas $
+ * RCSID $Id: smartcard.h 4709 2008-11-27 10:20:25Z martin $
  */
 
 #ifndef _SMARTCARD_H
@@ -25,14 +25,17 @@
 #define SCX_CERT_CACHE_INTERVAL	  60 /* seconds */
 #define SCX_MAX_PIN_TRIALS	  3
 
-/* smartcard operations */
+/* smartcard operations, update copy in whack.h */
 
+#ifndef SC_OP_T
+#define SC_OP_T
 typedef enum {
     SC_OP_NONE =    0,
     SC_OP_ENCRYPT = 1,
     SC_OP_DECRYPT = 2,
     SC_OP_SIGN =    3,
 } sc_op_t;
+#endif /* SC_OP_T */
 
 /* smartcard record */
 
diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c
index e4fda0f1f..d4d8fcb1a 100644
--- a/src/pluto/vendor.c
+++ b/src/pluto/vendor.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: vendor.c 4426 2008-10-14 01:53:37Z andreas $
+ * RCSID $Id: vendor.c 4846 2009-01-21 03:14:52Z andreas $
  */
 
 #include <stdlib.h>
@@ -206,7 +206,10 @@ static struct vid_struct _vid_tab[] = {
 	/*
 	 * strongSwan
 	 */
-	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.9")
+	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.12")
+	DEC_MD5_VID(STRONGSWAN_4_2_11,"strongSwan 4.2.11")
+	DEC_MD5_VID(STRONGSWAN_4_2_10,"strongSwan 4.2.10")
+	DEC_MD5_VID(STRONGSWAN_4_2_9, "strongSwan 4.2.9")
 	DEC_MD5_VID(STRONGSWAN_4_2_8, "strongSwan 4.2.8")
 	DEC_MD5_VID(STRONGSWAN_4_2_7, "strongSwan 4.2.7")
 	DEC_MD5_VID(STRONGSWAN_4_2_6, "strongSwan 4.2.6")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 819dbd99d..20711fe4e 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: vendor.h 4426 2008-10-14 01:53:37Z andreas $
+ * RCSID $Id: vendor.h 4846 2009-01-21 03:14:52Z andreas $
  */
 
 #ifndef _VENDOR_H_
@@ -125,6 +125,9 @@ enum known_vendorid {
   VID_STRONGSWAN_4_2_6		=106,
   VID_STRONGSWAN_4_2_7		=107,
   VID_STRONGSWAN_4_2_8		=108,
+  VID_STRONGSWAN_4_2_9		=109,
+  VID_STRONGSWAN_4_2_10		=110,
+  VID_STRONGSWAN_4_2_11		=111,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01		=151,