hide credentials headers in credential_factory.h

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;
 

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>
 
 /**

src/libstrongswan/library.h

@@ -63,12 +63,7 @@
 #include <crypto/crypto_factory.h>
 #include <fetcher/fetcher_manager.h>
 #include <database/database_factory.h>
-
+#include <credentials/credential_factory.h>
-#ifdef NO_CREDENTIAL_FACTORY
-	typedef struct credential_factory_t credential_factory_t;
-#else
-	#include <credentials/credential_factory.h>
-#endif
 
 typedef struct library_t library_t;
 

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);

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>
 

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
 

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