diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2004-12-17 18:02:42 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2004-12-17 18:02:42 +0000 |
| commit | ca7ca6c2ce204bf2d64652a8170f37e83f1ea6a6 (patch) | |
| tree | 66fa7579314b6af0c8b22ccf418306b9f246f18f /lasso/xml | |
| parent | c613c52c2796282a12918160b66632ef401d0374 (diff) | |
| download | lasso-ca7ca6c2ce204bf2d64652a8170f37e83f1ea6a6.tar.gz lasso-ca7ca6c2ce204bf2d64652a8170f37e83f1ea6a6.tar.xz lasso-ca7ca6c2ce204bf2d64652a8170f37e83f1ea6a6.zip | |
Isolated CFLAGS to be used when compiling Lasso in LASSO_CORE_CFLAGS; don't use
those when compiling tests in order to catch errors in headers. Also moved a
few things in header files; need more thinking about that.
Diffstat (limited to 'lasso/xml')
| -rw-r--r-- | lasso/xml/Makefile.am | 4 | ||||
| -rw-r--r-- | lasso/xml/tools.c | 6 | ||||
| -rw-r--r-- | lasso/xml/tools.h | 8 | ||||
| -rw-r--r-- | lasso/xml/xml.h | 11 |
4 files changed, 11 insertions, 18 deletions
diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am index 656d6562..6eb41792 100644 --- a/lasso/xml/Makefile.am +++ b/lasso/xml/Makefile.am @@ -3,9 +3,7 @@ liblassoincludedir = $(includedir)/lasso/xml INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/lasso \ - $(LASSO_DEFINES) \ - $(LASSO_CFLAGS) \ - -DLASSO_INTERNALS \ + $(LASSO_CORE_CFLAGS) \ -DG_LOG_DOMAIN=\"lasso\" noinst_LTLIBRARIES = liblasso-xml.la diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c index de2b609e..00803da4 100644 --- a/lasso/xml/tools.c +++ b/lasso/xml/tools.c @@ -35,11 +35,9 @@ #include <xmlsec/base64.h> #include <xmlsec/xmltree.h> +#include <lasso/xml/xml.h> #include <lasso/xml/tools.h> -#include <lasso/xml/errors.h> -#include <lasso/xml/strings.h> - /** * lasso_build_random_sequence: @@ -304,7 +302,7 @@ lasso_load_certs_from_pem_certs_chain_file(const char* pem_certs_chain_file) * Return value: a newly allocated query signed or NULL if an error occurs. **/ xmlChar* -lasso_query_sign(xmlChar *query, lassoSignatureMethod sign_method, const char *private_key_file) +lasso_query_sign(xmlChar *query, lassoSignatureMethod sign_method, const char *private_key_file) { BIO *bio = NULL; xmlChar *digest = NULL; /* 160 bit buffer */ diff --git a/lasso/xml/tools.h b/lasso/xml/tools.h index a63ec27c..3de9a716 100644 --- a/lasso/xml/tools.h +++ b/lasso/xml/tools.h @@ -30,14 +30,8 @@ extern "C" { #endif /* __cplusplus */ -#include <glib.h> +#include <lasso/xml/xml.h> #include <xmlsec/crypto.h> -#include <lasso/export.h> - -typedef enum { - LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1, - LASSO_SIGNATURE_METHOD_DSA_SHA1 -} lassoSignatureMethod; typedef enum { LASSO_PEM_FILE_TYPE_UNKNOWN, diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h index e2a7cbd1..e3f341a7 100644 --- a/lasso/xml/xml.h +++ b/lasso/xml/xml.h @@ -39,13 +39,10 @@ extern "C" { #include <libxml/uri.h> #include <libxml/tree.h> +#include <lasso/export.h> #include <lasso/xml/errors.h> #include <lasso/xml/strings.h> -#ifdef LASSO_INTERNALS -#include <lasso/xml/tools.h> -#endif - #define LASSO_TYPE_NODE (lasso_node_get_type()) #define LASSO_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_NODE, LassoNode)) #define LASSO_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_NODE, LassoNodeClass)) @@ -68,6 +65,11 @@ typedef enum { LASSO_SIGNATURE_TYPE_WITHX509 } lassoSignatureType; +typedef enum { + LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1, + LASSO_SIGNATURE_METHOD_DSA_SHA1 +} lassoSignatureMethod; + typedef struct _LassoNode LassoNode; typedef struct _LassoNodeClass LassoNodeClass; typedef struct _LassoNodeClassData LassoNodeClassData; @@ -122,6 +124,7 @@ LASSO_EXPORT gint lasso_node_verify_signature(LassoNode *node, #ifdef LASSO_INTERNALS #include <lasso/xml/internals.h> +#include <lasso/xml/tools.h> #endif #ifdef __cplusplus |