*** empty log message ***

5 files changed, 13 insertions, 23 deletions

diff --git a/lasso/Attic/protocols/logout.c b/lasso/Attic/protocols/logout.c
index b193142f..c0db157a 100644
--- a/lasso/Attic/protocols/logout.c
+++ b/lasso/Attic/protocols/logout.c
@@ -124,7 +124,6 @@ lasso_logout_request_create(const xmlChar *providerID,
      lassoLogoutRequest *lareq;
 
      lareq = g_malloc(sizeof(lassoLogoutRequest));
-     lareq->type = lassoProtocolTypeLogoutRequest;
      lareq->node = lasso_logout_request_build_full(NULL,
 						   NULL,
 						   NULL,
@@ -247,7 +246,6 @@ lasso_logout_response_create(xmlChar *query)
      lassoLogoutResponse *lares;
 
      lares = g_malloc(sizeof(lassoLogoutResponse));
-     lares->type = lassoProtocolTypeLogoutResponse;
      lares->request_query = NULL;
      if(query!=NULL){
 	  lares->request_query = query;
diff --git a/lasso/Attic/protocols/logout.h b/lasso/Attic/protocols/logout.h
index d1370a1f..921bd350 100644
--- a/lasso/Attic/protocols/logout.h
+++ b/lasso/Attic/protocols/logout.h
@@ -32,14 +32,12 @@ typedef struct _lassoLogoutRequest lassoLogoutRequest;
 
 struct _lassoLogoutRequest{
   LassoNode  *node;
-  enum lassoProtocolTypes type;
 };
 
 typedef struct _lassoLogoutResponse lassoLogoutResponse;
 
 struct _lassoLogoutResponse{
   LassoNode  *node;
-  enum lassoProtocolTypes type;
   LassoNode  *request_node;
   xmlChar    *request_query;
 };
diff --git a/lasso/Attic/protocols/protocols.h b/lasso/Attic/protocols/protocols.h
index 672bed12..09ba7742 100644
--- a/lasso/Attic/protocols/protocols.h
+++ b/lasso/Attic/protocols/protocols.h
@@ -37,14 +37,6 @@ extern "C" {
 #include <lasso/xml/lib_register_name_identifier_request.h>
 #include <lasso/xml/lib_register_name_identifier_response.h>
 
-enum lassoProtocolTypes {
-  lassoProtocolTypeAuthnRequest,
-  lassoProtocolTypeAuthnResponse,
-  lassoProtocolTypeLogoutRequest,
-  lassoProtocolTypeLogoutResponse,
-  lassoProtocolTypeResponse
-};
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/lasso/Attic/protocols/single_sign_on_and_federation.c b/lasso/Attic/protocols/single_sign_on_and_federation.c
index d592fefc..08f3f2d0 100644
--- a/lasso/Attic/protocols/single_sign_on_and_federation.c
+++ b/lasso/Attic/protocols/single_sign_on_and_federation.c
@@ -203,7 +203,6 @@ lasso_authn_request_create(const xmlChar *providerID,
   lassoAuthnRequest *lareq;
 
   lareq = g_malloc(sizeof(lassoAuthnRequest));
-  lareq->type = lassoProtocolTypeAuthnRequest;
   lareq->node = lasso_authn_request_build_full(NULL,
 					       NULL,
 					       NULL,
@@ -244,7 +243,6 @@ lasso_authn_response_create(xmlChar       *query,
   gint         proxyCount = 0;
 
   lares = g_malloc(sizeof(lassoAuthnResponse));
-  lares->type = lassoProtocolTypeAuthnResponse;
   lares->request_query = query;
   lares->public_key = public_key;
   lares->private_key = private_key;
@@ -418,17 +416,17 @@ lasso_authn_response_add_assertion(lassoAuthnResponse *lares,
 }
 
 LassoNode *
-lasso_assertion_build(gpointer *lares,
+lasso_assertion_build(gpointer lares,
 		      const xmlChar *issuer)
 {
   LassoNode *assertion, *statement, *subject;
   LassoAttr *requestID;
   xmlChar *content;
 
-  g_assert(((lassoAuthnResponse *)lares)->type == lassoProtocolTypeAuthnResponse ||
-	   ((lassoAuthnResponse *)lares)->type == lassoProtocolTypeResponse);
+  g_assert(LASSO_IS_LIB_AUTHN_RESPONSE(((lassoAuthnResponse *)lares)->node) ||
+	   LASSO_IS_SAMLP_RESPONSE(((lassoAuthnResponse *)lares)->node));
 
-  if (((lassoAuthnResponse *)lares)->type == lassoProtocolTypeAuthnResponse) {
+  if (LASSO_IS_LIB_AUTHN_RESPONSE(((lassoAuthnResponse *)lares)->node)) {
     assertion = lasso_lib_assertion_new();
   }
   else {
@@ -452,8 +450,14 @@ lasso_assertion_build(gpointer *lares,
 				  "RequestID");
   content = xmlNodeGetContent((xmlNodePtr)requestID);
   if (content != NULL) {
-    lasso_lib_assertion_set_inResponseTo(LASSO_LIB_ASSERTION(assertion),
-					 content);
+    if (LASSO_IS_LIB_AUTHN_RESPONSE(((lassoAuthnResponse *)lares)->node)) {
+      lasso_lib_assertion_set_inResponseTo(LASSO_LIB_ASSERTION(assertion),
+					   content);
+    }
+    else {
+      lasso_samlp_response_abstract_(LASSO_LIB_ASSERTION(assertion),
+				     content);
+    }
   }
   xmlFree(content);
 
diff --git a/lasso/Attic/protocols/single_sign_on_and_federation.h b/lasso/Attic/protocols/single_sign_on_and_federation.h
index 574366d2..5ff8d0a4 100644
--- a/lasso/Attic/protocols/single_sign_on_and_federation.h
+++ b/lasso/Attic/protocols/single_sign_on_and_federation.h
@@ -36,14 +36,12 @@ typedef struct _lassoAuthnRequest lassoAuthnRequest;
 
 struct _lassoAuthnRequest {
   LassoNode  *node;
-  enum lassoProtocolTypes type;
 };
 
 typedef struct _lassoAuthnResponse lassoAuthnResponse;
 
 struct _lassoAuthnResponse {
   LassoNode     *node;
-  enum lassoProtocolTypes type;
   LassoNode     *request_node;
   xmlChar       *request_query;
   gboolean       isPassive;
@@ -81,7 +79,7 @@ gint lasso_authn_response_init(lassoAuthnResponse *lares,
 gint lasso_authn_response_add_assertion(lassoAuthnResponse *lares,
 					LassoNode *assertion);
 
-LassoNode *lasso_assertion_build(gpointer *lares,
+LassoNode *lasso_assertion_build(gpointer lares,
 				 const xmlChar *issuer);
 
 gint lasso_assertion_add_authenticationStatement(LassoNode *assertion,