*** empty log message ***

3 files changed, 29 insertions, 20 deletions

diff --git a/python/protocols/elements/py_authentication_statement.c b/python/protocols/elements/py_authentication_statement.c
index 16ed4e13..acef02dc 100644
--- a/python/protocols/elements/py_authentication_statement.c
+++ b/python/protocols/elements/py_authentication_statement.c
@@ -43,7 +43,6 @@ PyObject *LassoAuthenticationStatement_wrap(LassoAuthenticationStatement *statem
 
 PyObject *authentication_statement_new(PyObject *self, PyObject *args) {
   const xmlChar *authenticationMethod;
-  const xmlChar *sessionIndex;
   const xmlChar *reauthenticateOnOrAfter;
   xmlChar       *nameIdentifier;
   const xmlChar *nameQualifier;
@@ -51,27 +50,22 @@ PyObject *authentication_statement_new(PyObject *self, PyObject *args) {
   xmlChar       *idp_nameIdentifier;
   const xmlChar *idp_nameQualifier;
   const xmlChar *idp_format;
-  const xmlChar *confirmationMethod;
   LassoNode *statement;
 
-  if(!PyArg_ParseTuple(args, (char *) "ssssssssss:authentication_statement_new",
-		       &authenticationMethod, &sessionIndex,
-		       &reauthenticateOnOrAfter,
+  if(!PyArg_ParseTuple(args, (char *) "ssssssss:authentication_statement_new",
+		       &authenticationMethod, &reauthenticateOnOrAfter,
 		       &nameIdentifier, &nameQualifier, &format,
-		       &idp_nameIdentifier, &idp_nameQualifier, &idp_format,
-		       &confirmationMethod))
+		       &idp_nameIdentifier, &idp_nameQualifier, &idp_format))
     return NULL;
 
   statement = lasso_authentication_statement_new(authenticationMethod,
-						 sessionIndex,
 						 reauthenticateOnOrAfter,
 						 nameIdentifier,
 						 nameQualifier,
 						 format,
 						 idp_nameIdentifier,
 						 idp_nameQualifier,
-						 idp_format,
-						 confirmationMethod);
+						 idp_format);
 
   return (LassoAuthenticationStatement_wrap(LASSO_AUTHENTICATION_STATEMENT(statement)));
 }
diff --git a/python/protocols/py_authn_response.c b/python/protocols/py_authn_response.c
index 69cf9653..b8f70c76 100644
--- a/python/protocols/py_authn_response.c
+++ b/python/protocols/py_authn_response.c
@@ -61,8 +61,6 @@ PyObject *authn_response_getattr(PyObject *self, PyObject *args) {
 
   if (!strcmp(attr, "__members__"))
     return Py_BuildValue("[ss]", "requestID", "query");
-  if (!strcmp(attr, "requestID"))
-    return (xmlCharPtr_wrap(reponse->requestID));
   if (!strcmp(attr, "query"))
     return (xmlCharPtr_wrap(reponse->query));
 
@@ -72,19 +70,35 @@ PyObject *authn_response_getattr(PyObject *self, PyObject *args) {
 
 /******************************************************************************/
 
-PyObject *authn_response_new(PyObject *self, PyObject *args) {
-  xmlChar       *query;
-  const xmlChar *providerID;
+PyObject *authn_response_new_from_dump(PyObject *self, PyObject *args) {
+  xmlChar   *buffer;
+  LassoNode *response;
+
+  if (CheckArgs(args, "S:authn_response_new_from_dump")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:authn_response_new_from_dump",
+			 &buffer))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_authn_response_new_from_dump(buffer);
+
+  return (LassoAuthnResponse_wrap(LASSO_AUTHN_RESPONSE(response)));
+}
+
+PyObject *authn_response_new_from_request_query(PyObject *self, PyObject *args) {
+  xmlChar       *query = NULL;
+  const xmlChar *providerID = NULL;
   LassoNode     *response;
 
-  if (CheckArgs(args, "SS:authn_response_new")) {
-    if(!PyArg_ParseTuple(args, (char *) "ss:authn_response_new", &query,
-			 &providerID))
+  if (CheckArgs(args, "ss:authn_response_new_from_request_query")) {
+    if(!PyArg_ParseTuple(args, (char *) "zz:authn_response_new_from_request_query",
+			 &query, &providerID))
       return NULL;
   }
   else return NULL;
 
-  response = lasso_authn_response_new(query, providerID);
+  response = lasso_authn_response_new_from_request_query(query, providerID);
 
   return (LassoAuthnResponse_wrap(LASSO_AUTHN_RESPONSE(response)));
 }
diff --git a/python/protocols/py_authn_response.h b/python/protocols/py_authn_response.h
index fe85e839..79e3f20b 100644
--- a/python/protocols/py_authn_response.h
+++ b/python/protocols/py_authn_response.h
@@ -38,7 +38,8 @@ typedef struct {
 PyObject *LassoAuthnResponse_wrap(LassoAuthnResponse *response);
 
 PyObject *authn_response_getattr(PyObject *self, PyObject *args);
-PyObject *authn_response_new(PyObject *self, PyObject *args);
+PyObject *authn_response_new_from_dump(PyObject *self, PyObject *args);
+PyObject *authn_response_new_from_request_query(PyObject *self, PyObject *args);
 PyObject *authn_response_add_assertion(PyObject *self, PyObject *args);
 PyObject *authn_response_must_authenticate(PyObject *self, PyObject *args);
 PyObject *authn_response_process_authentication_result(PyObject *self, PyObject *args);