NO_CREDENTIAL_FACTORY compile option not needed anymore

scripts/id2sql.c

@@ -1,6 +1,6 @@
 
 #include <stdio.h>
-#include <library.h>
+#include <utils/identification.h>
 
 /**
  * convert an identity to type and encoding

scripts/key2keyid.c

@@ -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

src/libfreeswan/Makefile.am

@@ -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

src/pluto/Makefile.am

@@ -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 = \

src/scepclient/Makefile.am

@@ -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

src/starter/Makefile.am

@@ -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

src/whack/Makefile.am

@@ -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