*** empty log message ***

11 files changed, 18 insertions, 23 deletions

diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 10354025..c7fb5400 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -26,6 +26,7 @@
 #include <lasso/protocols/response.h>
 #include <lasso/protocols/artifact.h>
 #include <lasso/protocols/authn_response.h>
+#include <lasso/protocols/provider.h>
 
 #include <lasso/environs/login.h>
 
diff --git a/lasso/id-ff/login.h b/lasso/id-ff/login.h
index 156488a8..c6849f6c 100644
--- a/lasso/id-ff/login.h
+++ b/lasso/id-ff/login.h
@@ -31,11 +31,12 @@ extern "C" {
 
 #endif /* __cplusplus */ 
 
-#include <lasso/xml/xml.h>
-#include <lasso/protocols/provider.h>
 #include <lasso/environs/profile_context.h>
-#include <lasso/environs/server.h>
-#include <lasso/environs/user.h>
+
+#include <lasso/protocols/authn_request.h>
+#include <lasso/protocols/authn_response.h>
+#include <lasso/protocols/request.h>
+#include <lasso/protocols/response.h>
 
 #define LASSO_TYPE_LOGIN (lasso_login_get_type())
 #define LASSO_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LOGIN, LassoLogin))
diff --git a/lasso/id-ff/logout.h b/lasso/id-ff/logout.h
index 2c3a594a..7fa1b5b6 100644
--- a/lasso/id-ff/logout.h
+++ b/lasso/id-ff/logout.h
@@ -30,9 +30,10 @@
 extern "C" {
 #endif /* __cplusplus */ 
 
-#include <lasso/xml/xml.h>
 #include <lasso/environs/profile_context.h>
+
 #include <lasso/protocols/logout_request.h>
+#include <lasso/protocols/logout_response.h>
 
 #define LASSO_TYPE_LOGOUT (lasso_logout_get_type())
 #define LASSO_LOGOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LOGOUT, LassoLogout))
diff --git a/lasso/id-ff/profile_context.h b/lasso/id-ff/profile_context.h
index 5ab01cf6..97c24bd3 100644
--- a/lasso/id-ff/profile_context.h
+++ b/lasso/id-ff/profile_context.h
@@ -31,7 +31,9 @@ extern "C" {
 
 #endif /* __cplusplus */ 
 
-#include <lasso/xml/xml.h>
+#include <lasso/xml/strings.h>
+#include <lasso/xml/tools.h>
+
 #include <lasso/environs/server.h>
 #include <lasso/environs/user.h>
 
diff --git a/lasso/id-ff/user.h b/lasso/id-ff/user.h
index e7b67779..7dede871 100644
--- a/lasso/id-ff/user.h
+++ b/lasso/id-ff/user.h
@@ -32,7 +32,6 @@ extern "C" {
 
 #include <lasso/xml/xml.h>
 #include <lasso/protocols/identity.h>
-#include <lasso/protocols/elements/assertion.h>
 
 #define LASSO_TYPE_USER (lasso_user_get_type())
 #define LASSO_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_USER, LassoUser))
diff --git a/lasso/lasso.c b/lasso/lasso.c
index 14ecc275..a1877f54 100644
--- a/lasso/lasso.c
+++ b/lasso/lasso.c
@@ -37,9 +37,9 @@ int lasso_init()
 
   /* Init libxml and libxslt libraries */
   xmlInitParser();
-  LIBXML_TEST_VERSION
-    xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
-  xmlSubstituteEntitiesDefault(1);
+  //LIBXML_TEST_VERSION
+  //  xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
+  //xmlSubstituteEntitiesDefault(1);
 
   /* Init xmlsec library */
   if(xmlSecInit() < 0) {
diff --git a/lasso/lasso.h b/lasso/lasso.h
index 0a4e8f5b..9fecd014 100644
--- a/lasso/lasso.h
+++ b/lasso/lasso.h
@@ -32,13 +32,8 @@ extern "C" {
 #include <lasso/version.h>
 #include <lasso/export.h>
 
-#include <xmlsec/xmlsec.h>
-#include <xmlsec/crypto.h>
-
-#include <lasso/xml/strings.h>
-#include <lasso/xml/saml.h>
-#include <lasso/xml/lib.h>
-#include <lasso/protocols/protocols.h>
+#include <lasso/environs/login.h>
+#include <lasso/environs/logout.h>
 
 LASSO_EXPORT int lasso_init(void);
 LASSO_EXPORT int lasso_shutdown(void);
diff --git a/lasso/xml/lib_authentication_statement.h b/lasso/xml/lib_authentication_statement.h
index e82dbfae..9d820fa1 100644
--- a/lasso/xml/lib_authentication_statement.h
+++ b/lasso/xml/lib_authentication_statement.h
@@ -29,7 +29,6 @@
 extern "C" {
 #endif /* __cplusplus */ 
 
-#include <lasso/lasso.h>
 #include <lasso/xml/saml_authentication_statement.h>
 #include <lasso/xml/lib_authn_context.h>
 
diff --git a/lasso/xml/lib_subject.h b/lasso/xml/lib_subject.h
index 983c6286..bb4c7303 100644
--- a/lasso/xml/lib_subject.h
+++ b/lasso/xml/lib_subject.h
@@ -29,7 +29,6 @@
 extern "C" {
 #endif /* __cplusplus */ 
 
-#include <lasso/lasso.h>
 #include <lasso/xml/saml_subject.h>
 #include <lasso/xml/lib_idp_provided_name_identifier.h>
 
diff --git a/lasso/xml/strings.c b/lasso/xml/strings.c
index 3ef44af4..60dad9d5 100644
--- a/lasso/xml/strings.c
+++ b/lasso/xml/strings.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/lasso.h>
+#include <lasso/xml/strings.h>
 
 /*****************************************************************************/
 /* Lasso                                                                     */
@@ -32,7 +32,6 @@
 const xmlChar lassoLassoHRef[]   = "http://www.entrouvert.org/namespaces/lasso/0.0";
 const xmlChar lassoLassoPrefix[] = "lasso";
 
-
 /*****************************************************************************/
 /* Liberty Alliance                                                          */
 /*****************************************************************************/
@@ -100,7 +99,6 @@ const xmlChar lassoLibNameIdentifierFormatEntityID[]  = "urn:liberty:iff:nameid:
 const xmlChar lassoMetadataHRef[]   = "urn:liberty:metadata:2003-08";
 const xmlChar lassoMetadataPrefix[] = "md";
 
-
 /*****************************************************************************/
 /* SAML                                                                      */
 /*****************************************************************************/
diff --git a/lasso/xml/strings.h b/lasso/xml/strings.h
index 30c7da4d..3566f9a0 100644
--- a/lasso/xml/strings.h
+++ b/lasso/xml/strings.h
@@ -32,10 +32,10 @@ extern "C" {
 #include <lasso/export.h>
 #include <libxml/tree.h>
 
-
 /*****************************************************************************/
 /* Lasso                                                                     */
 /*****************************************************************************/
+
 /* prefix & href */
 LASSO_EXPORT_VAR const xmlChar lassoLassoHRef[];
 LASSO_EXPORT_VAR const xmlChar lassoLassoPrefix[];