hide credentials headers in credential_factory.h

diff --git a/src/charon/config/attributes/attribute_provider.h b/src/charon/config/attributes/attribute_provider.h
index d14ffdac6b7508daee90a0a0733e5c1ea91f4c66..0f1057af412d7534342dcff304d4190b56741568 100644 (file)
--- a/src/charon/config/attributes/attribute_provider.h
+++ b/src/charon/config/attributes/attribute_provider.h
@@ -23,6 +23,7 @@
 
 #include <library.h>
 #include <utils/host.h>
+#include <utils/identification.h>
 
 typedef struct attribute_provider_t attribute_provider_t;
 

diff --git a/src/libstrongswan/credentials/credential_factory.h b/src/libstrongswan/credentials/credential_factory.h
index 42fb2df6d88ddf117f596321e943b8d75c3c54d7..5057a7aae3f0213c24cdacae902cc9a9190f8ee8 100644 (file)
--- a/src/libstrongswan/credentials/credential_factory.h
+++ b/src/libstrongswan/credentials/credential_factory.h
@@ -24,9 +24,6 @@
 typedef struct credential_factory_t credential_factory_t;
 typedef enum credential_type_t credential_type_t;
 
-#include <credentials/keys/private_key.h>
-#include <credentials/keys/public_key.h>
-#include <credentials/certificates/certificate.h>
 #include <credentials/builder.h>
 
 /**

diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index c343249fa92ab17b9920cca3467f3e641c6b8321..35c6b686a9ff0e749263db44aaaaa16233a0cd47 100644 (file)
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -63,12 +63,7 @@
 #include <crypto/crypto_factory.h>
 #include <fetcher/fetcher_manager.h>
 #include <database/database_factory.h>
-
-#ifdef NO_CREDENTIAL_FACTORY
-       typedef struct credential_factory_t credential_factory_t;
-#else
-       #include <credentials/credential_factory.h>
-#endif
+#include <credentials/credential_factory.h>
 
 typedef struct library_t library_t;
 

diff --git a/src/libstrongswan/plugins/x509/x509_ac.c b/src/libstrongswan/plugins/x509/x509_ac.c
index 4016468abb04a312e010c2100d4d1d31e1848abe..46055c633ed0fa7dd2ff5111c233fcb80be8d6f0 100644 (file)
--- a/src/libstrongswan/plugins/x509/x509_ac.c
+++ b/src/libstrongswan/plugins/x509/x509_ac.c
@@ -30,6 +30,7 @@
 #include <utils/identification.h>
 #include <utils/linked_list.h>
 #include <credentials/certificates/x509.h>
+#include <credentials/keys/private_key.h>
 
 extern identification_t* x509_parse_authorityKeyIdentifier(chunk_t blob,
                                                         int level0, chunk_t *authKeySerialNumber);

diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c
index 75f7f19a84634601a542efe36980a14be4b24ad1..57fef9496c143747c80c1b8324dff9e469b09c98 100644 (file)
--- a/src/libstrongswan/plugins/x509/x509_cert.c
+++ b/src/libstrongswan/plugins/x509/x509_cert.c
@@ -35,6 +35,7 @@
 #include <asn1/asn1_parser.h>
 #include <asn1/pem.h>
 #include <crypto/hashers/hasher.h>
+#include <credentials/keys/private_key.h>
 #include <utils/linked_list.h>
 #include <utils/identification.h>
 

diff --git a/src/libstrongswan/plugins/x509/x509_ocsp_request.c b/src/libstrongswan/plugins/x509/x509_ocsp_request.c
index 4c0907cb91d6fb013591e0160b7c6cb725e5980f..4020d8d959fbdf371bdc969e020d73423aafde91 100644 (file)
--- a/src/libstrongswan/plugins/x509/x509_ocsp_request.c
+++ b/src/libstrongswan/plugins/x509/x509_ocsp_request.c
@@ -24,6 +24,7 @@
 #include <utils/linked_list.h>
 #include <debug.h>
 #include <credentials/certificates/x509.h>
+#include <credentials/keys/private_key.h>
 
 #define NONCE_LEN              16
 

diff --git a/src/openac/openac.c b/src/openac/openac.c
index 6cbb7617312f3633ecc3db143642170a88425678..3686c07ac83d01368d71f8a8fe15c5942f0b78d8 100755 (executable)
--- a/src/openac/openac.c
+++ b/src/openac/openac.c
@@ -37,6 +37,7 @@
 #include <asn1/pem.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/certificates/ac.h>
+#include <credentials/keys/private_key.h>
 #include <utils/optionsfrom.h>
 
 #ifdef INTEGRITY_TEST