Author: milinda
Date: Wed Nov 7 01:43:32 2007
New Revision: 592671
URL: http://svn.apache.org/viewvc?rev=592671&view=rev
Log:
Added SAML linux build scripts and some chnages to SAML code to remove warnings
when compiling using gcc with -Werror.
Added:
webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am
Modified:
webservices/rampart/trunk/c/configure.ac
webservices/rampart/trunk/c/include/saml_req.h
webservices/rampart/trunk/c/src/omxmlsec/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/saml/assertion.c
webservices/rampart/trunk/c/src/omxmlsec/saml/attr_stmt.c
webservices/rampart/trunk/c/src/omxmlsec/saml/auth_des_stmt.c
webservices/rampart/trunk/c/src/omxmlsec/saml/auth_smt.c
webservices/rampart/trunk/c/src/omxmlsec/saml/query.c
webservices/rampart/trunk/c/src/omxmlsec/saml/request.c
webservices/rampart/trunk/c/src/omxmlsec/saml/response.c
webservices/rampart/trunk/c/src/omxmlsec/saml/stmt.c
webservices/rampart/trunk/c/src/omxmlsec/saml/subject.c
webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c
Modified: webservices/rampart/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/configure.ac?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/configure.ac (original)
+++ webservices/rampart/trunk/c/configure.ac Wed Nov 7 01:43:32 2007
@@ -134,6 +134,7 @@
src/omxmlsec/tokens/Makefile \
src/omxmlsec/openssl/Makefile \
src/omxmlsec/c14n/Makefile \
+ src/omxmlsec/saml/Makefile \
src/data/Makefile \
src/handlers/Makefile \
src/core/Makefile \
Modified: webservices/rampart/trunk/c/include/saml_req.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/saml_req.h?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/saml_req.h (original)
+++ webservices/rampart/trunk/c/include/saml_req.h Wed Nov 7 01:43:32 2007
@@ -577,4 +577,5 @@
}
#endif
-#endif
\ No newline at end of file
+#endif
+
Modified: webservices/rampart/trunk/c/src/omxmlsec/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/Makefile.am?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/Makefile.am Wed Nov 7 01:43:32
2007
@@ -1,4 +1,4 @@
-SUBDIRS = tokens openssl c14n
+SUBDIRS = tokens openssl c14n saml
lib_LTLIBRARIES = libomxmlsec.la
libomxmlsec_la_SOURCES = ctx.c buffer.c key.c cipher.c error.c axis2_utils.c
axiom.c \
Added: webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am?rev=592671&view=auto
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am (added)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/Makefile.am Wed Nov 7
01:43:32 2007
@@ -0,0 +1,23 @@
+lib_LTLIBRARIES =libsaml.la
+
+libsaml_la_SOURCES = assertion.c \
+ attr_stmt.c \
+ auth_des_stmt.c \
+ auth_smt.c \
+ condition.c \
+ id_type.c \
+ query.c \
+ request.c \
+ response.c \
+ stmt.c \
+ subject.c \
+ sutil.c
+
+INCLUDES = -I$(top_builddir)/include \
+ -I ../../../../util/include \
+ -I ../../../../include \
+ -I ../../../../axiom/include \
+ @OPENSSLINC@ \
+ @UTILINC@ \
+ @AXIOMINC@ \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/assertion.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/assertion.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/assertion.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/assertion.c Wed Nov 7
01:43:32 2007
@@ -145,7 +145,6 @@
{
axiom_element_t *ce = NULL;
axiom_node_t *cn = NULL;
- axiom_element_t *cce = NULL;
axiom_node_t *ccn = NULL;
axiom_child_element_iterator_t *cci = NULL;
while(AXIS2_TRUE == axiom_child_element_iterator_has_next(ci,
env))
@@ -224,8 +223,8 @@
axiom_node_t *parent, axutil_env_t
*env)
{
int i = 0, size = 0;
- axiom_element_t *e = NULL, *ce = NULL, *cce = NULL;
- axiom_node_t *n = NULL, *cn = NULL, *ccn = NULL;
+ axiom_element_t *e = NULL, *ce = NULL;
+ axiom_node_t *n = NULL, *cn = NULL;
axiom_attribute_t *attr = NULL;
axiom_namespace_t *ns = NULL;
saml_condition_t *cond = NULL;
@@ -542,9 +541,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_assertion_sign(saml_assertion_t *a, axutil_env_t *env, oxs_sign_ctx_t
*sign_ctx, axiom_node_t **node)
{
- axiom_node_t *n= NULL, *sig_node = NULL;
- axis2_char_t *id = NULL;
- axis2_char_t *om_str = NULL;
+ axiom_node_t *n= NULL;
oxs_sign_part_t* sig_part = NULL;
axutil_array_list_t *sig_parts = NULL;
int size = 0, i = 0;
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/attr_stmt.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/attr_stmt.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/attr_stmt.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/attr_stmt.c Wed Nov 7
01:43:32 2007
@@ -50,8 +50,7 @@
axutil_hash_t *attr_hash = NULL;
axutil_hash_index_t *hi = NULL;
axiom_element_t *element = NULL;
- axiom_element_t *fce = NULL;
- axiom_node_t *fcn = NULL;
+
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT || (element =
(axiom_element_t *)axiom_node_get_data_element(node, env)) == NULL)
{
return AXIS2_FAILURE;
@@ -158,8 +157,8 @@
AXIS2_EXTERN void AXIS2_CALL
saml_attr_free(saml_attr_t *attr, axutil_env_t *env)
{
- int i = 0;
- char *val = NULL;
+ /*int i = 0;
+ char *val = NULL;*/
if (attr->attr_name)
{
AXIS2_FREE(env->allocator, attr->attr_name);
@@ -312,8 +311,8 @@
saml_attr_set_values(saml_attr_t *attr,
axutil_env_t *env,
axutil_array_list_t *list)
{
- int i = 0, size = 0;
- axis2_char_t *val = NULL;
+ /*int i = 0, size = 0;
+ axis2_char_t *val = NULL;*/
if (attr->attr_value)
{
/*size = axutil_array_list_size(attr->attr_value, env);
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/auth_des_stmt.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/auth_des_stmt.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/auth_des_stmt.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/auth_des_stmt.c Wed Nov 7
01:43:32 2007
@@ -218,7 +218,6 @@
axiom_element_t *e = NULL, *ce = NULL;
axiom_node_t *n = NULL, *cn = NULL;
axiom_namespace_t *ns = NULL;
- axiom_attribute_t *attr = NULL;
saml_assertion_t *assertion = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
e = axiom_element_create(env, parent, SAML_EVIDENCE, ns, &n);
@@ -655,4 +654,5 @@
}
auth_des_stmt->subject = subject;
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
+
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/auth_smt.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/auth_smt.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/auth_smt.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/auth_smt.c Wed Nov 7
01:43:32 2007
@@ -465,9 +465,8 @@
saml_auth_binding_build(saml_auth_binding_t *auth_bind, axiom_node_t *node,
axutil_env_t *env)
{
- axutil_hash_t *attr_hash = NULL;
axiom_element_t *element = NULL;
- axutil_hash_index_t *hi = NULL;
+
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT || (element =
(axiom_element_t *)axiom_node_get_data_element(node, env)) == NULL)
{
return AXIS2_FAILURE;
@@ -566,4 +565,5 @@
}
auth_binding->location = axutil_strdup(env, location);
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
+
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/query.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/query.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/query.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/query.c Wed Nov 7 01:43:32
2007
@@ -220,8 +220,6 @@
axiom_element_t *e = NULL;
axiom_node_t *n = NULL;
axiom_namespace_t *ns = NULL;
- axiom_attribute_t *attr = NULL;
- saml_assertion_t *assertion = NULL;
ns = axiom_namespace_create(env, SAML_PROTOCOL_NMSP,
SAML_PROTOCOL_PREFIX);
e = axiom_element_create(env, parent, SAML_SUBJECT_QUERY, ns, &n);
@@ -306,9 +304,8 @@
axiom_node_t *parent,
axutil_env_t *env)
{
- int size = 0, i = 0;
- axiom_element_t *e = NULL, *ce = NULL;
- axiom_node_t *n = NULL, *cn = NULL;
+ axiom_element_t *e = NULL;
+ axiom_node_t *n = NULL;
axiom_namespace_t *ns = NULL;
axiom_attribute_t *attr = NULL;
@@ -424,8 +421,8 @@
axutil_env_t *env)
{
int size = 0, i = 0;
- axiom_element_t *e = NULL, *ce = NULL;
- axiom_node_t *n = NULL, *cn = NULL;
+ axiom_element_t *e = NULL;
+ axiom_node_t *n = NULL;
axiom_namespace_t *ns = NULL;
axiom_attribute_t *attr = NULL;
saml_action_t *action;
@@ -447,7 +444,7 @@
{
size =
axutil_array_list_size(autho_decision_query->saml_actions, env);
- for( i ; i < size ; i++)
+ for(i = 0 ; i < size ; i++)
{
action =
(saml_action_t*)axutil_array_list_get(autho_decision_query->saml_actions, env,
i);
saml_action_to_om(action, n, env);
@@ -550,8 +547,8 @@
axutil_env_t *env)
{
int size = 0, i = 0;
- axiom_element_t *e = NULL, *ce = NULL;
- axiom_node_t *n = NULL, *cn = NULL;
+ axiom_element_t *e = NULL;
+ axiom_node_t *n = NULL;
axiom_namespace_t *ns = NULL;
axiom_attribute_t *attr = NULL;
saml_attr_desig_t *attr_desig = NULL;
@@ -573,7 +570,7 @@
{
size =
axutil_array_list_size(attribute_query->attr_desigs, env);
- for( i ; i < size ; i++)
+ for( i=0 ; i < size ; i++)
{
attr_desig =
(saml_attr_desig_t*)axutil_array_list_get(attribute_query->attr_desigs, env, i);
saml_attr_desig_to_om(attr_desig, n, env);
@@ -1049,4 +1046,4 @@
query->type = axutil_strdup(env, type);
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/request.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/request.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/request.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/request.c Wed Nov 7 01:43:32
2007
@@ -159,7 +159,6 @@
axutil_hash_index_t *hi = NULL;
axiom_child_element_iterator_t *iterator = NULL;
axiom_node_t *child_node = NULL;
- axutil_qname_t *qname = NULL;
axis2_char_t *element_local_name = NULL;
saml_artifact_t *artifact = NULL;
@@ -203,7 +202,7 @@
}
}
}
- // Request elements
+ /* Request elements*/
iterator = axiom_element_get_child_elements(element, env, node);
if(iterator)
{
@@ -295,7 +294,6 @@
axiom_node_t *n = NULL, *cn = NULL;
axiom_namespace_t *ns1 = NULL, *ns2 = NULL;
axiom_attribute_t *attr = NULL;
- saml_assertion_t *assertion = NULL;
axutil_qname_t *qname = NULL;
saml_artifact_t *artifact = NULL;
axis2_char_t *id_reference = NULL, *t = NULL;
@@ -393,7 +391,6 @@
}
if(request->sig_ctx)
{
- axis2_char_t *t = axiom_node_to_string(n,env);
saml_request_sign(request, &n, env);
}
@@ -670,8 +667,7 @@
}
AXIS2_EXTERN int AXIS2_CALL saml_request_sign(saml_request_t *request,
axiom_node_t **node, axutil_env_t *env)
{
- axiom_node_t *n= NULL, *sig_node = NULL;
- axis2_char_t *id = NULL;
+ axiom_node_t *n= NULL;
oxs_sign_part_t* sig_part = NULL;
axutil_array_list_t *sig_parts = NULL;
int size = 0, i = 0;
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/response.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/response.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/response.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/response.c Wed Nov 7
01:43:32 2007
@@ -56,9 +56,7 @@
{
axiom_element_t *element = NULL;
- axiom_element_t *sub_element = NULL;
axiom_child_element_iterator_t *iterator = NULL;
- axiom_child_element_iterator_t *child_iterator = NULL;
axiom_node_t *child_node;
axis2_char_t *qname = NULL;
@@ -109,7 +107,6 @@
axiom_node_t *parent,
axutil_env_t *env)
{
- int size = 0, i = 0;
axiom_element_t *e = NULL, *ce = NULL;
axiom_node_t *n = NULL, *cn = NULL;
axiom_namespace_t *ns = NULL;
@@ -390,8 +387,8 @@
axutil_env_t *env)
{
int size = 0, i = 0;
- axiom_element_t *e = NULL, *ce = NULL;
- axiom_node_t *n = NULL, *cn = NULL;
+ axiom_element_t *e = NULL;
+ axiom_node_t *n = NULL;
axiom_namespace_t *ns = NULL;
axiom_attribute_t *attr = NULL;
saml_assertion_t *assertion = NULL;
@@ -628,7 +625,7 @@
}
AXIS2_EXTERN int AXIS2_CALL saml_response_sign(saml_response_t *response,
axiom_node_t *node, axutil_env_t *env)
{
- axiom_node_t *n= NULL, *sig_node = NULL;
+ axiom_node_t *n= NULL;
axis2_char_t *id = NULL;
oxs_sign_part_t* sig_part = NULL;
axutil_array_list_t *sig_parts = NULL;
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/stmt.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/stmt.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/stmt.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/stmt.c Wed Nov 7 01:43:32
2007
@@ -60,7 +60,7 @@
{
axis2_char_t *locname = NULL;
axiom_element_t *element = NULL;
- axiom_child_element_iterator_t *ci = NULL;
+
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT || (element =
(axiom_element_t *)axiom_node_get_data_element(node, env)) == NULL)
{
return AXIS2_FAILURE;
@@ -157,4 +157,5 @@
stmt->stmt = st;
stmt->type = type;
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
+
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/subject.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/subject.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/subject.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/subject.c Wed Nov 7 01:43:32
2007
@@ -243,10 +243,7 @@
axiom_element_t *element = NULL;
axiom_node_t *cn = NULL, *ccn = NULL;
axiom_element_t *ce = NULL, *cce = NULL;
- saml_auth_binding_t *auth_bind = NULL;
- char *child_name = NULL;
axiom_child_element_iterator_t *ci = NULL, *cci = NULL;
- short is_named_id = AXIS2_FALSE;
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT || (element =
(axiom_element_t *)axiom_node_get_data_element(node, env)) == NULL)
{
return AXIS2_FAILURE;
@@ -545,4 +542,4 @@
axutil_env_t *env)
{
return subject_stmt->subject;
-}
\ No newline at end of file
+}
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c?rev=592671&r1=592670&r2=592671&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c Wed Nov 7 01:43:32
2007
@@ -23,8 +23,6 @@
oxs_sign_part_t* sig_part = NULL;
oxs_transform_t *tr = NULL;
axutil_array_list_t *sig_parts = NULL, *trans = NULL;
- axiom_attribute_t* att = NULL;
- axiom_element_t *test = NULL;
trans = axutil_array_list_create(env, SAML_ARRAY_LIST_DEF);
@@ -54,4 +52,4 @@
oxs_sign_ctx_set_sign_parts(sig_ctx, env, sig_parts);
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
