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 2007/02/07 12:36:07 UTC
svn commit: r504510 - in
/webservices/axis2/scratch/c/security-policy/c/rampart/src: handlers/
secpolicy/builder/ secpolicy/model/ secpolicy/test-resources/ util/
Author: kaushalye
Date: Wed Feb 7 03:36:05 2007
New Revision: 504510
URL: http://svn.apache.org/viewvc?view=rev&rev=504510
Log:
Applying the patch in AXIS2C-488 jira.
Modified:
webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_in_handler.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_out_handler.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/binding_commons_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/encryption_crypto_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/https_token_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/layout_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/policy_creator.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/rampart_config_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/secpolicy_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/security_context_token_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signature_crypto_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/token_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/transport_binding_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/username_token_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss10_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss11_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/x509_token_builder.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/header.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/https_token.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/ut.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/x509_token.c
webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/test-resources/outgoing_policy.xml
webservices/axis2/scratch/c/security-policy/c/rampart/src/util/rampart_sec_header_processor.c
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_in_handler.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_in_handler.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_in_handler.c Wed Feb 7 03:36:05 2007
@@ -144,14 +144,13 @@
status = rampart_shp_process_message(env, msg_ctx, rampart_context,
soap_envelope, sec_node);
- if (AXIS2_FAILURE == status)
- {
- return AXIS2_FAILURE;
- }
- else
- {
- return AXIS2_SUCCESS;
- }
+
+ rp_secpolicy_free(secpolicy,env);
+ secpolicy = NULL;
+/*
+ rampart_context_free(rampart_context,env);
+ rampart_context = NULL;
+*/
return status;
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_out_handler.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_out_handler.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/handlers/rampart_out_handler.c Wed Feb 7 03:36:05 2007
@@ -146,9 +146,11 @@
if(AXIS2_FAILURE == status){
AXIS2_LOG_INFO(env->log,
"[rampart][rampart_out_handler] Security header building failed ERROR");
- return AXIS2_FAILURE;
}
}
- return AXIS2_SUCCESS;
+ rp_secpolicy_free(secpolicy,env);
+ secpolicy = NULL;
+
+ return status;
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c Wed Feb 7 03:36:05 2007
@@ -94,7 +94,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC256,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -105,7 +104,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC192,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -116,7 +114,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC128,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -127,7 +124,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_TRIPLE_DES,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -138,7 +134,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC256_RSA15,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -149,7 +144,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC192_RSA15,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -160,7 +154,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC128_RSA15,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -171,7 +164,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_TRIPLE_DES_RSA15,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -182,7 +174,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC256_SHA256,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -193,7 +184,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC192_SHA256,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -204,7 +194,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC128_SHA256,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -215,7 +204,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_TRIPLE_DES_SHA256,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -226,7 +214,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC256_SHA256_RSA15,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -237,7 +224,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC192_SHA256_RSA15,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -248,7 +234,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC128_SHA256_RSA15,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -259,7 +244,6 @@
if(rp_match_secpolicy_qname(env,RP_ALGO_SUITE_BASIC256_RSA15,node,element))
{
rp_algorithmsuite_set_algosuite(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -270,7 +254,6 @@
if(rp_match_secpolicy_qname(env,RP_INCLUSIVE_C14N,node,element))
{
rp_algorithmsuite_set_c14n(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -281,7 +264,6 @@
if(rp_match_secpolicy_qname(env,RP_SOAP_NORMALIZATION_10,node,element))
{
rp_algorithmsuite_set_soap_normalization(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -292,7 +274,6 @@
if(rp_match_secpolicy_qname(env,RP_STR_TRANSFORM_10,node,element))
{
rp_algorithmsuite_set_str_transformation(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
@@ -303,7 +284,6 @@
if(rp_match_secpolicy_qname(env,RP_XPATH10,node,element))
{
rp_algorithmsuite_set_xpath(algorithmsuite,env,algosuite_string);
- printf("%s\n",algosuite_string);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c Wed Feb 7 03:36:05 2007
@@ -110,7 +110,6 @@
if(!initiator_token)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_asymmetric_binding_set_initiator_token(asymmetric_binding,env,initiator_token);
}
else
@@ -125,7 +124,6 @@
if(!recipient_token)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_asymmetric_binding_set_recipient_token(asymmetric_binding,env,recipient_token);
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/binding_commons_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/binding_commons_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/binding_commons_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/binding_commons_builder.c Wed Feb 7 03:36:05 2007
@@ -43,7 +43,6 @@
if(algo_suite)
{
rp_binding_commons_set_algorithmsuite(commons,env,algo_suite);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else return AXIS2_FAILURE;
@@ -59,7 +58,6 @@
if(layout)
{
rp_binding_commons_set_layout(commons,env,layout);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else return AXIS2_FAILURE;
@@ -71,7 +69,6 @@
if(rp_match_secpolicy_qname(env,RP_INCLUDE_TIMESTAMP,node,element))
{
rp_binding_commons_set_include_timestamp(commons,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
@@ -88,7 +85,6 @@
rp_supporting_tokens_set_type(signed_supporting_tokens,env,RP_SUPPORTING_SIGNED_SUPPORTING);
- printf("%s\n",local_name);
return rp_binding_commons_set_signed_supporting_tokens(commons,env,signed_supporting_tokens);
}
else
@@ -107,7 +103,6 @@
rp_supporting_tokens_set_type(signed_endorsing_supporting_tokens,env,RP_SUPPORTING_SIGNED_ENDORSING_SUPPORTING);
- printf("%s\n",local_name);
return rp_binding_commons_set_signed_endorsing_supporting_tokens(commons,env,signed_endorsing_supporting_tokens);
}
else
@@ -125,7 +120,6 @@
rp_supporting_tokens_set_type(endorsing_supporting_tokens,env,RP_SUPPORTING_ENDORSING_SUPPORTING);
- printf("%s\n",local_name);
return rp_binding_commons_set_endorsing_supporting_tokens(commons,env,endorsing_supporting_tokens);
}
else
@@ -143,7 +137,6 @@
rp_supporting_tokens_set_type(supporting_tokens,env,RP_SUPPORTING_SUPPORTING);
- printf("%s\n",local_name);
return rp_binding_commons_set_supporting_tokens(commons,env,supporting_tokens);
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/encryption_crypto_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/encryption_crypto_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/encryption_crypto_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/encryption_crypto_builder.c Wed Feb 7 03:36:05 2007
@@ -99,8 +99,6 @@
{
axis2_char_t *encryption_prop_file = NULL;
encryption_prop_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- printf("%s\n",local_name);
- printf("%s\n",encryption_prop_file);
return rp_encryption_crypto_set_encryption_prop_file(encryption_crypto,env,encryption_prop_file);
}
@@ -113,8 +111,6 @@
{
axis2_char_t *decryption_prop_file = NULL;
decryption_prop_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- printf("%s\n",local_name);
- printf("%s\n",decryption_prop_file);
return rp_encryption_crypto_set_decryption_prop_file(encryption_crypto,env,decryption_prop_file);
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/https_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/https_token_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/https_token_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/https_token_builder.c Wed Feb 7 03:36:05 2007
@@ -134,7 +134,6 @@
if(value)
{
- printf("%s\n",value);
if(AXIS2_STRCMP(value,"true")==0)
return rp_https_token_set_require_client_certificate(token,env,AXIS2_TRUE);
else if(AXIS2_STRCMP(value,"false")==0)
@@ -161,7 +160,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_DERIVED_KEYS,node,element))
{
rp_https_token_set_derivedkeys(https_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/layout_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/layout_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/layout_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/layout_builder.c Wed Feb 7 03:36:05 2007
@@ -82,7 +82,6 @@
if(rp_match_secpolicy_qname(env,RP_LAYOUT_STRICT,node,element))
{
rp_layout_set_value(layout,env,value);
- printf("%s\n",value);
return AXIS2_SUCCESS;
}
else
@@ -93,7 +92,6 @@
if(rp_match_secpolicy_qname(env,RP_LAYOUT_LAX,node,element))
{
rp_layout_set_value(layout,env,value);
- printf("%s\n",value);
return AXIS2_SUCCESS;
}
else
@@ -104,7 +102,6 @@
if(rp_match_secpolicy_qname(env,RP_LAYOUT_LAX_TIMESTAMP_FIRST,node,element))
{
rp_layout_set_value(layout,env,value);
- printf("%s\n",value);
return AXIS2_SUCCESS;
}
else
@@ -115,7 +112,6 @@
if(rp_match_secpolicy_qname(env,RP_LAYOUT_LAX_TIMESTAMP_LAST,node,element))
{
rp_layout_set_value(layout,env,value);
- printf("%s\n",value);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/policy_creator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/policy_creator.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/policy_creator.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/policy_creator.c Wed Feb 7 03:36:05 2007
@@ -27,7 +27,6 @@
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CREATING_XML_STREAM_READER,
AXIS2_FAILURE);
- printf("xml reader creation failed\n");
return NULL;
}
@@ -35,14 +34,12 @@
if(!builder)
{
AXIOM_XML_READER_FREE(reader, env);
- printf("Builder creation failed\n");
return NULL;
}
document = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, env);
if(!document)
{
AXIOM_STAX_BUILDER_FREE(builder, env);
- printf("Document creation failed\n");
return NULL;
}
@@ -60,7 +57,6 @@
root_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT (root, env);
if(root_ele)
{
- printf("%s\n" , AXIOM_ELEMENT_GET_LOCALNAME(root_ele, env));
}
}
else
@@ -74,7 +70,6 @@
exat_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT (exat_node, env);
if(exat_ele)
{
- printf("%s\n" , AXIOM_ELEMENT_GET_LOCALNAME(exat_ele, env));
}
}
else
@@ -91,14 +86,12 @@
all_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT (all_node, env);
if(all_ele)
{
- printf("%s\n" , AXIOM_ELEMENT_GET_LOCALNAME(all_ele, env));
secpolicy = rp_secpolicy_builder_build(env,all_node);
}
}
else
return NULL;
}
- printf("Successful\n");
return secpolicy;
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/rampart_config_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/rampart_config_builder.c Wed Feb 7 03:36:05 2007
@@ -95,8 +95,6 @@
{
axis2_char_t *user = NULL;
user = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- printf("%s\n",local_name);
- printf("%s\n",user);
return rp_rampart_config_set_user(rampart_config,env,user);
}
@@ -109,8 +107,6 @@
{
axis2_char_t *encryption_user = NULL;
encryption_user = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- printf("%s\n",local_name);
- printf("%s\n",encryption_user);
return rp_rampart_config_set_encryption_user(rampart_config,env,encryption_user);
}
else
@@ -122,8 +118,6 @@
{
axis2_char_t *password_callback_class = NULL;
password_callback_class = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- printf("%s\n",local_name);
- printf("%s\n",password_callback_class);
return rp_rampart_config_set_password_callback_class(rampart_config,env,password_callback_class);
}
else
@@ -135,8 +129,6 @@
{
axis2_char_t *authenticate_module = NULL;
authenticate_module = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- printf("%s\n",local_name);
- printf("%s\n",authenticate_module);
return rp_rampart_config_set_authenticate_module(rampart_config,env,authenticate_module);
}
else
@@ -148,8 +140,6 @@
{
axis2_char_t *password_type = NULL;
password_type = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- printf("%s\n",local_name);
- printf("%s\n",password_type);
return rp_rampart_config_set_password_type(rampart_config,env,password_type);
}
else
@@ -165,7 +155,6 @@
if(!signature_crypto)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_rampart_config_set_signature_crypto(rampart_config,env,signature_crypto);
}
else
@@ -180,7 +169,6 @@
if(!encryption_crypto)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_rampart_config_set_encryption_crypto(rampart_config,env,encryption_crypto);
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/secpolicy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/secpolicy_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/secpolicy_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/secpolicy_builder.c Wed Feb 7 03:36:05 2007
@@ -103,7 +103,6 @@
binding = NULL;
return AXIS2_FAILURE;
}
- printf("%s\n",local_name);
return rp_secpolicy_set_binding(secpolicy,env,binding);
}
else
@@ -132,7 +131,6 @@
binding = NULL;
return AXIS2_FAILURE;
}
- printf("%s\n",local_name);
return rp_secpolicy_set_binding(secpolicy,env,binding);
}
else
@@ -162,7 +160,6 @@
binding = NULL;
return AXIS2_FAILURE;
}
- printf("%s\n",local_name);
return rp_secpolicy_set_binding(secpolicy,env,binding);
}
else
@@ -180,7 +177,6 @@
rp_supporting_tokens_set_type(signed_supporting_tokens,env,RP_SUPPORTING_SIGNED_SUPPORTING);
- printf("%s\n",local_name);
return rp_secpolicy_set_signed_supporting_tokens(secpolicy,env,signed_supporting_tokens);
}
else
@@ -199,7 +195,6 @@
rp_supporting_tokens_set_type(signed_endorsing_supporting_tokens,env,RP_SUPPORTING_SIGNED_ENDORSING_SUPPORTING);
- printf("%s\n",local_name);
return rp_secpolicy_set_signed_endorsing_supporting_tokens(secpolicy,env,signed_endorsing_supporting_tokens);
}
else
@@ -217,7 +212,6 @@
rp_supporting_tokens_set_type(supporting_tokens,env,RP_SUPPORTING_SUPPORTING);
- printf("%s\n",local_name);
return rp_secpolicy_set_supporting_tokens(secpolicy,env,supporting_tokens);
}
else
@@ -235,7 +229,6 @@
rp_supporting_tokens_set_type(endorsing_supporting_tokens,env,RP_SUPPORTING_ENDORSING_SUPPORTING);
- printf("%s\n",local_name);
return rp_secpolicy_set_endorsing_supporting_tokens(secpolicy,env,endorsing_supporting_tokens);
}
else
@@ -252,7 +245,6 @@
rp_signed_encrypted_parts_set_signedparts(signed_parts,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return rp_secpolicy_set_signed_parts(secpolicy,env,signed_parts);
}
else
@@ -270,7 +262,6 @@
rp_signed_encrypted_parts_set_signedparts(encrypted_parts,env,AXIS2_FALSE);
- printf("%s\n",local_name);
return rp_secpolicy_set_encrypted_parts(secpolicy,env,encrypted_parts);
}
else
@@ -287,7 +278,6 @@
rp_signed_encrypted_elements_set_signedelements(signed_elements,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return rp_secpolicy_set_signed_elements(secpolicy,env,signed_elements);
}
else
@@ -305,7 +295,6 @@
rp_signed_encrypted_elements_set_signedelements(encrypted_elements,env,AXIS2_FALSE);
- printf("%s\n",local_name);
return rp_secpolicy_set_encrypted_elements(secpolicy,env,encrypted_elements);
}
else
@@ -335,7 +324,6 @@
wss = NULL;
return AXIS2_FAILURE;
}
- printf("%s\n",local_name);
return rp_secpolicy_set_wss(secpolicy,env,wss);
}
else
@@ -364,7 +352,6 @@
wss = NULL;
return AXIS2_FAILURE;
}
- printf("%s\n",local_name);
return rp_secpolicy_set_wss(secpolicy,env,wss);
}
else
@@ -379,7 +366,6 @@
if(!rampart_config)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_secpolicy_set_rampart_config(secpolicy,env,rampart_config);
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/security_context_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/security_context_token_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/security_context_token_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/security_context_token_builder.c Wed Feb 7 03:36:05 2007
@@ -125,7 +125,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_EXTERNAL_URI_REFERENCE,node,element))
{
rp_security_context_token_set_require_external_uri_ref(security_context_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -136,7 +135,6 @@
if(rp_match_secpolicy_qname(env,RP_SC10_SECURITY_CONTEXT_TOKEN,node,element))
{
rp_security_context_token_set_sc10_security_context_token(security_context_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -147,7 +145,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_DERIVED_KEYS,node,element))
{
rp_security_context_token_set_derivedkeys(security_context_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signature_crypto_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signature_crypto_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signature_crypto_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signature_crypto_builder.c Wed Feb 7 03:36:05 2007
@@ -95,8 +95,6 @@
{
axis2_char_t *signature_prop_file = NULL;
signature_prop_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- printf("%s\n",local_name);
- printf("%s\n",signature_prop_file);
return rp_signature_crypto_set_signature_prop_file(signature_crypto,env,signature_prop_file);
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c Wed Feb 7 03:36:05 2007
@@ -99,7 +99,6 @@
if(rp_match_secpolicy_qname(env,RP_BODY,node,element))
{
rp_signed_encrypted_parts_set_body(signed_encrypted_parts,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c Wed Feb 7 03:36:05 2007
@@ -123,7 +123,6 @@
if(!algorithmsuite)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_supporting_tokens_set_algorithmsuite(supporting_tokens,env,algorithmsuite);
}
else
@@ -140,7 +139,6 @@
rp_signed_encrypted_parts_set_signedparts(signed_parts,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return rp_supporting_tokens_set_signed_parts(supporting_tokens,env,signed_parts);
}
else
@@ -157,7 +155,6 @@
rp_signed_encrypted_elements_set_signedelements(signed_elements,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return rp_supporting_tokens_set_signed_elements(supporting_tokens,env,signed_elements);
}
else
@@ -175,7 +172,6 @@
rp_signed_encrypted_parts_set_signedparts(encrypted_parts,env,AXIS2_FALSE);
- printf("%s\n",local_name);
return rp_supporting_tokens_set_encrypted_parts(supporting_tokens,env,encrypted_parts);
}
else
@@ -193,7 +189,6 @@
rp_signed_encrypted_elements_set_signedelements(encrypted_elements,env,AXIS2_FALSE);
- printf("%s\n",local_name);
return rp_supporting_tokens_set_encrypted_elements(supporting_tokens,env,encrypted_elements);
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c Wed Feb 7 03:36:05 2007
@@ -35,7 +35,6 @@
if(rp_match_secpolicy_qname(env,RP_ENCRYPT_BEFORE_SIGNING,node,element))
{
rp_symmetric_asymmetric_binding_commons_set_protection_order(as_commons,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
@@ -46,7 +45,6 @@
if(rp_match_secpolicy_qname(env,RP_ENCRYPT_SIGNATURE,node,element))
{
rp_symmetric_asymmetric_binding_commons_set_signature_protection(as_commons,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
@@ -57,7 +55,6 @@
if(rp_match_secpolicy_qname(env,RP_PROTECT_TOKENS,node,element))
{
rp_symmetric_asymmetric_binding_commons_set_token_protection(as_commons,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
@@ -68,7 +65,6 @@
if(rp_match_secpolicy_qname(env,RP_ONLY_SIGN_ENTIRE_HEADERS_AND_BODY,node,element))
{
rp_symmetric_asymmetric_binding_commons_set_entire_headers_and_body_signatures(as_commons,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c Wed Feb 7 03:36:05 2007
@@ -111,7 +111,6 @@
if(!protection_token)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_symmetric_binding_set_protection_token(symmetric_binding,env,protection_token);
}
else
@@ -126,7 +125,6 @@
if(!encryption_token)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_symmetric_binding_set_encryption_token(symmetric_binding,env,encryption_token);
}
else
@@ -142,7 +140,6 @@
if(!signature_token)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_symmetric_binding_set_signature_token(symmetric_binding,env,signature_token);
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/token_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/token_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/token_builder.c Wed Feb 7 03:36:05 2007
@@ -86,7 +86,6 @@
if(!username_token)
return AXIS2_FAILURE;
- printf("%s\n",value);
return rp_property_set_value(token,env,username_token,RP_TOKEN_USERNAME);
}
else
@@ -101,7 +100,6 @@
if(!x509_token)
return AXIS2_FAILURE;
- printf("%s\n",value);
return rp_property_set_value(token,env,x509_token,RP_TOKEN_X509);
}
else
@@ -116,7 +114,6 @@
if(!security_context_token)
return AXIS2_FAILURE;
- printf("%s\n",value);
return rp_property_set_value(token,env,security_context_token,RP_TOKEN_SECURITY_CONTEXT);
}
else
@@ -131,7 +128,6 @@
if(!https_token)
return AXIS2_FAILURE;
- printf("%s\n",value);
return rp_property_set_value(token,env,https_token,RP_TOKEN_HTTPS);
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/transport_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/transport_binding_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/transport_binding_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/transport_binding_builder.c Wed Feb 7 03:36:05 2007
@@ -104,7 +104,6 @@
if(!transport_token)
return AXIS2_FAILURE;
- printf("%s\n",local_name);
return rp_transport_binding_set_transport_token(transport_binding,env,transport_token);
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/username_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/username_token_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/username_token_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/username_token_builder.c Wed Feb 7 03:36:05 2007
@@ -128,7 +128,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_USERNAME_TOKEN_10,node,element))
{
rp_username_token_set_useUTprofile10(username_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -139,7 +138,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_USERNAME_TOKEN_11,node,element))
{
rp_username_token_set_useUTprofile11(username_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -150,7 +148,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_DERIVED_KEYS,node,element))
{
rp_username_token_set_derivedkeys(username_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss10_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss10_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss10_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss10_builder.c Wed Feb 7 03:36:05 2007
@@ -95,7 +95,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_KEY_IDENTIFIER,node,element))
{
rp_wss10_set_must_support_ref_key_identifier(wss10,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -106,7 +105,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_ISSUER_SERIAL,node,element))
{
rp_wss10_set_must_support_ref_issuer_serial(wss10,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -117,7 +115,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_EXTERNAL_URI,node,element))
{
rp_wss10_set_must_support_ref_external_uri(wss10,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -128,7 +125,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_EMBEDDED_TOKEN,node,element))
{
rp_wss10_set_must_support_ref_embedded_token(wss10,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss11_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss11_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss11_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/wss11_builder.c Wed Feb 7 03:36:05 2007
@@ -96,7 +96,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_KEY_IDENTIFIER,node,element))
{
rp_wss11_set_must_support_ref_key_identifier(wss11,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -107,7 +106,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_ISSUER_SERIAL,node,element))
{
rp_wss11_set_must_support_ref_issuer_serial(wss11,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -118,7 +116,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_EXTERNAL_URI,node,element))
{
rp_wss11_set_must_support_ref_external_uri(wss11,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -129,7 +126,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_EMBEDDED_TOKEN,node,element))
{
rp_wss11_set_must_support_ref_embedded_token(wss11,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -140,7 +136,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_THUMBPRINT,node,element))
{
rp_wss11_set_must_support_ref_thumbprint(wss11,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -151,7 +146,6 @@
if(rp_match_secpolicy_qname(env,RP_MUST_SUPPORT_REF_ENCRYPTED_KEY,node,element))
{
rp_wss11_set_must_support_ref_encryptedkey(wss11,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -162,7 +156,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_SIGNATURE_CONFIRMATION,node,element))
{
rp_wss11_set_require_signature_confirmation(wss11,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/x509_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/x509_token_builder.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/x509_token_builder.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/builder/x509_token_builder.c Wed Feb 7 03:36:05 2007
@@ -126,7 +126,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_KEY_IDENTIFIRE_REFERENCE,node,element))
{
rp_x509_token_set_require_key_identifier_reference(x509_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -137,7 +136,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_ISSUER_SERIAL_REFERENCE,node,element))
{
rp_x509_token_set_require_issuer_serial_reference(x509_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -148,7 +146,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_EMBEDDED_TOKEN_REFERENCE,node,element))
{
rp_x509_token_set_require_embedded_token_reference(x509_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -159,7 +156,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_THUMBPRINT_REFERENCE,node,element))
{
rp_x509_token_set_require_thumb_print_reference(x509_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -170,7 +166,6 @@
if(rp_match_secpolicy_qname(env,RP_REQUIRE_DERIVED_KEYS,node,element))
{
rp_x509_token_set_derivedkeys(x509_token,env,AXIS2_TRUE);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -181,7 +176,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_X509_V1_TOKEN_10,node,element))
{
rp_x509_token_set_token_version_and_type(x509_token,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -192,7 +186,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_X509_V3_TOKEN_10,node,element))
{
rp_x509_token_set_token_version_and_type(x509_token,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -203,7 +196,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_X509_PKCS7_TOKEN_10,node,element))
{
rp_x509_token_set_token_version_and_type(x509_token,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -214,7 +206,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_X509_PKI_PATH_V1_TOKEN_10,node,element))
{
rp_x509_token_set_token_version_and_type(x509_token,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -225,7 +216,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_X509_V1_TOKEN_11,node,element))
{
rp_x509_token_set_token_version_and_type(x509_token,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -236,7 +226,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_X509_V3_TOKEN_11,node,element))
{
rp_x509_token_set_token_version_and_type(x509_token,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -247,7 +236,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_X509_PKCS7_TOKEN_11,node,element))
{
rp_x509_token_set_token_version_and_type(x509_token,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
@@ -258,7 +246,6 @@
if(rp_match_secpolicy_qname(env,RP_WSS_X509_PKI_PATH_V1_TOKEN_11,node,element))
{
rp_x509_token_set_token_version_and_type(x509_token,env,local_name);
- printf("%s\n",local_name);
return AXIS2_SUCCESS;
}
else
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/header.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/header.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/header.c Wed Feb 7 03:36:05 2007
@@ -54,16 +54,6 @@
if(header)
{
- if(header->name)
- {
- AXIS2_FREE(env->allocator, header->name);
- header->name = NULL;
- }
- if(header->namespace)
- {
- AXIS2_FREE(env->allocator, header->namespace);
- header->namespace = NULL;
- }
AXIS2_FREE(env->allocator, header);
header = NULL;
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/https_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/https_token.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/https_token.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/https_token.c Wed Feb 7 03:36:05 2007
@@ -83,7 +83,6 @@
AXIS2_PARAM_CHECK(env->error,inclusion,AXIS2_FAILURE);
https_token->inclusion = inclusion;
- printf("%s\n",https_token->inclusion);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/ut.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/ut.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/ut.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/ut.c Wed Feb 7 03:36:05 2007
@@ -89,7 +89,6 @@
AXIS2_PARAM_CHECK(env->error,inclusion,AXIS2_FAILURE);
username_token->inclusion = inclusion;
- printf("%s\n",username_token->inclusion);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/x509_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/x509_token.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/x509_token.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/model/x509_token.c Wed Feb 7 03:36:05 2007
@@ -91,7 +91,6 @@
AXIS2_PARAM_CHECK(env->error,inclusion,AXIS2_FAILURE);
x509_token->inclusion = inclusion;
- printf("%s\n",x509_token->inclusion);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/test-resources/outgoing_policy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/test-resources/outgoing_policy.xml?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/test-resources/outgoing_policy.xml (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/secpolicy/test-resources/outgoing_policy.xml Wed Feb 7 03:36:05 2007
@@ -40,7 +40,10 @@
<wsp:Policy>
<sp:MustSupportRefIssuerSerial/>
</wsp:Policy>
- </sp:Wss10>
+ </sp:Wss10>
+ <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:EncryptedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:user>Gampola</rampc:user>
<rampc:encryptionUser>b</rampc:encryptionUser>
Modified: webservices/axis2/scratch/c/security-policy/c/rampart/src/util/rampart_sec_header_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/security-policy/c/rampart/src/util/rampart_sec_header_processor.c?view=diff&rev=504510&r1=504509&r2=504510
==============================================================================
--- webservices/axis2/scratch/c/security-policy/c/rampart/src/util/rampart_sec_header_processor.c (original)
+++ webservices/axis2/scratch/c/security-policy/c/rampart/src/util/rampart_sec_header_processor.c Wed Feb 7 03:36:05 2007
@@ -329,6 +329,11 @@
axiom_node_t *decrypted_node = NULL;
axiom_node_t *mtd_node = NULL;
axis2_char_t *sym_algo = NULL;
+ axiom_soap_body_t *soap_body = NULL;
+
+ /*This need to be done in order to build the soap body.Do not remove.*/
+
+ soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
/*Get the i-th element and decrypt it */
id = (axis2_char_t*)AXIS2_ARRAY_LIST_GET(reference_list, env, i);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org