Corrected name of element AuthnContextComparison.

Added missing constants.

4 files changed, 107 insertions, 7 deletions

diff --git a/lasso/xml/lib_request_authn_context.c b/lasso/xml/lib_request_authn_context.c
index 11dfbae0..016e6c36 100644
--- a/lasso/xml/lib_request_authn_context.c
+++ b/lasso/xml/lib_request_authn_context.c
@@ -53,8 +53,8 @@ static struct XmlSnippet schema_snippets[] = {
 		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextClassRef) },
 	{ "AuthnContextStatementRef", SNIPPET_LIST_CONTENT,
 		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextStatementRef) },
-	{ "AuthnContextComparisonType", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextComparisonType) },
+	{ "AuthnContextComparison", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextComparison) },
 	{ NULL, 0, 0}
 };
 
@@ -67,7 +67,7 @@ instance_init(LassoLibRequestAuthnContext *node)
 {
 	node->AuthnContextClassRef = NULL;
 	node->AuthnContextStatementRef = NULL;
-	node->AuthnContextComparisonType = NULL;
+	node->AuthnContextComparison = NULL;
 }
 
 static void
diff --git a/lasso/xml/lib_request_authn_context.h b/lasso/xml/lib_request_authn_context.h
index 8718eaaa..b075d266 100644
--- a/lasso/xml/lib_request_authn_context.h
+++ b/lasso/xml/lib_request_authn_context.h
@@ -59,7 +59,7 @@ struct _LassoLibRequestAuthnContext {
 	GList *AuthnContextStatementRef;
 	/* <xs:element name="AuthnContextComparison" type="AuthnContextComparisonType" 
 	 *   minOccurs="0"/> */
-	char *AuthnContextComparisonType;
+	char *AuthnContextComparison;
 };
 
 struct _LassoLibRequestAuthnContextClass {
diff --git a/lasso/xml/strings.h b/lasso/xml/strings.h
index 6c11cc81..6a9f8cb6 100644
--- a/lasso/xml/strings.h
+++ b/lasso/xml/strings.h
@@ -51,9 +51,38 @@
 #define LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED	 "federated"
 #define LASSO_LIB_NAMEID_POLICY_TYPE_ANY	 "any"
 
+/* AuthenticationClassRef */
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_INTERNET_PROTOCOL \
+	"http://www.projectliberty.org/schemas/authctx/classes/InternetProtocol"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_INTERNET_PROTOCOL_PASSWORD \
+	"http://www.projectliberty.org/schemas/authctx/classes/InternetProtocolPassword"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_UNREGISTERED \
+	"http://www.projectliberty.org/schemas/authctx/classes/MobileOneFactorUnregistered"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_UNREGISTERED \
+	"http://www.projectliberty.org/schemas/authctx/classes/MobileTwoFactorUnregistered"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_CONTRACT \
+	"http://www.projectliberty.org/schemas/authctx/classes/MobileOneFactorContract"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_CONTRACT \
+	"http://www.projectliberty.org/schemas/authctx/classes/MobileTwoFactorContract"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PASSWORD \
+	"http://www.projectliberty.org/schemas/authctx/classes/Password"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PASSWORD_PROTECTED_TRANSPORT \
+	"http: //www.projectliberty.org/schemas/authctx/classes/PasswordProtectedTransport"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PREVIOUS_SESSION \
+	"http://www.projectliberty.org/schemas/authctx/classes/PreviousSession"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SMARTCARD \
+	"http://www.projectliberty.org/schemas/authctx/classes/Smartcard"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SMARTCARD_PKI \
+	"http://www.projectliberty.org/schemas/authctx/classes/SmartcardPKI"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SOFTWARE_PKI \
+	"http://www.projectliberty.org/schemas/authctx/classes/SoftwarePKI"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_TIME_SYNC_TOKEN \
+	"http://www.projectliberty.org/schemas/authctx/classes/TimeSyncToken"
+
 /* AuthnContextComparison */
 #define LASSO_LIB_AUTHN_CONTEXT_COMPARISON_EXACT	 "exact"
 #define LASSO_LIB_AUTHN_CONTEXT_COMPARISON_MINIMUM	 "minimum"
+#define LASSO_LIB_AUTHN_CONTEXT_COMPARISON_MAXIMUM	 "maximum"
 #define LASSO_LIB_AUTHN_CONTEXT_COMPARISON_BETTER	 "better"
 
 /* StatusCodes */
@@ -202,6 +231,7 @@
 #define LASSO_SAML_AUTHENTICATION_METHOD_XMLD_SIG       "urn:ietf:rfc:3075"
 #define LASSO_SAML_AUTHENTICATION_METHOD_UNSPECIFIED	\
 	"urn:oasis:names:tc:SAML:1.0:am:unspecified"
+#define LASSO_SAML_AUTHENTICATION_METHOD_LIBERTY        "urn:liberty:ac:2003-08"
 
 /* ConfirmationMethods */
 #define LASSO_SAML_CONFIRMATION_METHOD_ARTIFACT01	\
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 21d74a23..a80ed6ec 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -832,7 +832,75 @@ typedef enum {
 	LASSO_REQUEST_TYPE_LECP = 6
 } LassoRequestType;
 
-/* SamlAuthenticationMethod */
+/* lib:AuthnContextClassRef */
+#ifndef SWIGPHP4
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_INTERNET_PROTOCOL)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_INTERNET_PROTOCOL;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_INTERNET_PROTOCOL_PASSWORD)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_INTERNET_PROTOCOL_PASSWORD;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_UNREGISTERED)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_UNREGISTERED;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_UNREGISTERED)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_UNREGISTERED;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_CONTRACT)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_CONTRACT;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_CONTRACT)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_CONTRACT;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_PASSWORD)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PASSWORD;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_PASSWORD_PROTECTED_TRANSPORT)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PASSWORD_PROTECTED_TRANSPORT;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_PREVIOUS_SESSION)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PREVIOUS_SESSION;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_SMARTCARD)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SMARTCARD;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_SMARTCARD_PKI)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SMARTCARD_PKI;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_SOFTWARE_PKI)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SOFTWARE_PKI;
+%rename(LIB_AUTHN_CONTEXT_CLASS_REF_TIME_SYNC_TOKEN)
+	LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_TIME_SYNC_TOKEN;
+#endif
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_INTERNET_PROTOCOL \
+	"http://www.projectliberty.org/schemas/authctx/classes/InternetProtocol"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_INTERNET_PROTOCOL_PASSWORD \
+	"http://www.projectliberty.org/schemas/authctx/classes/InternetProtocolPassword"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_UNREGISTERED \
+	"http://www.projectliberty.org/schemas/authctx/classes/MobileOneFactorUnregistered"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_UNREGISTERED \
+	"http://www.projectliberty.org/schemas/authctx/classes/MobileTwoFactorUnregistered"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_CONTRACT \
+	"http://www.projectliberty.org/schemas/authctx/classes/MobileOneFactorContract"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_CONTRACT \
+	"http://www.projectliberty.org/schemas/authctx/classes/MobileTwoFactorContract"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PASSWORD \
+	"http://www.projectliberty.org/schemas/authctx/classes/Password"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PASSWORD_PROTECTED_TRANSPORT \
+	"http: //www.projectliberty.org/schemas/authctx/classes/PasswordProtectedTransport"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_PREVIOUS_SESSION \
+	"http://www.projectliberty.org/schemas/authctx/classes/PreviousSession"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SMARTCARD \
+	"http://www.projectliberty.org/schemas/authctx/classes/Smartcard"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SMARTCARD_PKI \
+	"http://www.projectliberty.org/schemas/authctx/classes/SmartcardPKI"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_SOFTWARE_PKI \
+	"http://www.projectliberty.org/schemas/authctx/classes/SoftwarePKI"
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS_REF_TIME_SYNC_TOKEN \
+	"http://www.projectliberty.org/schemas/authctx/classes/TimeSyncToken"
+
+/* lib:AuthnContextComparison */
+#ifndef SWIGPHP4
+%rename(LIB_AUTHN_CONTEXT_COMPARISON_EXACT) LASSO_LIB_AUTHN_CONTEXT_COMPARISON_EXACT;
+%rename(LIB_AUTHN_CONTEXT_COMPARISON_MINIMUM) LASSO_LIB_AUTHN_CONTEXT_COMPARISON_MINIMUM;
+%rename(LIB_AUTHN_CONTEXT_COMPARISON_MAXIMUM) LASSO_LIB_AUTHN_CONTEXT_COMPARISON_MAXIMUM;
+%rename(LIB_AUTHN_CONTEXT_COMPARISON_BETTER) LASSO_LIB_AUTHN_CONTEXT_COMPARISON_BETTER;
+#endif
+#define LASSO_LIB_AUTHN_CONTEXT_COMPARISON_EXACT "exact"
+#define LASSO_LIB_AUTHN_CONTEXT_COMPARISON_MINIMUM "minimum"
+#define LASSO_LIB_AUTHN_CONTEXT_COMPARISON_MAXIMUM "maximum"
+#define LASSO_LIB_AUTHN_CONTEXT_COMPARISON_BETTER "better"
+
+/* saml:AuthenticationMethod */
 #ifndef SWIGPHP4
 %rename(SAML_AUTHENTICATION_METHOD_PASSWORD) LASSO_SAML_AUTHENTICATION_METHOD_PASSWORD;
 %rename(SAML_AUTHENTICATION_METHOD_KERBEROS) LASSO_SAML_AUTHENTICATION_METHOD_KERBEROS;
@@ -845,6 +913,7 @@ typedef enum {
 %rename(SAML_AUTHENTICATION_METHOD_XKMS) LASSO_SAML_AUTHENTICATION_METHOD_XKMS;
 %rename(SAML_AUTHENTICATION_METHOD_XMLD_SIG) LASSO_SAML_AUTHENTICATION_METHOD_XMLD_SIG;
 %rename(SAML_AUTHENTICATION_METHOD_UNSPECIFIED) LASSO_SAML_AUTHENTICATION_METHOD_UNSPECIFIED;
+%rename(SAML_AUTHENTICATION_METHOD_LIBERTY) LASSO_SAML_AUTHENTICATION_METHOD_LIBERTY;
 #endif
 #define LASSO_SAML_AUTHENTICATION_METHOD_PASSWORD "urn:oasis:names:tc:SAML:1.0:am:password"
 #define LASSO_SAML_AUTHENTICATION_METHOD_KERBEROS "urn:ietf:rfc:1510"
@@ -857,6 +926,7 @@ typedef enum {
 #define LASSO_SAML_AUTHENTICATION_METHOD_XKMS "urn:oasis:names:tc:SAML:1.0:am:XKMS"
 #define LASSO_SAML_AUTHENTICATION_METHOD_XMLD_SIG "urn:ietf:rfc:3075"
 #define LASSO_SAML_AUTHENTICATION_METHOD_UNSPECIFIED "urn:oasis:names:tc:SAML:1.0:am:unspecified"
+#define LASSO_SAML_AUTHENTICATION_METHOD_LIBERTY "urn:liberty:ac:2003-08"
 
 /* SignatureMethod */
 #ifndef SWIGPHP4
@@ -4464,9 +4534,9 @@ typedef struct {
 #endif
 typedef struct {
 #ifndef SWIGPHP4
-	%rename(authnContextComparisonType) AuthnContextComparisonType;
+	%rename(authnContextComparison) AuthnContextComparison;
 #endif
-	char *AuthnContextComparisonType;
+	char *AuthnContextComparison;
 } LassoLibRequestAuthnContext;
 %extend LassoLibRequestAuthnContext {
 	/* Attributes */