diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-05-28 15:34:18 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-05-28 15:35:02 +0200 |
| commit | e24aaddde0c07d4ff77a30aeba20104285e04197 (patch) | |
| tree | 31f04b66a99ee25696c71febc8bdc3f87a83cc47 /src | |
| parent | 178bf4c5e9818b3f9e436a5aef80696e10f69d8c (diff) | |
| download | strongswan-e24aaddde0c07d4ff77a30aeba20104285e04197.tar.bz2 strongswan-e24aaddde0c07d4ff77a30aeba20104285e04197.tar.xz | |
hide credentials headers in credential_factory.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/charon/config/attributes/attribute_provider.h | 1 | ||||
| -rw-r--r-- | src/libstrongswan/credentials/credential_factory.h | 3 | ||||
| -rw-r--r-- | src/libstrongswan/library.h | 7 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/x509/x509_ac.c | 1 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/x509/x509_cert.c | 1 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/x509/x509_ocsp_request.c | 1 | ||||
| -rwxr-xr-x | src/openac/openac.c | 1 |
7 files changed, 6 insertions, 9 deletions
diff --git a/src/charon/config/attributes/attribute_provider.h b/src/charon/config/attributes/attribute_provider.h index d14ffdac6..0f1057af4 100644 --- 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 42fb2df6d..5057a7aae 100644 --- 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 c343249fa..35c6b686a 100644 --- 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 4016468ab..46055c633 100644 --- 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 75f7f19a8..57fef9496 100644 --- 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 4c0907cb9..4020d8d95 100644 --- 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 6cbb76173..3686c07ac 100755 --- 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 |