You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ka...@apache.org on 2006/09/28 06:24:35 UTC
svn commit: r450684 - in /webservices/axis2/trunk/c:
modules/core/description/ rampart/src/omxmlsec/ rampart/src/util/
Author: kaushalye
Date: Wed Sep 27 21:24:34 2006
New Revision: 450684
URL: http://svn.apache.org/viewvc?view=rev&rev=450684
Log:
Committing changes made
Modified:
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c
webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c
webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
webservices/axis2/trunk/c/rampart/src/util/username_token.c
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Wed Sep 27 21:24:34 2006
@@ -466,7 +466,6 @@
sizeof(axis2_wsdl_op_ops_t));
op_impl->op.base.ops->free_void_arg = axis2_op_free_void_arg;
op_impl->op.base.ops->get_qname = axis2_op_get_qname;
-
message_processing = axis2_phase_create(env, AXIS2_PHASE_MESSAGE_PROCESSING);
if (op_impl->base)
{
@@ -522,7 +521,6 @@
return NULL;
}
message_out = NULL;
-
axis2_op_set_msg_exchange_pattern(&(op_impl->op), env,
(axis2_char_t *) AXIS2_MEP_URI_IN_OUT);
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c Wed Sep 27 21:24:34 2006
@@ -69,7 +69,8 @@
{
axis2_qname_t *qname = NULL;
axiom_node_t *node = NULL;
- axiom_element_t *parent_ele = NULL, *ele = NULL;
+ axiom_element_t *parent_ele = NULL;
+ axiom_element_t *ele = NULL;
axis2_char_t *parent_name = NULL;
qname = axis2_qname_create(env, local_name, ns_uri, prefix);
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c Wed Sep 27 21:24:34 2006
@@ -560,8 +560,11 @@
oxs_buffer_t *databuf)
{
axis2_status_t ret = AXIS2_FAILURE;
- axiom_element_t *template_ele = NULL, *cv_ele = NULL, *cd_ele = NULL;
- axiom_node_t *cv_node = NULL, *cd_node = NULL;
+ axiom_element_t *template_ele = NULL;
+ axiom_element_t *cv_ele = NULL;
+ axiom_element_t *cd_ele = NULL;
+ axiom_node_t *cv_node = NULL;
+ axiom_node_t *cd_node = NULL;
axis2_qname_t *qname = NULL;
oxs_enc_engine_impl_t *enc_engine_impl = NULL;
@@ -741,7 +744,6 @@
if (!cur)
{
-
return AXIS2_FAILURE;
}
@@ -779,7 +781,8 @@
int ret;
/* Operation is either encrypt or decrypt */
- if (!((OXS_CTX_GET_OPERATION(enc_ctx, env) == OXS_CTX_OPERATION_ENCRYPT) || (OXS_CTX_GET_OPERATION(enc_ctx, env) == OXS_CTX_OPERATION_DECRYPT)))
+ if (!((OXS_CTX_GET_OPERATION(enc_ctx, env) == OXS_CTX_OPERATION_ENCRYPT) ||
+ (OXS_CTX_GET_OPERATION(enc_ctx, env) == OXS_CTX_OPERATION_DECRYPT)))
{
oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Operation is NOT either encrypt or decrypt");
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c Wed Sep 27 21:24:34 2006
@@ -32,7 +32,9 @@
{
axiom_node_t *binary_security_token_node = NULL;
axiom_element_t *binary_security_token_ele = NULL;
- axiom_attribute_t *encoding_type_att = NULL, *value_type_att = NULL, *id_attr = NULL;
+ axiom_attribute_t *encoding_type_att = NULL;
+ axiom_attribute_t *value_type_att = NULL;
+ axiom_attribute_t *id_attr = NULL;
int ret;
axiom_namespace_t *ns_obj = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c Wed Sep 27 21:24:34 2006
@@ -32,7 +32,8 @@
{
axiom_node_t *encrypted_data_node = NULL;
axiom_element_t *encrypted_data_ele = NULL;
- axiom_attribute_t *type_attr = NULL, *id_attr = NULL;
+ axiom_attribute_t *type_attr = NULL;
+ axiom_attribute_t *id_attr = NULL;
axiom_namespace_t *ns_obj = NULL;
int ret;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c Wed Sep 27 21:24:34 2006
@@ -33,7 +33,8 @@
{
axiom_node_t *encrypted_type_node = NULL;
axiom_element_t *encrypted_type_ele = NULL;
- axiom_attribute_t *type_attr = NULL, *id_attr = NULL;
+ axiom_attribute_t *type_attr = NULL
+ axiom_attribute_t *id_attr = NULL;
int ret;
axiom_namespace_t *ns_obj = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c Wed Sep 27 21:24:34 2006
@@ -153,13 +153,24 @@
{
axis2_status_t ret = AXIS2_FAILURE;
- axiom_node_t *node_to_enc = NULL, *body_node = NULL;
+ axiom_node_t *node_to_enc = NULL;
+ axiom_node_t *body_node = NULL;
/*EncryptedData variables*/
- axiom_node_t *enc_data_node = NULL, *enc_mtd_node = NULL, *key_info_node = NULL, *key_name_node = NULL;
- axiom_node_t *cv_node = NULL, *cd_node = NULL, *enc_key_ref_list_node = NULL, *enc_key_data_ref_node = NULL;
+ axiom_node_t *enc_data_node = NULL;
+ axiom_node_t *enc_mtd_node = NULL;
+ axiom_node_t *key_info_node = NULL;
+ axiom_node_t *key_name_node = NULL;
+ axiom_node_t *cv_node = NULL;
+ axiom_node_t *cd_node = NULL;
+ axiom_node_t *enc_key_ref_list_node = NULL;
+ axiom_node_t *enc_key_data_ref_node = NULL;
/*EncryptedKey varaibles*/
- axiom_node_t *enc_key_node = NULL, *enc_key_enc_mtd_node = NULL, *enc_key_key_info_node = NULL, *enc_key_key_name_node = NULL;
- axiom_node_t *enc_key_cv_node = NULL, *enc_key_cd_node = NULL;
+ axiom_node_t *enc_key_node = NULL;
+ axiom_node_t *enc_key_enc_mtd_node = NULL;
+ axiom_node_t *enc_key_key_info_node = NULL;
+ axiom_node_t *enc_key_key_name_node = NULL;
+ axiom_node_t *enc_key_cv_node = NULL;
+ axiom_node_t *enc_key_cd_node = NULL;
axiom_soap_body_t *body = NULL;
axis2_char_t *str_to_enc = NULL;
oxs_ctx_t * enc_ctx = NULL;
@@ -305,8 +316,10 @@
axiom_soap_envelope_t *soap_envelope ,
axiom_node_t *sec_node)
{
- axiom_node_t *enc_data_node = NULL, *parent_of_enc_node = NULL;
- axiom_node_t *body_node = NULL , *decrypted_node = NULL;
+ axiom_node_t *enc_data_node = NULL;
+ axiom_node_t *parent_of_enc_node = NULL;
+ axiom_node_t *body_node = NULL;
+ axiom_node_t *decrypted_node = NULL;
axiom_node_t *ref_list_node = NULL;
axiom_soap_body_t *body = NULL;
axis2_char_t *decrypted_data = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Wed Sep 27 21:24:34 2006
@@ -156,12 +156,14 @@
axis2_param_t *param_action,
const axis2_char_t *key)
{
- axis2_char_t *value = NULL, *tmp_key = NULL;
+ axis2_char_t *value = NULL;
+ axis2_char_t *tmp_key = NULL;
+ axis2_char_t * param_name = NULL;
axis2_array_list_t *param_list = NULL;
axis2_param_t *param = NULL;
int param_type;
- axis2_char_t * param_name = NULL;
int i, size = 0;
+
if (!param_action)
{
printf("param_action is NULL");
Modified: webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c Wed Sep 27 21:24:34 2006
@@ -133,9 +133,14 @@
const axiom_namespace_t *sec_ns_obj,
int ttl)
{
- axiom_node_t *ts_node, *created_node, *expires_node = NULL;
- axiom_element_t *ts_ele, *created_ele, *expires_ele = NULL;
- axis2_char_t *created_val, *expires_val = NULL;
+ axiom_node_t *ts_node = NULL;
+ axiom_node_t *created_node = NULL;
+ axiom_node_t *expires_node = NULL;
+ axiom_element_t *ts_ele = NULL;
+ axiom_element_t *created_ele = NULL;
+ axiom_element_t *expires_ele = NULL;
+ axis2_char_t *created_val = NULL;
+ axis2_char_t *expires_val = NULL;
axiom_namespace_t *wsu_ns_obj = NULL;
wsu_ns_obj = axiom_namespace_create(env, RAMPART_WSU_XMLNS,
@@ -178,9 +183,14 @@
axis2_array_list_t *sub_codes)
{
axis2_status_t validity = AXIS2_FAILURE;
- axiom_element_t *created_ele = NULL, *expires_ele = NULL, *ts_ele = NULL;
- axiom_node_t *created_node = NULL, *expires_node = NULL;
- axis2_char_t *created_val = NULL, *expires_val = NULL, *current_val = NULL;
+ axiom_element_t *created_ele = NULL;
+ axiom_element_t *expires_ele = NULL;
+ axiom_element_t *ts_ele = NULL;
+ axiom_node_t *created_node = NULL;
+ axiom_node_t *expires_node = NULL;
+ axis2_char_t *created_val = NULL;
+ axis2_char_t *expires_val = NULL;
+ axis2_char_t *current_val = NULL;
/*Check: TIMESTAMP MUST contain exactly one CREATED*/
if (1 != oxs_axiom_get_number_of_children_with_qname(env, ts_node, RAMPART_SECURITY_TIMESTAMP_CREATED, NULL, NULL))
Modified: webservices/axis2/trunk/c/rampart/src/util/username_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/username_token.c?view=diff&rev=450684&r1=450683&r2=450684
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/username_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/username_token.c Wed Sep 27 21:24:34 2006
@@ -227,9 +227,19 @@
)
{
- axiom_node_t *ut_node, *un_node, *pw_node, *nonce_node, *created_node = NULL;
- axiom_element_t *ut_ele, *un_ele, *pw_ele, *nonce_ele, *created_ele = NULL;
- axis2_char_t *username, *password, *password_type = NULL;
+ axiom_node_t *ut_node = NULL;
+ axiom_node_t *un_node = NULL;
+ axiom_node_t *pw_node = NULL;
+ axiom_node_t *nonce_node = NULL;
+ axiom_node_t *created_node = NULL;
+ axiom_element_t *ut_ele = NULL;
+ axiom_element_t *un_ele = NULL;
+ axiom_element_t *pw_ele = NULL;
+ axiom_element_t *nonce_ele = NULL;
+ axiom_element_t *created_ele = NULL;
+ axis2_char_t *username = NULL;
+ axis2_char_t *password = NULL;
+ axis2_char_t *password_type = NULL;
axiom_namespace_t *wsu_ns_obj = NULL;
axiom_attribute_t *om_attr = NULL;
rampart_username_token_impl_t *username_token_impl = NULL;
@@ -279,8 +289,11 @@
if (0 == AXIS2_STRCMP(password_type, RAMPART_PASSWORD_DIGEST))
{
- axis2_char_t *nonce_val, *created_val, *digest_val = NULL;
+ axis2_char_t *nonce_val = NULL;
+ axis2_char_t *created_val = NULL;
+ axis2_char_t *digest_val = NULL;
axiom_namespace_t *dec_ns = NULL;
+
nonce_val = rampart_generate_nonce(env) ;
created_val = rampart_generate_time(env, 0);
digest_val = rampart_crypto_sha1(env, nonce_val, created_val, password);
@@ -375,12 +388,19 @@
rampart_actions_t *actions,
axis2_array_list_t *sub_codes)
{
- axiom_element_t *sec_ele, *ut_ele = NULL;
- axiom_node_t *sec_node, *ut_node = NULL;
+ axiom_element_t *sec_ele = NULL;
+ axiom_element_t *ut_ele = NULL;
+ axiom_node_t *sec_node = NULL;
+ axiom_node_t *ut_node = NULL;
axiom_child_element_iterator_t *children = NULL;
- axis2_char_t *username = NULL,
- *password = NULL, *nonce = NULL, *created = NULL, *password_type = NULL;
- axis2_char_t *pw_callback_module = NULL, *password_from_svr = NULL, *password_to_compare = NULL;
+ axis2_char_t *username = NULL;
+ axis2_char_t *password = NULL;
+ axis2_char_t *nonce = NULL;
+ axis2_char_t *created = NULL;
+ axis2_char_t *password_type = NULL;
+ axis2_char_t *pw_callback_module = NULL;
+ axis2_char_t *password_from_svr = NULL;
+ axis2_char_t *password_to_compare = NULL;
axis2_ctx_t *ctx = NULL;
axis2_qname_t *qname = NULL;
rampart_username_token_impl_t *username_token_impl = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org