Author: dumindu
Date: Wed Oct 10 07:45:17 2007
New Revision: 583496
URL: http://svn.apache.org/viewvc?rev=583496&view=rev
Log:
Fixed a few more macro names for consistency.
Modified:
webservices/rampart/scratch/c/saml/include/SAML.h
webservices/rampart/scratch/c/saml/include/saml_req.h
webservices/rampart/scratch/c/saml/src/saml_request.c
webservices/rampart/scratch/c/saml/src/saml_responce.c
Modified: webservices/rampart/scratch/c/saml/include/SAML.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/include/SAML.h?rev=583496&r1=583495&r2=583496&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/include/SAML.h (original)
+++ webservices/rampart/scratch/c/saml/include/SAML.h Wed Oct 10 07:45:17 2007
@@ -23,336 +23,336 @@
#include<axutil_date_time.h>
#include<axiom.h>
-#define SAML_VERSION_MAX 16
-#define SAML_URI_LEN_MAX 2048
-#define SAML_ARRAY_LIST_DEF 4
-
-#define SAML_PREFIX "saml"
-#define SAML_NMSP_URI
"urn:oasis:names:tc:SAML:1.0:assertion"
-#define SAML_XML_TYPE "type"
-#define SAML_XSI_NS
"http://www.w3.org/2001/XMLSchema-instance";
-#define SAML_XSI "xsi"
-
-#define SAML_MAJORVERSION "MajorVersion"
-#define SAML_MINORVERSION "MinorVersion"
-#define SAML_ASSERTION_ID "AssertionID"
-#define SAML_ISSUER "Issuer"
-#define SAML_ISSUE_INSTANT "IssueInstant"
-#define SAML_STATEMENT "Statement"
-#define SAML_SUBJECT_STATEMENT "SubjectStatement"
-#define SAML_AUTHENTICATION_STATEMENT "AuthenticationStatement"
-#define SAML_AUTHORIZATION_DECISION_STATEMENT "AuthorizationDecisionStatement"
-#define SAML_ATTRIBUTE_STATEMENT "AttributeStatement"
-#define SAML_CONDITIONS "Conditions"
-#define SAML_ADVICE "Advice"
-#define SAML_NOT_BEFORE "NotBefore"
-#define SAML_NOT_ON_OR_AFTER "NotOnOrAfter"
-
-#define SAML_EMAIL_ADDRESS "#emailAddress"
-#define SAML_X509_SUBJECT_NAME "#X509SubjectName"
-#define SAML_WINDOWS_DOMAIN_QUALIFIED_NAME "#WindowsDomainQualifiedName"
-
-#define SAML_NAME_QUALIFIER "NameQualifier"
-#define SAML_FORMAT "Format"
-#define SAML_NAME_IDENTIFIER "NameIdentifier"
-#define SAML_SUBJECT_CONFIRMATION "SubjectConfirmation"
-#define SAML_CONFIRMATION_METHOD "ConfirmationMethod"
-#define SAML_SUBJECT_CONFIRMATION_DATA "SubjectConfirmationData"
-#define SAML_KEY_INFO "KeyInfo"
-#define SAML_SUBJECT "Subject"
-
-#define SAML_AUDIENCE "Audience"
-#define SAML_AUDIENCE_RESTRICTION_CONDITION_TYPE
"AudienceRestrictionConditionType"
-
-#define SAML_AUTHENTICATION_METHOD "AuthenticationMethod"
-#define SAML_AUTHENTICATION_INSTANT "AuthenticationInstant"
-#define SAML_IP_ADDRESS "IPAddress"
-#define SAML_DNS_ADDRESS "DNSAddress"
-#define SAML_SUBJEC_LOCALITY "SubjectLocality"
-#define SAML_AUTHORITY_BINDING "AuthorityBinding"
-#define SAML_AUTHORITY_KIND "AuthorityKind"
-#define SAML_LOCATION "Location"
-#define SAML_BINDING "Binding"
-
-#define SAML_RESOURCE "Resource"
-#define SAML_DECISION "Decision"
-#define SAML_ACTION "Action"
-#define SAML_NAMESPACE "Namespace"
-#define SAML_ASSERTION_ID_REFERENCE "AssertionIDReference"
-#define SAML_ASSERTION "Assertion"
-#define SAML_ACTION "Action"
-#define SAML_EVIDENCE "Evidence"
-
-#define SAML_ATTRIBUTE_NAME "AttributeName"
-#define SAML_ATTRIBUTE_NAMESPACE "AttributeNamespace"
-#define SAML_ATTRIBUTE_VALUE "AttributeValue"
-#define SAML_ATTRIBUTE "Attribute"
-#define SAML_ATTRIBUTE_DESIGNATOR "AttributeDesignator"
+#define SAML_VERSION_MAX 16
+#define SAML_URI_LEN_MAX 2048
+#define SAML_ARRAY_LIST_DEF 4
+
+#define SAML_PREFIX "saml"
+#define SAML_NMSP_URI
"urn:oasis:names:tc:SAML:1.0:assertion"
+#define SAML_XML_TYPE "type"
+#define SAML_XSI_NS
"http://www.w3.org/2001/XMLSchema-instance";
+#define SAML_XSI "xsi"
+
+#define SAML_MAJORVERSION "MajorVersion"
+#define SAML_MINORVERSION "MinorVersion"
+#define SAML_ASSERTION_ID "AssertionID"
+#define SAML_ISSUER "Issuer"
+#define SAML_ISSUE_INSTANT "IssueInstant"
+#define SAML_STATEMENT "Statement"
+#define SAML_SUBJECT_STATEMENT "SubjectStatement"
+#define SAML_AUTHENTICATION_STATEMENT "AuthenticationStatement"
+#define SAML_AUTHORIZATION_DECISION_STATEMENT
"AuthorizationDecisionStatement"
+#define SAML_ATTRIBUTE_STATEMENT "AttributeStatement"
+#define SAML_CONDITIONS "Conditions"
+#define SAML_ADVICE "Advice"
+#define SAML_NOT_BEFORE "NotBefore"
+#define SAML_NOT_ON_OR_AFTER "NotOnOrAfter"
+
+#define SAML_EMAIL_ADDRESS "#emailAddress"
+#define SAML_X509_SUBJECT_NAME "#X509SubjectName"
+#define SAML_WINDOWS_DOMAIN_QUALIFIED_NAME "#WindowsDomainQualifiedName"
+
+#define SAML_NAME_QUALIFIER "NameQualifier"
+#define SAML_FORMAT "Format"
+#define SAML_NAME_IDENTIFIER "NameIdentifier"
+#define SAML_SUBJECT_CONFIRMATION "SubjectConfirmation"
+#define SAML_CONFIRMATION_METHOD "ConfirmationMethod"
+#define SAML_SUBJECT_CONFIRMATION_DATA "SubjectConfirmationData"
+#define SAML_KEY_INFO "KeyInfo"
+#define SAML_SUBJECT "Subject"
+
+#define SAML_AUDIENCE "Audience"
+#define SAML_AUDIENCE_RESTRICTION_CONDITION_TYPE
"AudienceRestrictionConditionType"
+
+#define SAML_AUTHENTICATION_METHOD "AuthenticationMethod"
+#define SAML_AUTHENTICATION_INSTANT "AuthenticationInstant"
+#define SAML_IP_ADDRESS "IPAddress"
+#define SAML_DNS_ADDRESS "DNSAddress"
+#define SAML_SUBJEC_LOCALITY "SubjectLocality"
+#define SAML_AUTHORITY_BINDING "AuthorityBinding"
+#define SAML_AUTHORITY_KIND "AuthorityKind"
+#define SAML_LOCATION "Location"
+#define SAML_BINDING "Binding"
+
+#define SAML_RESOURCE "Resource"
+#define SAML_DECISION "Decision"
+#define SAML_ACTION "Action"
+#define SAML_NAMESPACE "Namespace"
+#define SAML_ASSERTION_ID_REFERENCE "AssertionIDReference"
+#define SAML_ASSERTION "Assertion"
+#define SAML_ACTION "Action"
+#define SAML_EVIDENCE "Evidence"
+
+#define SAML_ATTRIBUTE_NAME "AttributeName"
+#define SAML_ATTRIBUTE_NAMESPACE "AttributeNamespace"
+#define SAML_ATTRIBUTE_VALUE "AttributeValue"
+#define SAML_ATTRIBUTE "Attribute"
+#define SAML_ATTRIBUTE_DESIGNATOR "AttributeDesignator"
typedef struct saml_assertion_s saml_assertion_t;
typedef enum deciosion_type
{
- PERMIT = 0,
- DENY,
- INDETERMINATE
+ PERMIT = 0,
+ DENY,
+ INDETERMINATE
} deciosion_type_t;
typedef struct saml_type
{
- char *id;
+ char *id;
} saml_id_t;
typedef enum
{
- SAML_COND_UNSPECFIED = 0,
- SAML_COND_AUDI_RESTRICTION
+ SAML_COND_UNSPECFIED = 0,
+ SAML_COND_AUDI_RESTRICTION
} saml_cond_type_t;
typedef struct condition_s
{
- saml_cond_type_t type;
- void *cond;
+ saml_cond_type_t type;
+ void *cond;
} saml_condition_t;
typedef struct saml_audi_restriction_cond_s
{
- axutil_array_list_t *audiences;
+ axutil_array_list_t *audiences;
} saml_audi_restriction_cond_t;
typedef struct saml_advise_s
{
- int a;
+ int a;
} saml_advise_t;
typedef enum
{
- SAML_STMT_UNSPECIFED = 0,
- SAML_STMT_SUBJECTSTATEMENT,
- SAML_STMT_AUTHENTICATIONSTATEMENT,
- SAML_STMT_AUTHORIZATIONDECISIONSTATEMENT,
- SAML_STMT_ATTRIBUTESTATEMENT
+ SAML_STMT_UNSPECIFED = 0,
+ SAML_STMT_SUBJECTSTATEMENT,
+ SAML_STMT_AUTHENTICATIONSTATEMENT,
+ SAML_STMT_AUTHORIZATIONDECISIONSTATEMENT,
+ SAML_STMT_ATTRIBUTESTATEMENT
} saml_stmt_type_t;
typedef struct
{
- saml_stmt_type_t type;
- void *stmt;
+ saml_stmt_type_t type;
+ void *stmt;
} saml_stmt_t;
typedef struct saml_named_id_s
{
- /* The security or administrative domain that qualifies the name of
- * the subject
- */
- axis2_char_t *name_qualifier;
+ /* The security or administrative domain that qualifies the name of
+ * the subject
+ */
+ axis2_char_t *name_qualifier;
- /* The syntax used to describe the name of the subject */
- axis2_char_t *format;
+ /* The syntax used to describe the name of the subject */
+ axis2_char_t *format;
- axis2_char_t *name;
+ axis2_char_t *name;
} saml_named_id_t;
typedef struct saml_subject_conformation_s
{
- /* URI reference that identifies a protocol to be used to authenticate
- * the subject
- */
- axutil_array_list_t *methods;
-
- /* An XML Signature element that specifies a cryptographic key held by
- * the subject
- */
- axiom_node_t *key_info;
-
- /* Additional authentication information to be used by a specific
- * authentication protocol
- */
- axiom_node_t *data;
+ /* URI reference that identifies a protocol to be used to authenticate
+ * the subject
+ */
+ axutil_array_list_t *methods;
+
+ /* An XML Signature element that specifies a cryptographic key held by
+ * the subject
+ */
+ axiom_node_t *key_info;
+
+ /* Additional authentication information to be used by a specific
+ * authentication protocol
+ */
+ axiom_node_t *data;
} saml_subject_conformation_t;
typedef struct saml_subject_s
{
- saml_named_id_t named_id;
-
- /* URI reference that identifies a protocol to be used to authenticate
- * the subject
- */
- axutil_array_list_t *confirmation_methods;
-
- /* An XML Signature element that specifies a cryptographic key held by
- * the subject
- */
- axiom_node_t *key_info;
-
- /* Additional authentication information to be used by a specific
- * authentication protocol
- */
- axiom_node_t *confirmation_data;
+ saml_named_id_t named_id;
+
+ /* URI reference that identifies a protocol to be used to authenticate
+ * the subject
+ */
+ axutil_array_list_t *confirmation_methods;
+
+ /* An XML Signature element that specifies a cryptographic key held by
+ * the subject
+ */
+ axiom_node_t *key_info;
+
+ /* Additional authentication information to be used by a specific
+ * authentication protocol
+ */
+ axiom_node_t *confirmation_data;
} saml_subject_t;
typedef struct saml_subject_stmt_s
{
- saml_subject_t subject;
+ saml_subject_t subject;
} saml_subject_stmt_t;
typedef struct saml_action
{
- /* URI for the specified action to be performed */
- char *name_space;
+ /* URI for the specified action to be performed */
+ char *name_space;
- /* An action to be performed on the data */
- char *data;
+ /* An action to be performed on the data */
+ char *data;
} saml_action_t;
typedef struct saml_evidence_s
{
- /* Specifies an assertion by reference to the value of the assertions
- * AssertionID attribute
- */
- axutil_array_list_t *assertion_ids;
+ /* Specifies an assertion by reference to the value of the assertions
+ * AssertionID attribute
+ */
+ axutil_array_list_t *assertion_ids;
- /* Specifies an assertion by value */
- axutil_array_list_t *assertions;
+ /* Specifies an assertion by value */
+ axutil_array_list_t *assertions;
} saml_evidence_t;
typedef struct saml_subject_locality
{
- /* The IP address of the system entity that was authenticated */
- axis2_char_t *ip;
+ /* The IP address of the system entity that was authenticated */
+ axis2_char_t *ip;
- /* The DNS address of the system entity that was authenticated */
- axis2_char_t *dns;
+ /* The DNS address of the system entity that was authenticated */
+ axis2_char_t *dns;
} saml_subject_locality_t;
typedef struct saml_auth_binding
{
- /* The type of SAML Protocol queries to which the authority described
- * by this element will respond
- */
- axis2_char_t *auth_kind;
-
- /* A URI reference describing how to locate and communicate with the
- * authority
- */
- axis2_char_t *location;
-
- /* A URI reference identifying the SAML protocol binding to use
- * in communicating with the authority
- */
- axis2_char_t *binding;
+ /* The type of SAML Protocol queries to which the authority described
+ * by this element will respond
+ */
+ axis2_char_t *auth_kind;
+
+ /* A URI reference describing how to locate and communicate with the
+ * authority
+ */
+ axis2_char_t *location;
+
+ /* A URI reference identifying the SAML protocol binding to use
+ * in communicating with the authority
+ */
+ axis2_char_t *binding;
} saml_auth_binding_t;
typedef struct saml_auth_stmt
{
- /* A URI reference that specifies the type of authentication that took
place */
- axis2_char_t *auth_method;
-
- /* Specifies the time at which the authentication took place */
- axutil_date_time_t *auth_instanse;
-
- /*
- * Specifies the DNS domain name and IP address for the system entity
from which the Subject was
- * apparently authenticated
- */
- saml_subject_locality_t *sub_locality;
+ /* A URI reference that specifies the type of authentication that took
place */
+ axis2_char_t *auth_method;
+
+ /* Specifies the time at which the authentication took place */
+ axutil_date_time_t *auth_instanse;
+
+ /*
+ * Specifies the DNS domain name and IP address for the system entity from
which the Subject was
+ * apparently authenticated
+ */
+ saml_subject_locality_t *sub_locality;
- /* Indicates that additional information about the subject of the
statement may be available */
- axutil_array_list_t *auth_binding;
+ /* Indicates that additional information about the subject of the
statement may be available */
+ axutil_array_list_t *auth_binding;
} saml_auth_stmt_t;
typedef struct saml_auth_desicion_stmt
{
- saml_subject_t subject;
- /* A URI reference identifying the resource to which access
authorization */
- char *resource;
+ saml_subject_t subject;
+ /* A URI reference identifying the resource to which access authorization
*/
+ char *resource;
- /* The decision rendered by the issuer with respect to the specified
resource */
- char *decision;
+ /* The decision rendered by the issuer with respect to the specified
resource */
+ char *decision;
- /* The set of actions authorized to be performed on the specified
resource */
- axutil_array_list_t *action;
+ /* The set of actions authorized to be performed on the specified resource
*/
+ axutil_array_list_t *action;
- /* A set of assertions that the issuer relied on in making the decision
*/
- saml_evidence_t *evidence;
+ /* A set of assertions that the issuer relied on in making the decision */
+ saml_evidence_t *evidence;
} saml_auth_desicion_stmt_t;
typedef struct saml_attr_s
{
- /* The name of the attribute */
- char *attr_name;
+ /* The name of the attribute */
+ char *attr_name;
- /* The namespace in which the AttributeName elements are interpreted */
- char *attr_nmsp;
+ /* The namespace in which the AttributeName elements are interpreted */
+ char *attr_nmsp;
- axutil_array_list_t *attr_value;
+ axutil_array_list_t *attr_value;
} saml_attr_t;
typedef struct saml_attr_stmt_s
{
- saml_subject_t subject;
- /* An attribute */
- axutil_array_list_t *attribute;
+ saml_subject_t subject;
+ /* An attribute */
+ axutil_array_list_t *attribute;
} saml_attr_stmt_t;
typedef struct saml_attr_desig_s
{
- axis2_char_t *attr_name;
- axis2_char_t *attr_nmsp;
+ axis2_char_t *attr_name;
+ axis2_char_t *attr_nmsp;
} saml_attr_desig_t;
typedef struct saml_signature_s
{
- int a;
+ int a;
} saml_signature_t;
struct saml_assertion_s
{
- /* majod version */
- axis2_char_t *major_version;
+ /* majod version */
+ axis2_char_t *major_version;
- /* minor version */
- axis2_char_t *minor_version;
+ /* minor version */
+ axis2_char_t *minor_version;
- /* id */
- axis2_char_t *assertion_id;
+ /* id */
+ axis2_char_t *assertion_id;
- /* uri representing the issuer */
- axis2_char_t *issuer;
+ /* uri representing the issuer */
+ axis2_char_t *issuer;
- /* time instant of the issue */
- axutil_date_time_t *issue_instant;
+ /* time instant of the issue */
+ axutil_date_time_t *issue_instant;
- axutil_date_time_t *not_before;
+ axutil_date_time_t *not_before;
- axutil_date_time_t *not_on_or_after;
+ axutil_date_time_t *not_on_or_after;
- /* SAML condition */
- axutil_array_list_t *conditions;
+ /* SAML condition */
+ axutil_array_list_t *conditions;
- /* An XML Signature that authenticates the assertion */
- saml_signature_t *signature;
+ /* An XML Signature that authenticates the assertion */
+ saml_signature_t *signature;
- /* A subject statement defined in an extension schema */
- saml_subject_stmt_t *sub_stmt;
+ /* A subject statement defined in an extension schema */
+ saml_subject_stmt_t *sub_stmt;
- /* An authentication statement */
- saml_auth_stmt_t *auth_stmt;
+ /* An authentication statement */
+ saml_auth_stmt_t *auth_stmt;
- /* An authorization decision statement */
- saml_auth_desicion_stmt_t *auth_des_stmt;
+ /* An authorization decision statement */
+ saml_auth_desicion_stmt_t *auth_des_stmt;
- /* An attribute statement */
- saml_attr_stmt_t *attr_stmt;
+ /* An attribute statement */
+ saml_attr_stmt_t *attr_stmt;
};
Modified: webservices/rampart/scratch/c/saml/include/saml_req.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/include/saml_req.h?rev=583496&r1=583495&r2=583496&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/include/saml_req.h (original)
+++ webservices/rampart/scratch/c/saml/include/saml_req.h Wed Oct 10 07:45:17
2007
@@ -1,113 +1,114 @@
#include "SAML.h"
-#define SAML_REQUESTID "RequestID"
-#define SAML_SIGNATURE "Signature"
-#define SAML_SUBJECTQUERY "SubjectQuery"
-#define SAML_AUTHENTICATIONQUERY "AuthenticationQuery"
-#define SAML_AUTHDECISIONQUERY "AuthorizationDecisionQuery"
-#define SAML_ASSERTIONIDREF "AssertionIDReference"
-#define SAML_ASSERTIONARTIFACT "AssertionArtifact"
-#define SAML_RESPONDWITH "RespondWith"
-#define SAML_ATTRDESIGNATOR "AttributeDesignator"
-#define SAML_RESPONCEID "ResponceID"
-#define SAML_INRESPONCETO "InResponseTo"
-#define SAML_RECEPIENT "Recipient"
-#define SAML_STATUSCODE "StatusCode"
-#define SAML_STATUSMSG "StatusMessage"
-#define SAML_STATUSDETAIL "StatusDetail"
-#define SAML_STATUSVALUE "Value"
-#define SAML_STATUS "Status"
+#define SAML_REQUEST_ID "RequestID"
+#define SAML_SIGNATURE "Signature"
+#define SAML_SUBJECT_QUERY "SubjectQuery"
+#define SAML_AUTHENTICATION_QUERY "AuthenticationQuery"
+#define SAML_AUTHORIZATION_DECISION_QUERY "AuthorizationDecisionQuery"
+#define SAML_ASSERTION_ID_REF "AssertionIDReference"
+#define SAML_ASSERTION_ARTIFACT "AssertionArtifact"
+#define SAML_RESPOND_WITH "RespondWith"
+#define SAML_ATTRIBUTE_DESIGNATOR "AttributeDesignator"
+#define SAML_RESPONCE_ID "ResponceID"
+#define SAML_IN_RESPONSE_TO "InResponseTo"
+#define SAML_RECEPIENT "Recipient"
+#define SAML_STATUS_CODE "StatusCode"
+#define SAML_STATUS_MESSAGE "StatusMessage"
+#define SAML_STATUS_DETAIL "StatusDetail"
+#define SAML_STATUS_VALUE "Value"
+#define SAML_STATUS "Status"
+
/*A code representing the status of the corresponding request*/
typedef struct saml_status
{
- axutil_qname_t *status_value;
- axis2_char_t *status_code;
- axis2_char_t *status_msg;
- axis2_char_t *status_detail;
+ axutil_qname_t *status_value;
+ axis2_char_t *status_code;
+ axis2_char_t *status_msg;
+ axis2_char_t *status_detail;
}saml_status_t;
typedef struct saml_subject_query
{
- saml_subject_t *subject;
+ saml_subject_t *subject;
}saml_subject_query_t;
typedef struct saml_authentication_query
{
- saml_subject_t *subject;
- /* A URI reference that specifies the type of authentication that took
place */
- axis2_char_t *auth_method;
+ saml_subject_t *subject;
+ /* A URI reference that specifies the type of authentication that took
place */
+ axis2_char_t *auth_method;
}saml_authentication_query_t;
typedef struct saml_attr_query
{
- saml_subject_t *subject;
- axis2_char_t *resource;
- axutil_array_list_t *attr_desigs;
+ saml_subject_t *subject;
+ axis2_char_t *resource;
+ axutil_array_list_t *attr_desigs;
}saml_attr_query_t;
typedef struct saml_autho_decision_query
{
- saml_subject_t *subject;
- axis2_char_t *resource;
- /* One or more saml actions*/
- axutil_array_list_t *saml_actions;
- saml_evidence_t *evidence;
+ saml_subject_t *subject;
+ axis2_char_t *resource;
+ /* One or more saml actions*/
+ axutil_array_list_t *saml_actions;
+ saml_evidence_t *evidence;
}saml_autho_decision_query_t;
typedef struct saml_request
{
- saml_id_t request_id;
+ saml_id_t request_id;
- /* majod version */
- axis2_char_t *major_version;
+ /* majod version */
+ axis2_char_t *major_version;
- /* minor version */
- axis2_char_t *minor_version;
+ /* minor version */
+ axis2_char_t *minor_version;
- /* time instant of the issue */
- axutil_date_time_t *issue_instant;
- /*optional*/
- saml_signature_t *signature;
+ /* time instant of the issue */
+ axutil_date_time_t *issue_instant;
+ /*optional*/
+ saml_signature_t *signature;
- /*An array for QNames*/
- axutil_array_list_t *saml_responds;
+ /*An array for QNames*/
+ axutil_array_list_t *saml_responds;
- /*To request assrtions by means of ID/ one or more*/
- axutil_array_list_t *saml_asserion_id_ref;
-
- axutil_array_list_t *saml_artifacts;
+ /*To request assrtions by means of ID/ one or more*/
+ axutil_array_list_t *saml_asserion_id_ref;
+
+ axutil_array_list_t *saml_artifacts;
- saml_subject_query_t *subject_query;
+ saml_subject_query_t *subject_query;
- saml_authentication_query_t *authentication_query;
+ saml_authentication_query_t *authentication_query;
- saml_autho_decision_query_t *autho_decision_query;
-
- saml_attr_query_t *attribute_query;
+ saml_autho_decision_query_t *autho_decision_query;
+
+ saml_attr_query_t *attribute_query;
}saml_request_t;
typedef struct saml_response
{
- saml_id_t responce_id;
+ saml_id_t responce_id;
- axis2_char_t *major_version;
+ axis2_char_t *major_version;
- axis2_char_t *minor_version;
-//
- axis2_char_t *recepient;
+ axis2_char_t *minor_version;
+
+ axis2_char_t *recepient;
- saml_id_t request_responce_id;
+ saml_id_t request_responce_id;
- axutil_date_time_t *issue_instant;
+ axutil_date_time_t *issue_instant;
- saml_signature_t *signature;
+ saml_signature_t *signature;
- saml_status_t *status;
+ saml_status_t *status;
- axutil_array_list_t *saml_assertions;
+ axutil_array_list_t *saml_assertions;
}saml_responce_t;
AXIS2_EXTERN int AXIS2_CALL saml_request_init(saml_request_t *request,
axutil_env_t *env);
Modified: webservices/rampart/scratch/c/saml/src/saml_request.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/saml_request.c?rev=583496&r1=583495&r2=583496&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/saml_request.c (original)
+++ webservices/rampart/scratch/c/saml/src/saml_request.c Wed Oct 10 07:45:17
2007
@@ -342,7 +342,7 @@
}
else if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_ATTRDESIGNATOR)))
+
SAML_ATTRIBUTE_DESIGNATOR)))
{
saml_attr_desig_t *attr_desig =
(saml_attr_desig_t*)AXIS2_MALLOC(env->allocator,
sizeof(saml_attr_desig_t));
@@ -458,7 +458,7 @@
axiom_attribute_t *attr = (axiom_attribute_t*)v;
attr_val = axiom_attribute_get_value(attr, env);
- if(!axutil_strcmp(axiom_attribute_get_localname(attr,
env), SAML_REQUESTID))
+ if(!axutil_strcmp(axiom_attribute_get_localname(attr,
env), SAML_REQUEST_ID))
{
//to do
request->request_id.id = attr_val;
@@ -499,7 +499,7 @@
element = (axiom_element_t
*)axiom_node_get_data_element(child_node, env);
if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_RESPONDWITH)))
+
SAML_RESPOND_WITH)))
{
axutil_array_list_add(request->saml_responds,
@@ -513,30 +513,30 @@
//To do
}
else if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_SUBJECTQUERY)))
+
SAML_SUBJECT_QUERY)))
{
request->subject_query =
saml_subject_query_create(env);
saml_subject_query_build(request->subject_query, child_node, env);
}
else if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_AUTHENTICATIONQUERY)))
+
SAML_AUTHENTICATION_QUERY)))
{
request->authentication_query =
saml_authentication_query_create(env);
saml_authentication_query_build(request->authentication_query, child_node, env);
}
else if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_AUTHDECISIONQUERY)))
+
SAML_AUTHORIZATION_DECISION_QUERY)))
{
request->autho_decision_query =
saml_autho_decision_query_create(env);
saml_autho_decision_query_build(request->autho_decision_query, child_node, env);
}
else if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_ASSERTIONIDREF)))
+
SAML_ASSERTION_ID_REF)))
{
//To do
}
else if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_ASSERTIONARTIFACT)))
+
SAML_ASSERTION_ARTIFACT)))
{
//To do
axutil_array_list_add(request->saml_artifacts,
Modified: webservices/rampart/scratch/c/saml/src/saml_responce.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/saml_responce.c?rev=583496&r1=583495&r2=583496&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/saml_responce.c (original)
+++ webservices/rampart/scratch/c/saml/src/saml_responce.c Wed Oct 10 07:45:17
2007
@@ -37,21 +37,21 @@
element = (axiom_element_t
*)axiom_node_get_data_element(child_node, env);
if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_STATUSCODE)))
+
SAML_STATUS_CODE)))
{
- qname =
axiom_element_get_attribute_value_by_name(element, env, SAML_STATUSVALUE);
+ qname =
axiom_element_get_attribute_value_by_name(element, env, SAML_STATUS_VALUE);
if(qname)
status->status_value =
axutil_qname_create_from_string(env, qname);
}
else if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_STATUSMSG)))
+
SAML_STATUS_MESSAGE)))
{
status->status_msg =
axiom_element_get_text(element, env, child_node);
}
else if(element != NULL &&
!(axutil_strcmp(axiom_element_get_localname(element, env),
-
SAML_STATUSDETAIL)))
+
SAML_STATUS_DETAIL)))
{
/////
status->status_detail =
axiom_element_get_text(element, env, child_node);
@@ -98,12 +98,12 @@
axiom_attribute_t *attr = (axiom_attribute_t*)v;
attr_val = axiom_attribute_get_value(attr, env);
- if(!axutil_strcmp(axiom_attribute_get_localname(attr,
env), SAML_RESPONCEID))
+ if(!axutil_strcmp(axiom_attribute_get_localname(attr,
env), SAML_RESPONCE_ID))
{
//to do
responce->responce_id.id = attr_val;
}
- if(!axutil_strcmp(axiom_attribute_get_localname(attr,
env), SAML_INRESPONCETO))
+ if(!axutil_strcmp(axiom_attribute_get_localname(attr,
env), SAML_IN_RESPONSE_TO))
{
//to do
responce->request_responce_id.id = attr_val;
