NO_CREDENTIAL_FACTORY compile option not needed anymore

diff --git a/scripts/id2sql.c b/scripts/id2sql.c
index 3990e88da04a5ed0db43d7fb1bd9a85d5c9f86c7..5b0bd1d7db3644ecc7bd84f5bc60cd3dcea8efc6 100644 (file)
--- a/scripts/id2sql.c
+++ b/scripts/id2sql.c
@@ -1,6 +1,6 @@
 
 #include <stdio.h>
-#include <library.h>
+#include <utils/identification.h>
 
 /**
  * convert an identity to type and encoding

diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c
index 80c3429194b7aa011115d6a2e1823da47ed94936..201670e4371945368c79f540666444973e77b82e 100644 (file)
--- a/scripts/key2keyid.c
+++ b/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

diff --git a/src/libfreeswan/Makefile.am b/src/libfreeswan/Makefile.am
index 77de6bdd93ed177e94653b80f117a45ca6138c42..29d0ea0880a9f94d0ee8d426cf8a82daf8897b43 100644 (file)
--- a/src/libfreeswan/Makefile.am
+++ b/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

diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index b389713d33757cced182eff7c29bbce138ae49c8..2c91c3d8445e73b2f87ba0029f71632a8c9d2f19 100644 (file)
--- a/src/pluto/Makefile.am
+++ b/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 = \

diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index 8540c5aed2fa5980dddffbf15d19451beb7f8236..f7cfc7355ba99e928cbd8599c536dda06c7ace24 100644 (file)
--- a/src/scepclient/Makefile.am
+++ b/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

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 336cc759a917e623248bd50c9c76e4cae0750291..439a7785a00106dd8887ee63974e7c48cb03ec28 100644 (file)
--- a/src/starter/Makefile.am
+++ b/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

diff --git a/src/whack/Makefile.am b/src/whack/Makefile.am
index be74e22f75f194690f2ae47bdc60782c86abdeae..27f8562319a0d6231bc9431e466d0d576953c06e 100644 (file)
--- a/src/whack/Makefile.am
+++ b/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