NO_CREDENTIAL_FACTORY compile option not needed anymore
authorAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 28 May 2009 13:44:22 +0000 (15:44 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 28 May 2009 13:44:22 +0000 (15:44 +0200)
scripts/id2sql.c
scripts/key2keyid.c
src/libfreeswan/Makefile.am
src/pluto/Makefile.am
src/scepclient/Makefile.am
src/starter/Makefile.am
src/whack/Makefile.am

index 3990e88..5b0bd1d 100644 (file)
@@ -1,6 +1,6 @@
 
 #include <stdio.h>
-#include <library.h>
+#include <utils/identification.h>
 
 /**
  * convert an identity to type and encoding
index 80c3429..201670e 100644 (file)
@@ -2,6 +2,8 @@
 #include <stdio.h>
 #include <library.h>
 #include <debug.h>
+#include <credentials/keys/private_key.h>
+#include <credentials/keys/public_key.h>
 
 /**
  * print the keyids of a private or public key
index 77de6bd..29d0ea0 100644 (file)
@@ -13,9 +13,6 @@ INCLUDES = \
 -I$(top_srcdir)/src/libstrongswan \
 -I$(top_srcdir)/src/pluto
 
-AM_CFLAGS = \
--DNO_CREDENTIAL_FACTORY
-
 dist_man3_MANS = anyaddr.3 atoaddr.3 atoasr.3 atosa.3 atoul.3 goodmask.3 initaddr.3 initsubnet.3 \
                  keyblobtoid.3 portof.3 prng.3 rangetosubnet.3 sameaddr.3 subnetof.3 \
                  ttoaddr.3 ttodata.3 ttosa.3 ttoul.3 version.3
index b389713..2c91c3d 100644 (file)
@@ -78,7 +78,6 @@ AM_CFLAGS = \
 -DPLUGINS=\""${pluto_plugins}\"" \
 -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
 -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES \
--DNO_CREDENTIAL_FACTORY \
 -DPLUTO -DKLIPS -DDEBUG
 
 pluto_LDADD = \
index 8540c5a..f7cfc73 100644 (file)
@@ -20,7 +20,6 @@ AM_CFLAGS = \
 -DIPSEC_PLUGINDIR=\"${plugindir}\" \
 -DPLUGINS=\""${pluto_plugins}\"" \
 -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
--DNO_CREDENTIAL_FACTORY \
 -DDEBUG -DNO_PLUTO
 
 LIBSTRONGSWANBUILDDIR=$(top_builddir)/src/libstrongswan
index 336cc75..439a778 100644 (file)
@@ -18,7 +18,6 @@ AM_CFLAGS = \
 -DIPSEC_CONFDIR=\"${confdir}\" \
 -DIPSEC_PIDDIR=\"${piddir}\" \
 -DIPSEC_EAPDIR=\"${eapdir}\" \
--DNO_CREDENTIAL_FACTORY \
 -DDEBUG
 
 starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la
index be74e22..27f8562 100644 (file)
@@ -11,7 +11,5 @@ whack_LDADD = \
 $(top_builddir)/src/libstrongswan/libstrongswan.la \
 $(top_builddir)/src/libfreeswan/libfreeswan.a
 
-AM_CFLAGS = \
--DNO_CREDENTIAL_FACTORY \
--DDEBUG
+AM_CFLAGS = -DDEBUG