You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by mi...@apache.org on 2008/05/13 05:07:57 UTC
svn commit: r655718 [4/4] - in
/webservices/rampart/trunk/c/src/omxmlsec/saml: 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
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=655718&r1=655717&r2=655718&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/stmt.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/stmt.c Mon May 12 20:07:56 2008
@@ -18,7 +18,7 @@
#include <saml.h>
AXIS2_EXTERN saml_stmt_t * AXIS2_CALL
-saml_stmt_create(axutil_env_t *env)
+saml_stmt_create(const axutil_env_t *env)
{
saml_stmt_t *stmt = AXIS2_MALLOC(env->allocator, sizeof(saml_stmt_t));
if (stmt)
@@ -30,7 +30,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-saml_stmt_free(saml_stmt_t *stmt, axutil_env_t *env)
+saml_stmt_free(saml_stmt_t *stmt, const axutil_env_t *env)
{
if (stmt->type == SAML_STMT_AUTHENTICATIONSTATEMENT)
{
@@ -56,7 +56,7 @@
}
AXIS2_EXTERN int AXIS2_CALL
-saml_stmt_build(saml_stmt_t *stmt, axiom_node_t *node, axutil_env_t *env)
+saml_stmt_build(saml_stmt_t *stmt, axiom_node_t *node, const axutil_env_t *env)
{
axis2_char_t *locname = NULL;
axiom_element_t *element = NULL;
@@ -94,7 +94,7 @@
}
AXIS2_EXTERN axiom_node_t * AXIS2_CALL
-saml_stmt_to_om(saml_stmt_t *stmt, axiom_node_t *parent, axutil_env_t *env)
+saml_stmt_to_om(saml_stmt_t *stmt, axiom_node_t *parent, const axutil_env_t *env)
{
if (stmt->type == SAML_STMT_AUTHENTICATIONSTATEMENT)
{
@@ -116,26 +116,26 @@
}
AXIS2_EXTERN saml_stmt_type_t AXIS2_CALL
-saml_stmt_get_type(saml_stmt_t *stmt, axutil_env_t *env)
+saml_stmt_get_type(saml_stmt_t *stmt, const axutil_env_t *env)
{
return stmt->type;
}
AXIS2_EXTERN saml_stmt_t * AXIS2_CALL
-saml_stmt_get_stmt(saml_stmt_t *stmt, axutil_env_t *env)
+saml_stmt_get_stmt(saml_stmt_t *stmt, const axutil_env_t *env)
{
return stmt->stmt;
}
AXIS2_EXTERN int AXIS2_CALL
-saml_stmt_set_type(saml_stmt_t *stmt, axutil_env_t *env, saml_stmt_type_t type)
+saml_stmt_set_type(saml_stmt_t *stmt, const axutil_env_t *env, saml_stmt_type_t type)
{
stmt->type = type;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN int AXIS2_CALL
-saml_stmt_set_stmt(saml_stmt_t *stmt, axutil_env_t *env,
+saml_stmt_set_stmt(saml_stmt_t *stmt, const axutil_env_t *env,
void *st, saml_stmt_type_t type)
{
if (stmt->type == SAML_STMT_AUTHENTICATIONSTATEMENT)
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=655718&r1=655717&r2=655718&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/subject.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/subject.c Mon May 12 20:07:56 2008
@@ -19,7 +19,7 @@
AXIS2_EXTERN saml_named_id_t * AXIS2_CALL
-saml_named_id_create(axutil_env_t *env)
+saml_named_id_create(const axutil_env_t *env)
{
saml_named_id_t *named_id = AXIS2_MALLOC(env->allocator, sizeof(saml_named_id_t));
if (named_id)
@@ -49,7 +49,7 @@
AXIS2_EXTERN void AXIS2_CALL
-saml_named_id_free(saml_named_id_t *named_id, axutil_env_t *env)
+saml_named_id_free(saml_named_id_t *named_id, const axutil_env_t *env)
{
if (named_id->format)
{
@@ -68,7 +68,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_named_id_build(saml_named_id_t *named_id, axiom_node_t *node,
- axutil_env_t *env)
+ const axutil_env_t *env)
{
axutil_hash_t *attr_hash = NULL;
axutil_hash_index_t *hi = NULL;
@@ -116,7 +116,7 @@
AXIS2_EXTERN axiom_node_t * AXIS2_CALL
saml_named_id_to_om(saml_named_id_t *id, axiom_node_t *parent,
- axutil_env_t *env)
+ const axutil_env_t *env)
{
axiom_element_t *e = NULL;
axiom_node_t *n = NULL;
@@ -145,26 +145,26 @@
}
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-saml_named_id_get_name(saml_named_id_t *id, axutil_env_t *env)
+saml_named_id_get_name(saml_named_id_t *id, const axutil_env_t *env)
{
return id->name;
}
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-saml_named_id_get_format(saml_named_id_t *id, axutil_env_t *env)
+saml_named_id_get_format(saml_named_id_t *id, const axutil_env_t *env)
{
return id->format;
}
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
saml_named_id_get_name_qualifier(saml_named_id_t *id,
- axutil_env_t *env)
+ const axutil_env_t *env)
{
return id->name_qualifier;
}
AXIS2_EXTERN int AXIS2_CALL
-saml_named_id_set_name(saml_named_id_t *id, axutil_env_t *env,
+saml_named_id_set_name(saml_named_id_t *id, const axutil_env_t *env,
axis2_char_t *name)
{
if (id->name)
@@ -176,7 +176,7 @@
}
AXIS2_EXTERN int AXIS2_CALL
-saml_named_id_set_format(saml_named_id_t *id, axutil_env_t *env,
+saml_named_id_set_format(saml_named_id_t *id, const axutil_env_t *env,
axis2_char_t *format)
{
if (id->format)
@@ -188,7 +188,7 @@
}
AXIS2_EXTERN int AXIS2_CALL
-saml_named_id_set_name_qualifier(saml_named_id_t *id, axutil_env_t *env,
+saml_named_id_set_name_qualifier(saml_named_id_t *id, const axutil_env_t *env,
axis2_char_t *qualifier)
{
if (id->name_qualifier)
@@ -201,7 +201,7 @@
AXIS2_EXTERN saml_subject_t * AXIS2_CALL
-saml_subject_create(axutil_env_t *env)
+saml_subject_create(const axutil_env_t *env)
{
saml_subject_t *subject = AXIS2_MALLOC(env->allocator, sizeof(saml_subject_t));
if (subject)
@@ -215,7 +215,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-saml_subject_free(saml_subject_t *subject, axutil_env_t *env)
+saml_subject_free(saml_subject_t *subject, const axutil_env_t *env)
{
/*if (subject->named_id)
{
@@ -238,7 +238,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_subject_build(saml_subject_t *subject, axiom_node_t *node,
- axutil_env_t *env)
+ const axutil_env_t *env)
{
axiom_element_t *element = NULL;
axiom_node_t *cn = NULL, *ccn = NULL;
@@ -306,7 +306,7 @@
AXIS2_EXTERN axiom_node_t * AXIS2_CALL
saml_subject_to_om(saml_subject_t *subject, axiom_node_t *parent,
- axutil_env_t *env)
+ const axutil_env_t *env)
{
int i = 0, size = 0;
axiom_element_t *e = NULL, *ce = NULL, *cce = NULL;
@@ -361,33 +361,33 @@
}
AXIS2_EXTERN saml_named_id_t * AXIS2_CALL
-saml_subject_get_named_id(saml_subject_t *subject, axutil_env_t *env)
+saml_subject_get_named_id(saml_subject_t *subject, const axutil_env_t *env)
{
return subject->named_id;
}
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
saml_subject_get_confirmation_methods(saml_subject_t *subject,
- axutil_env_t *env)
+ const axutil_env_t *env)
{
return subject->confirmation_methods;
}
AXIS2_EXTERN axiom_node_t * AXIS2_CALL
-saml_subject_get_confirmation_data(saml_subject_t *subject, axutil_env_t *env)
+saml_subject_get_confirmation_data(saml_subject_t *subject, const axutil_env_t *env)
{
return subject->confirmation_data;
}
AXIS2_EXTERN axiom_node_t * AXIS2_CALL
-saml_subject_get_key_info(saml_subject_t *subject, axutil_env_t *env)
+saml_subject_get_key_info(saml_subject_t *subject, const axutil_env_t *env)
{
return subject->key_info;
}
AXIS2_EXTERN int AXIS2_CALL
saml_subject_set_named_id(saml_subject_t *subject,
- axutil_env_t *env, saml_named_id_t *named_id)
+ const axutil_env_t *env, saml_named_id_t *named_id)
{
if (subject->named_id)
{
@@ -399,7 +399,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_subject_set_confirmation_methods(saml_subject_t *subject,
- axutil_env_t *env,
+ const axutil_env_t *env,
axutil_array_list_t *list)
{
int i = 0, size = 0;
@@ -412,7 +412,7 @@
val = axutil_array_list_get(subject->confirmation_methods, env, i);
if (val)
{
- AXIS2_FREE(env->allocator, env);
+ AXIS2_FREE(env->allocator, val);
}
}
axutil_array_list_free(subject->confirmation_methods, env);
@@ -428,7 +428,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_subject_add_confirmation(saml_subject_t *subject,
- axutil_env_t *env, axis2_char_t *sub_confirmation)
+ const axutil_env_t *env, axis2_char_t *sub_confirmation)
{
if (!subject->confirmation_methods)
{
@@ -440,7 +440,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_subject_remove_subject_confiirmation(saml_subject_t *subject,
- axutil_env_t *env, int index)
+ const axutil_env_t *env, int index)
{
axis2_char_t *val = NULL;
if (subject->confirmation_methods && axutil_array_list_size(subject->confirmation_methods, env) > index)
@@ -460,7 +460,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_subject_set_key_info(saml_subject_t *subject,
- axutil_env_t *env, axiom_node_t *node)
+ const axutil_env_t *env, axiom_node_t *node)
{
if (subject->key_info)
{
@@ -471,7 +471,7 @@
}
AXIS2_EXTERN saml_subject_stmt_t * AXIS2_CALL
-saml_subject_stmt_create(axutil_env_t *env)
+saml_subject_stmt_create(const axutil_env_t *env)
{
saml_subject_stmt_t *stmt = AXIS2_MALLOC(env->allocator, sizeof(saml_subject_stmt_t));
if (stmt)
@@ -487,7 +487,7 @@
AXIS2_EXTERN void AXIS2_CALL
saml_subject_stmt_free(saml_subject_stmt_t *subject_stmt,
- axutil_env_t *env)
+ const axutil_env_t *env)
{
saml_subject_free(subject_stmt->subject, env);
AXIS2_FREE(env->allocator, subject_stmt);
@@ -495,7 +495,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_subject_stmt_build(saml_subject_stmt_t *subject_stmt,
- axiom_node_t *node, axutil_env_t *env)
+ axiom_node_t *node, const axutil_env_t *env)
{
axiom_element_t *element = NULL;
axiom_node_t *first_enode = NULL;
@@ -514,7 +514,7 @@
AXIS2_EXTERN axiom_node_t * AXIS2_CALL
saml_subject_stmt_to_om(saml_subject_stmt_t *subject_stmt,
- axiom_node_t *parent, axutil_env_t *env)
+ axiom_node_t *parent, const axutil_env_t *env)
{
axiom_element_t *e = NULL;
axiom_node_t *n = NULL;
@@ -530,7 +530,7 @@
AXIS2_EXTERN int AXIS2_CALL
saml_subject_stmt_set_subject(saml_subject_stmt_t *subject_stmt,
- axutil_env_t *env, saml_subject_t *subject)
+ const axutil_env_t *env, saml_subject_t *subject)
{
saml_subject_free(subject_stmt->subject, env);
subject_stmt->subject = subject;
@@ -539,7 +539,7 @@
AXIS2_EXTERN saml_subject_t * AXIS2_CALL
saml_subject_stmt_get_subject(saml_subject_stmt_t *subject_stmt,
- axutil_env_t *env)
+ const axutil_env_t *env)
{
return subject_stmt->subject;
}
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=655718&r1=655717&r2=655718&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c Mon May 12 20:07:56 2008
@@ -1,57 +1,57 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <saml.h>
-#include <saml_req.h>
-
-AXIS2_EXTERN int AXIS2_CALL saml_util_set_sig_ctx_defaults(oxs_sign_ctx_t *sig_ctx, axutil_env_t *env, axis2_char_t *id)
-{
- oxs_sign_part_t* sig_part = NULL;
- oxs_transform_t *tr = NULL;
- axutil_array_list_t *sig_parts = NULL, *trans = NULL;
- trans = axutil_array_list_create(env, SAML_ARRAY_LIST_DEF);
-
- /*create transform sor SAML XML signature with identifier*/
- tr = oxs_transforms_factory_produce_transform(env, OXS_HREF_TRANSFORM_ENVELOPED_SIGNATURE);
- axutil_array_list_add(trans, env, tr);
-
- /*Create the EXCL-C14N Transformation*/
- tr = oxs_transforms_factory_produce_transform(env, OXS_HREF_TRANSFORM_XML_EXC_C14N);
- axutil_array_list_add(trans, env, tr);
-
- sig_part = oxs_sign_part_create(env);
- oxs_sign_part_set_digest_mtd(sig_part, env, OXS_HREF_SHA1);
-
-
- oxs_sign_part_set_transforms(sig_part, env, trans);
- oxs_sign_part_set_id_name(sig_part, env, id);
-
- /*ns = axiom_namespace_create(env, "", "");
- oxs_sign_part_set_sign_namespace(sig_part,env, ns);*/
-
- sig_parts = axutil_array_list_create(env, SAML_ARRAY_LIST_DEF);
- axutil_array_list_add(sig_parts, env, sig_part);
-
- /*create the specific sign context*/
-
- oxs_sign_ctx_set_c14n_mtd(sig_ctx, env, OXS_HREF_XML_EXC_C14N);
- oxs_sign_ctx_set_operation(sig_ctx, env, OXS_SIGN_OPERATION_SIGN);
- oxs_sign_ctx_set_sign_mtd_algo(sig_ctx, env, OXS_HREF_RSA_SHA1);
- oxs_sign_ctx_set_sign_parts(sig_ctx, env, sig_parts);
-
- return AXIS2_SUCCESS;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <saml.h>
+#include <saml_req.h>
+
+AXIS2_EXTERN int AXIS2_CALL saml_util_set_sig_ctx_defaults(oxs_sign_ctx_t *sig_ctx, const axutil_env_t *env, axis2_char_t *id)
+{
+ oxs_sign_part_t* sig_part = NULL;
+ oxs_transform_t *tr = NULL;
+ axutil_array_list_t *sig_parts = NULL, *trans = NULL;
+ trans = axutil_array_list_create(env, SAML_ARRAY_LIST_DEF);
+
+ /*create transform sor SAML XML signature with identifier*/
+ tr = oxs_transforms_factory_produce_transform(env, OXS_HREF_TRANSFORM_ENVELOPED_SIGNATURE);
+ axutil_array_list_add(trans, env, tr);
+
+ /*Create the EXCL-C14N Transformation*/
+ tr = oxs_transforms_factory_produce_transform(env, OXS_HREF_TRANSFORM_XML_EXC_C14N);
+ axutil_array_list_add(trans, env, tr);
+
+ sig_part = oxs_sign_part_create(env);
+ oxs_sign_part_set_digest_mtd(sig_part, env, OXS_HREF_SHA1);
+
+
+ oxs_sign_part_set_transforms(sig_part, env, trans);
+ oxs_sign_part_set_id_name(sig_part, env, id);
+
+ /*ns = axiom_namespace_create(env, "", "");
+ oxs_sign_part_set_sign_namespace(sig_part,env, ns);*/
+
+ sig_parts = axutil_array_list_create(env, SAML_ARRAY_LIST_DEF);
+ axutil_array_list_add(sig_parts, env, sig_part);
+
+ /*create the specific sign context*/
+
+ oxs_sign_ctx_set_c14n_mtd(sig_ctx, env, OXS_HREF_XML_EXC_C14N);
+ oxs_sign_ctx_set_operation(sig_ctx, env, OXS_SIGN_OPERATION_SIGN);
+ oxs_sign_ctx_set_sign_mtd_algo(sig_ctx, env, OXS_HREF_RSA_SHA1);
+ oxs_sign_ctx_set_sign_parts(sig_ctx, env, sig_parts);
+
+ return AXIS2_SUCCESS;
+}