Modified: webservices/rampart/trunk/c/src/secpolicy/builder/secpolicy_builder.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/builder/secpolicy_builder.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/secpolicy/builder/secpolicy_builder.c (original) +++ webservices/rampart/trunk/c/src/secpolicy/builder/secpolicy_builder.c Tue Apr 3 01:45:32 2007 @@ -80,7 +80,7 @@ { AXIS2_ENV_CHECK(env,AXIS2_FAILURE); - if(axis2_strcmp(local_name,RP_SYMMETRIC_BINDING)==0) + if(axutil_strcmp(local_name,RP_SYMMETRIC_BINDING)==0) { if(rp_match_secpolicy_qname(env,RP_SYMMETRIC_BINDING,node,element)) { @@ -108,7 +108,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ASYMMETRIC_BINDING)==0) + else if(axutil_strcmp(local_name,RP_ASYMMETRIC_BINDING)==0) { if(rp_match_secpolicy_qname(env,RP_ASYMMETRIC_BINDING,node,element)) { @@ -137,7 +137,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_TRANSPORT_BINDING)==0) + else if(axutil_strcmp(local_name,RP_TRANSPORT_BINDING)==0) { if(rp_match_secpolicy_qname(env,RP_TRANSPORT_BINDING,node,element)) { @@ -165,7 +165,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SIGNED_SUPPORTING_TOKENS)==0) + else if(axutil_strcmp(local_name,RP_SIGNED_SUPPORTING_TOKENS)==0) { if(rp_match_secpolicy_qname(env,RP_SIGNED_SUPPORTING_TOKENS,node,element)) { @@ -183,7 +183,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SIGNED_ENDORSING_SUPPORTING_TOKENS)==0) + else if(axutil_strcmp(local_name,RP_SIGNED_ENDORSING_SUPPORTING_TOKENS)==0) { if(rp_match_secpolicy_qname(env,RP_SIGNED_ENDORSING_SUPPORTING_TOKENS,node,element)) { @@ -200,7 +200,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SUPPORTING_TOKENS)==0) + else if(axutil_strcmp(local_name,RP_SUPPORTING_TOKENS)==0) { if(rp_match_secpolicy_qname(env,RP_SUPPORTING_TOKENS,node,element)) { @@ -217,7 +217,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ENDORSING_SUPPORTING_TOKENS)==0) + else if(axutil_strcmp(local_name,RP_ENDORSING_SUPPORTING_TOKENS)==0) { if(rp_match_secpolicy_qname(env,RP_ENDORSING_SUPPORTING_TOKENS,node,element)) { @@ -234,7 +234,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SIGNED_PARTS)==0) + else if(axutil_strcmp(local_name,RP_SIGNED_PARTS)==0) { if(rp_match_secpolicy_qname(env,RP_SIGNED_PARTS,node,element)) { @@ -251,7 +251,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ENCRYPTED_PARTS)==0) + else if(axutil_strcmp(local_name,RP_ENCRYPTED_PARTS)==0) { if(rp_match_secpolicy_qname(env,RP_ENCRYPTED_PARTS,node,element)) { @@ -267,7 +267,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SIGNED_ELEMENTS)==0) + else if(axutil_strcmp(local_name,RP_SIGNED_ELEMENTS)==0) { if(rp_match_secpolicy_qname(env,RP_SIGNED_ELEMENTS,node,element)) { @@ -284,7 +284,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ENCRYPTED_ELEMENTS)==0) + else if(axutil_strcmp(local_name,RP_ENCRYPTED_ELEMENTS)==0) { if(rp_match_secpolicy_qname(env,RP_ENCRYPTED_ELEMENTS,node,element)) { @@ -301,7 +301,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SIGNED_ITEMS)==0) + else if(axutil_strcmp(local_name,RP_SIGNED_ITEMS)==0) { if( rp_match_rampart_config_qname(env,RP_SIGNED_ITEMS,node,element)) { @@ -318,7 +318,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ENCRYPTED_ITEMS)==0) + else if(axutil_strcmp(local_name,RP_ENCRYPTED_ITEMS)==0) { if(rp_match_secpolicy_qname(env,RP_ENCRYPTED_ITEMS,node,element)) { @@ -334,7 +334,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_WSS10)==0) + else if(axutil_strcmp(local_name,RP_WSS10)==0) { if(rp_match_secpolicy_qname(env,RP_WSS10,node,element)) { @@ -362,7 +362,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_WSS11)==0) + else if(axutil_strcmp(local_name,RP_WSS11)==0) { if(rp_match_secpolicy_qname(env,RP_WSS11,node,element)) { @@ -390,7 +390,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_RAMPART_CONFIG)==0) + else if(axutil_strcmp(local_name,RP_RAMPART_CONFIG)==0) { if(rp_match_rampart_config_qname(env,RP_RAMPART_CONFIG,node,element)) {
Modified: webservices/rampart/trunk/c/src/secpolicy/builder/supporting_tokens_builder.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/builder/supporting_tokens_builder.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/secpolicy/builder/supporting_tokens_builder.c (original) +++ webservices/rampart/trunk/c/src/secpolicy/builder/supporting_tokens_builder.c Tue Apr 3 01:45:32 2007 @@ -114,7 +114,7 @@ { AXIS2_ENV_CHECK(env,AXIS2_FAILURE); - if(axis2_strcmp(local_name,RP_ALGORITHM_SUITE)==0) + if(axutil_strcmp(local_name,RP_ALGORITHM_SUITE)==0) { if(rp_match_secpolicy_qname(env,RP_ALGORITHM_SUITE,node,element)) { @@ -128,7 +128,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SIGNED_PARTS)==0) + else if(axutil_strcmp(local_name,RP_SIGNED_PARTS)==0) { if(rp_match_secpolicy_qname(env,RP_SIGNED_PARTS,node,element)) { @@ -144,7 +144,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SIGNED_ELEMENTS)==0) + else if(axutil_strcmp(local_name,RP_SIGNED_ELEMENTS)==0) { if(rp_match_secpolicy_qname(env,RP_SIGNED_ELEMENTS,node,element)) { @@ -161,7 +161,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ENCRYPTED_PARTS)==0) + else if(axutil_strcmp(local_name,RP_ENCRYPTED_PARTS)==0) { if(rp_match_secpolicy_qname(env,RP_ENCRYPTED_PARTS,node,element)) { @@ -178,7 +178,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ENCRYPTED_ELEMENTS)==0) + else if(axutil_strcmp(local_name,RP_ENCRYPTED_ELEMENTS)==0) { if(rp_match_secpolicy_qname(env,RP_ENCRYPTED_ELEMENTS,node,element)) { @@ -204,13 +204,13 @@ { AXIS2_ENV_CHECK(env,AXIS2_FALSE); - if(axis2_strcmp(local_name,RP_USERNAME_TOKEN)==0) + if(axutil_strcmp(local_name,RP_USERNAME_TOKEN)==0) return AXIS2_TRUE; - else if(axis2_strcmp(local_name,RP_X509_TOKEN)==0) + else if(axutil_strcmp(local_name,RP_X509_TOKEN)==0) return AXIS2_TRUE; - else if(axis2_strcmp(local_name,RP_SECURITY_CONTEXT_TOKEN)==0) + else if(axutil_strcmp(local_name,RP_SECURITY_CONTEXT_TOKEN)==0) return AXIS2_TRUE; else Modified: webservices/rampart/trunk/c/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c (original) +++ webservices/rampart/trunk/c/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c Tue Apr 3 01:45:32 2007 @@ -30,7 +30,7 @@ { AXIS2_ENV_CHECK(env,AXIS2_FAILURE); - if(axis2_strcmp(local_name,RP_ENCRYPT_BEFORE_SIGNING)==0) + if(axutil_strcmp(local_name,RP_ENCRYPT_BEFORE_SIGNING)==0) { if(rp_match_secpolicy_qname(env,RP_ENCRYPT_BEFORE_SIGNING,node,element)) { @@ -40,7 +40,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ENCRYPT_SIGNATURE)==0) + else if(axutil_strcmp(local_name,RP_ENCRYPT_SIGNATURE)==0) { if(rp_match_secpolicy_qname(env,RP_ENCRYPT_SIGNATURE,node,element)) { @@ -50,7 +50,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_PROTECT_TOKENS)==0) + else if(axutil_strcmp(local_name,RP_PROTECT_TOKENS)==0) { if(rp_match_secpolicy_qname(env,RP_PROTECT_TOKENS,node,element)) { @@ -60,7 +60,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ONLY_SIGN_ENTIRE_HEADERS_AND_BODY)==0) + else if(axutil_strcmp(local_name,RP_ONLY_SIGN_ENTIRE_HEADERS_AND_BODY)==0) { if(rp_match_secpolicy_qname(env,RP_ONLY_SIGN_ENTIRE_HEADERS_AND_BODY,node,element)) { Modified: webservices/rampart/trunk/c/src/secpolicy/builder/symmetric_binding_builder.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/builder/symmetric_binding_builder.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/secpolicy/builder/symmetric_binding_builder.c (original) +++ webservices/rampart/trunk/c/src/secpolicy/builder/symmetric_binding_builder.c Tue Apr 3 01:45:32 2007 @@ -102,7 +102,7 @@ { AXIS2_ENV_CHECK(env,AXIS2_FAILURE); - if(axis2_strcmp(local_name,RP_PROTECTION_TOKEN)==0) + if(axutil_strcmp(local_name,RP_PROTECTION_TOKEN)==0) { if(rp_match_secpolicy_qname(env,RP_PROTECTION_TOKEN,node,element)) { @@ -116,7 +116,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_ENCRYPTION_TOKEN)==0) + else if(axutil_strcmp(local_name,RP_ENCRYPTION_TOKEN)==0) { if(rp_match_secpolicy_qname(env,RP_ENCRYPTION_TOKEN,node,element)) { @@ -131,7 +131,7 @@ return AXIS2_FAILURE; } - else if(axis2_strcmp(local_name,RP_SIGNATURE_TOKEN)==0) + else if(axutil_strcmp(local_name,RP_SIGNATURE_TOKEN)==0) { if(rp_match_secpolicy_qname(env,RP_SIGNATURE_TOKEN,node,element)) { @@ -156,13 +156,13 @@ { AXIS2_ENV_CHECK(env,AXIS2_FALSE); - if(axis2_strcmp(local_name,RP_PROTECTION_TOKEN)==0) + if(axutil_strcmp(local_name,RP_PROTECTION_TOKEN)==0) return AXIS2_TRUE; - else if(axis2_strcmp(local_name,RP_ENCRYPTION_TOKEN)==0) + else if(axutil_strcmp(local_name,RP_ENCRYPTION_TOKEN)==0) return AXIS2_TRUE; - else if(axis2_strcmp(local_name,RP_SIGNATURE_TOKEN)==0) + else if(axutil_strcmp(local_name,RP_SIGNATURE_TOKEN)==0) return AXIS2_TRUE; else Modified: webservices/rampart/trunk/c/src/secpolicy/builder/token_builder.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/builder/token_builder.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/secpolicy/builder/token_builder.c (original) +++ webservices/rampart/trunk/c/src/secpolicy/builder/token_builder.c Tue Apr 3 01:45:32 2007 @@ -77,7 +77,7 @@ { AXIS2_ENV_CHECK(env,AXIS2_FAILURE); - if(axis2_strcmp(value,RP_USERNAME_TOKEN)==0) + if(axutil_strcmp(value,RP_USERNAME_TOKEN)==0) { if(rp_match_secpolicy_qname(env,RP_USERNAME_TOKEN,node,element)) { @@ -91,7 +91,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(value,RP_X509_TOKEN)==0) + else if(axutil_strcmp(value,RP_X509_TOKEN)==0) { if(rp_match_secpolicy_qname(env,RP_X509_TOKEN,node,element)) { @@ -105,7 +105,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(value,RP_SECURITY_CONTEXT_TOKEN)==0) + else if(axutil_strcmp(value,RP_SECURITY_CONTEXT_TOKEN)==0) { if(rp_match_secpolicy_qname(env,RP_SECURITY_CONTEXT_TOKEN,node,element)) { @@ -119,7 +119,7 @@ else return AXIS2_FAILURE; } - else if(axis2_strcmp(value,RP_HTTPS_TOKEN)==0) + else if(axutil_strcmp(value,RP_HTTPS_TOKEN)==0) { if(rp_match_secpolicy_qname(env,RP_HTTPS_TOKEN,node,element)) { Modified: webservices/rampart/trunk/c/src/secpolicy/builder/transport_binding_builder.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/builder/transport_binding_builder.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/secpolicy/builder/transport_binding_builder.c (original) +++ webservices/rampart/trunk/c/src/secpolicy/builder/transport_binding_builder.c Tue Apr 3 01:45:32 2007 @@ -95,7 +95,7 @@ { AXIS2_ENV_CHECK(env,AXIS2_FAILURE); - if(axis2_strcmp(local_name,RP_TRANSPORT_TOKEN)==0) + if(axutil_strcmp(local_name,RP_TRANSPORT_TOKEN)==0) { if(rp_match_secpolicy_qname(env,RP_TRANSPORT_TOKEN,node,element)) { @@ -120,7 +120,7 @@ { AXIS2_ENV_CHECK(env,AXIS2_FALSE); - if(axis2_strcmp(local_name,RP_TRANSPORT_TOKEN)==0) + if(axutil_strcmp(local_name,RP_TRANSPORT_TOKEN)==0) return AXIS2_TRUE; else Modified: webservices/rampart/trunk/c/src/secpolicy/model/algorithmsuite.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/model/algorithmsuite.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/secpolicy/model/algorithmsuite.c (original) +++ webservices/rampart/trunk/c/src/secpolicy/model/algorithmsuite.c Tue Apr 3 01:45:32 2007 @@ -118,7 +118,7 @@ algorithmsuite->algosuite_string = algosuite_string; - if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256)==0) + if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256)==0) { algorithmsuite->digest = RP_SHA1; algorithmsuite->encryption = RP_AES256; @@ -130,7 +130,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192)==0) { algorithmsuite->digest = RP_SHA1; algorithmsuite->encryption = RP_AES192; @@ -142,7 +142,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128)==0) { algorithmsuite->digest = RP_SHA1; algorithmsuite->encryption = RP_AES128; @@ -154,7 +154,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES)==0) { algorithmsuite->digest = RP_SHA1; algorithmsuite->encryption = RP_TRIPLE_DES; @@ -166,7 +166,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_RSA15)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_RSA15)==0) { algorithmsuite->digest = RP_SHA1; algorithmsuite->encryption = RP_AES256; @@ -178,7 +178,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_RSA15)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_RSA15)==0) { algorithmsuite->digest = RP_SHA1; algorithmsuite->encryption = RP_AES192; @@ -190,7 +190,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_RSA15)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_RSA15)==0) { algorithmsuite->digest = RP_SHA1; algorithmsuite->encryption = RP_AES128; @@ -202,7 +202,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_RSA15)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_RSA15)==0) { algorithmsuite->digest = RP_SHA1; algorithmsuite->encryption = RP_TRIPLE_DES; @@ -214,7 +214,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_SHA256)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_SHA256)==0) { algorithmsuite->digest = RP_SHA256; algorithmsuite->encryption = RP_AES256; @@ -226,7 +226,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_SHA256)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_SHA256)==0) { algorithmsuite->digest = RP_SHA256; algorithmsuite->encryption = RP_AES192; @@ -238,7 +238,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_SHA256)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_SHA256)==0) { algorithmsuite->digest = RP_SHA256; algorithmsuite->encryption = RP_AES128; @@ -250,7 +250,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_SHA256)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_SHA256)==0) { algorithmsuite->digest = RP_SHA256; algorithmsuite->encryption = RP_TRIPLE_DES; @@ -262,7 +262,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_SHA256_RSA15)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_SHA256_RSA15)==0) { algorithmsuite->digest = RP_SHA256; algorithmsuite->encryption = RP_AES256; @@ -274,7 +274,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_SHA256_RSA15)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_SHA256_RSA15)==0) { algorithmsuite->digest = RP_SHA256; algorithmsuite->encryption = RP_AES192; @@ -286,7 +286,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_SHA256_RSA15)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_SHA256_RSA15)==0) { algorithmsuite->digest = RP_SHA256; algorithmsuite->encryption = RP_AES128; @@ -298,7 +298,7 @@ return AXIS2_SUCCESS; } - else if(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_SHA256_RSA15)==0) + else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_SHA256_RSA15)==0) { algorithmsuite->digest = RP_SHA256; algorithmsuite->encryption = RP_TRIPLE_DES; Modified: webservices/rampart/trunk/c/src/util/rampart_context.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_context.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_context.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_context.c Tue Apr 3 01:45:32 2007 @@ -771,9 +771,9 @@ if(bval) { inclusion = rp_username_token_get_inclusion(username_token,env); - if((axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)|| - (axis2_strcmp(inclusion,RP_INCLUDE_ONCE)==0)|| - (axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0)) + if((axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)|| + (axutil_strcmp(inclusion,RP_INCLUDE_ONCE)==0)|| + (axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0)) return bval; else bval = AXIS2_FALSE; @@ -836,7 +836,7 @@ if(!namespace) return AXIS2_FAILURE; - if(axis2_strcmp(namespace,RP_SECURITY_NS)==0) + if(axutil_strcmp(namespace,RP_SECURITY_NS)==0) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] We do not sign or encrypt security namespace headers"); return AXIS2_FAILURE; @@ -868,7 +868,7 @@ } } - else if(axis2_strcmp(local_name,"Security")==0) + else if(axutil_strcmp(local_name,"Security")==0) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] We do not sign or encrypt %s", local_name); return AXIS2_FAILURE; @@ -893,7 +893,7 @@ if(ns) { namespace_uri = axiom_namespace_get_uri(ns, env); - if (axis2_strcmp(namespace_uri,namespace) == 0) + if (axutil_strcmp(namespace_uri,namespace) == 0) { axutil_array_list_add(nodes_to_encrypt_or_sign,env,ret_node); return AXIS2_SUCCESS; @@ -923,7 +923,7 @@ if(!namespace) return AXIS2_FAILURE; - if(axis2_strcmp(namespace,RP_SECURITY_NS)==0) + if(axutil_strcmp(namespace,RP_SECURITY_NS)==0) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] We do not sign or encrypt security namespace elements"); return AXIS2_FAILURE; @@ -957,7 +957,7 @@ } */ if(local_name) { - if(axis2_strcmp(local_name,"Security")==0) + if(axutil_strcmp(local_name,"Security")==0) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] We do not sign or encrypt %s", local_name); return AXIS2_FAILURE; @@ -982,7 +982,7 @@ if(ns) { namespace_uri = axiom_namespace_get_uri(ns, env); - if (axis2_strcmp(namespace_uri,namespace) == 0) + if (axutil_strcmp(namespace_uri,namespace) == 0) { axutil_array_list_add(nodes_to_encrypt_or_sign,env,ret_node); return AXIS2_SUCCESS; @@ -1369,10 +1369,10 @@ else { protection_order = rp_symmetric_asymmetric_binding_commons_get_protection_order(sym_asym_commons,env); - if(!protection_order || axis2_strcmp(protection_order,RP_SIGN_BEFORE_ENCRYPTING)==0) + if(!protection_order || axutil_strcmp(protection_order,RP_SIGN_BEFORE_ENCRYPTING)==0) return AXIS2_FALSE; - else if(axis2_strcmp(protection_order,RP_ENCRYPT_BEFORE_SIGNING)==0) + else if(axutil_strcmp(protection_order,RP_ENCRYPT_BEFORE_SIGNING)==0) return AXIS2_TRUE; } return AXIS2_FALSE; @@ -1893,12 +1893,12 @@ inclusion = rp_x509_token_get_inclusion(x509_token,env); if(server_side) - include = ((axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)|| - (axis2_strcmp(inclusion,RP_INCLUDE_ONCE)==0)); + include = ((axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)|| + (axutil_strcmp(inclusion,RP_INCLUDE_ONCE)==0)); else - include = ((axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)|| - (axis2_strcmp(inclusion,RP_INCLUDE_ONCE)==0)|| - (axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0)); + include = ((axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)|| + (axutil_strcmp(inclusion,RP_INCLUDE_ONCE)==0)|| + (axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0)); return include; } @@ -1955,13 +1955,13 @@ axis2_char_t *identifier, const axutil_env_t *env) { - if(axis2_strcmp(identifier,RAMPART_STR_KEY_IDENTIFIER)==0) + if(axutil_strcmp(identifier,RAMPART_STR_KEY_IDENTIFIER)==0) return rampart_context_is_key_identifier_supported(token,rampart_context,env); - else if(axis2_strcmp(identifier,RAMPART_STR_ISSUER_SERIAL)==0) + else if(axutil_strcmp(identifier,RAMPART_STR_ISSUER_SERIAL)==0) return rampart_context_is_issuer_serial_supported(token,rampart_context,env); - else if(axis2_strcmp(identifier,RAMPART_STR_EMBEDDED)==0) + else if(axutil_strcmp(identifier,RAMPART_STR_EMBEDDED)==0) return rampart_context_is_embedded_token_supported(token,rampart_context,env); else Modified: webservices/rampart/trunk/c/src/util/rampart_crypto_util.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_crypto_util.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_crypto_util.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_crypto_util.c Tue Apr 3 01:45:32 2007 @@ -50,27 +50,27 @@ if ((!nonce) && (!created)) {/*If both nonce and created are omitted*/ - input = AXIS2_MALLOC(env->allocator, axis2_strlen(password) + 1); + input = AXIS2_MALLOC(env->allocator, axutil_strlen(password) + 1); sprintf(input, "%s", password); } else if (!nonce) {/*If nonce is omitted*/ - input = AXIS2_MALLOC(env->allocator, axis2_strlen(created) + axis2_strlen(password) + 1); + input = AXIS2_MALLOC(env->allocator, axutil_strlen(created) + axutil_strlen(password) + 1); sprintf(input, "%s%s", created, password); } else if (!created) {/*If created is omitted*/ - input = AXIS2_MALLOC(env->allocator, decoded_nonce_length + axis2_strlen(password) + 1); + input = AXIS2_MALLOC(env->allocator, decoded_nonce_length + axutil_strlen(password) + 1); sprintf(input, "%s%s", decoded_nonce, password); } else {/*If all nonce, created and password are present*/ input = AXIS2_MALLOC(env->allocator, - decoded_nonce_length + axis2_strlen(created) + axis2_strlen(password) + 1); + decoded_nonce_length + axutil_strlen(created) + axutil_strlen(password) + 1); sprintf(input, "%s%s%s", decoded_nonce, created, password); } - digest = openssl_sha1(env, input, axis2_strlen(input)); + digest = openssl_sha1(env, input, axutil_strlen(input)); AXIS2_FREE(env->allocator, input); AXIS2_FREE(env->allocator, decoded_nonce); return digest; Modified: webservices/rampart/trunk/c/src/util/rampart_encryption.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_encryption.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_encryption.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_encryption.c Tue Apr 3 01:45:32 2007 @@ -116,7 +116,7 @@ /*Get the symmetric encryption algorithm*/ enc_sym_algo = rampart_context_get_enc_sym_algo(rampart_context,env); /*If not specified set the default*/ - if(!enc_sym_algo || (0 == axis2_strcmp(enc_sym_algo, ""))){ + if(!enc_sym_algo || (0 == axutil_strcmp(enc_sym_algo, ""))){ AXIS2_LOG_INFO(env->log, "[rampart][rampart_encryption] No symmetric algorithm is specified for encryption. Using the default"); enc_sym_algo = OXS_DEFAULT_SYM_ALGO; } Modified: webservices/rampart/trunk/c/src/util/rampart_engine.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_engine.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_engine.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_engine.c Tue Apr 3 01:45:32 2007 @@ -250,7 +250,7 @@ axis2_char_t *file_name = NULL; rampart_context_t *rampart_context = NULL; - if(axis2_strcmp(key,IN_MESSAGE_SECURITY)==0) + if(axutil_strcmp(key,IN_MESSAGE_SECURITY)==0) { file_name =(axis2_char_t *)rampart_get_rampart_configuration(env,msg_ctx,RAMPART_INFLOW_SECURITY_POLICY); if(file_name) @@ -267,7 +267,7 @@ return NULL; } } - else if(axis2_strcmp(key,OUT_MESSAGE_SECURITY)==0) + else if(axutil_strcmp(key,OUT_MESSAGE_SECURITY)==0) { file_name =(axis2_char_t *)rampart_get_rampart_configuration(env,msg_ctx,RAMPART_OUTFLOW_SECURITY_POLICY); if(file_name) Modified: webservices/rampart/trunk/c/src/util/rampart_handler_util.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_handler_util.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_handler_util.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_handler_util.c Tue Apr 3 01:45:32 2007 @@ -116,7 +116,7 @@ sec_headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env, RAMPART_WSSE_XMLNS); if (sec_headers) { - sec_ns_str = axis2_strdup(env, RAMPART_WSSE_XMLNS); + sec_ns_str = axutil_strdup(env, RAMPART_WSSE_XMLNS); header_block_ht = axiom_soap_header_get_all_header_blocks(soap_header, env); if (!header_block_ht) @@ -137,7 +137,7 @@ header_block_ele = (axiom_element_t*)axiom_node_get_data_element(header_block_node, env); ele_localname = axiom_element_get_localname(header_block_ele, env); - if (axis2_strcmp(ele_localname, RAMPART_SECURITY) == 0) + if (axutil_strcmp(ele_localname, RAMPART_SECURITY) == 0) { /*Set mustUnderstand = 0*/ axiom_soap_header_block_set_must_understand_with_bool(header_block, env, AXIS2_FALSE); @@ -256,7 +256,7 @@ { qname = (axutil_qname_t *) axutil_array_list_get(engaged_modules,env,i); local_name = axutil_qname_get_localpart(qname,env); - if(axis2_strcmp(local_name,RAMPART_RAMPART)==0) + if(axutil_strcmp(local_name,RAMPART_RAMPART)==0) return AXIS2_TRUE; } } @@ -279,7 +279,7 @@ { qname = (axutil_qname_t *) axutil_array_list_get(engaged_modules,env,i); local_name = axutil_qname_get_localpart(qname,env); - if(axis2_strcmp(local_name,RAMPART_RAMPART)==0) + if(axutil_strcmp(local_name,RAMPART_RAMPART)==0) { axis2_conf_set_enable_security(conf,env,AXIS2_TRUE); return AXIS2_TRUE; Modified: webservices/rampart/trunk/c/src/util/rampart_rd_record.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_rd_record.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_rd_record.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_rd_record.c Tue Apr 3 01:45:32 2007 @@ -54,7 +54,7 @@ AXIS2_FREE(env->allocator, rd_record->id ); rd_record->id = NULL; } - rd_record->id = axis2_strdup(env, id); + rd_record->id = axutil_strdup(env, id); return AXIS2_SUCCESS; } @@ -70,7 +70,7 @@ AXIS2_FREE(env->allocator, rd_record->timestamp ); rd_record->timestamp = NULL; } - rd_record->timestamp = axis2_strdup(env, timestamp); + rd_record->timestamp = axutil_strdup(env, timestamp); return AXIS2_SUCCESS; } Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c Tue Apr 3 01:45:32 2007 @@ -60,25 +60,25 @@ if(!local_name) return AXIS2_FALSE; - if(axis2_strcmp(local_name,RAMPART_SECURITY_TIMESTAMP)==0) + if(axutil_strcmp(local_name,RAMPART_SECURITY_TIMESTAMP)==0) qname = axutil_qname_create(env,local_name,RAMPART_WSU_XMLNS,RAMPART_WSU); - else if(axis2_strcmp(local_name,RAMPART_SECURITY_USERNAMETOKEN)==0) + else if(axutil_strcmp(local_name,RAMPART_SECURITY_USERNAMETOKEN)==0) qname = axutil_qname_create(env,local_name,RAMPART_WSSE_XMLNS,RAMPART_WSSE); - else if(axis2_strcmp(local_name,OXS_NODE_ENCRYPTED_KEY)==0) + else if(axutil_strcmp(local_name,OXS_NODE_ENCRYPTED_KEY)==0) qname = axutil_qname_create(env,local_name,OXS_ENC_NS,OXS_XENC); - else if(axis2_strcmp(local_name,OXS_NODE_ENCRYPTED_DATA)==0) + else if(axutil_strcmp(local_name,OXS_NODE_ENCRYPTED_DATA)==0) qname = axutil_qname_create(env,local_name,OXS_ENC_NS,OXS_XENC); - else if(axis2_strcmp(local_name,OXS_NODE_SIGNATURE)==0) + else if(axutil_strcmp(local_name,OXS_NODE_SIGNATURE)==0) qname = axutil_qname_create(env,local_name,OXS_DSIG_NS,OXS_DS); - else if(axis2_strcmp(local_name,OXS_NODE_BINARY_SECURITY_TOKEN)==0) + else if(axutil_strcmp(local_name,OXS_NODE_BINARY_SECURITY_TOKEN)==0) return AXIS2_FALSE; - else if(axis2_strcmp(local_name,OXS_NODE_REFERENCE_LIST)==0) + else if(axutil_strcmp(local_name,OXS_NODE_REFERENCE_LIST)==0) return AXIS2_FALSE; else return AXIS2_FALSE; @@ -273,7 +273,7 @@ if(!enc_asym_algo_in_pol) return AXIS2_FAILURE; - if(axis2_strcmp(enc_asym_algo_in_pol,enc_asym_algo)!=0) + if(axutil_strcmp(enc_asym_algo_in_pol,enc_asym_algo)!=0) { AXIS2_LOG_INFO(env->log, "The key is encrypted with the wrong algorithm"); return AXIS2_FAILURE; @@ -409,7 +409,7 @@ if(!sym_algo) return AXIS2_FAILURE; - if(axis2_strcmp(sym_algo, enc_sym_algo_in_pol)!=0) + if(axutil_strcmp(sym_algo, enc_sym_algo_in_pol)!=0) { AXIS2_LOG_INFO(env->log, "[rampart][shp] Sym algorithm is mismathced with policy."); return AXIS2_FAILURE; @@ -500,14 +500,14 @@ { axis2_char_t *localname = NULL; localname = axiom_util_get_localname(cur_node, env); - if(axis2_strcmp(localname, OXS_NODE_SIGNATURE_METHOD)==0) + if(axutil_strcmp(localname, OXS_NODE_SIGNATURE_METHOD)==0) { /*Verify the signature method with policy*/ axis2_char_t *sig_mtd = NULL; sig_mtd = oxs_token_get_signature_method(env, cur_node); if(sig_mtd) { - if(axis2_strcmp(sig_mtd_pol,sig_mtd)!=0) + if(axutil_strcmp(sig_mtd_pol,sig_mtd)!=0) { AXIS2_LOG_INFO(env->log,"[rampart][shp] Signature method in the message mismatch with policy."); return AXIS2_FAILURE; @@ -515,7 +515,7 @@ } else return AXIS2_FAILURE; } - else if(axis2_strcmp(localname, OXS_NODE_REFERENCE)==0) + else if(axutil_strcmp(localname, OXS_NODE_REFERENCE)==0) { /*Verify each digest method with policy*/ axiom_node_t *digest_mtd_node = NULL; @@ -529,7 +529,7 @@ digest_mtd = oxs_token_get_digest_method(env, digest_mtd_node); if(digest_mtd) { - if(axis2_strcmp(digest_mtd_pol,digest_mtd)!=0) + if(axutil_strcmp(digest_mtd_pol,digest_mtd)!=0) { AXIS2_LOG_INFO(env->log,"[rampart][shp]Digest method is mismatch with policy."); return AXIS2_FAILURE; @@ -597,7 +597,7 @@ { if(is_include_token) { - if(axis2_strcmp(str_child_name,OXS_NODE_REFERENCE)!=0) + if(axutil_strcmp(str_child_name,OXS_NODE_REFERENCE)!=0) { AXIS2_LOG_INFO(env->log,"[Rampart][shp]Token is not included in the message."); return AXIS2_FAILURE; @@ -607,7 +607,7 @@ } else { - if(0 == axis2_strcmp(str_child_name,OXS_NODE_EMBEDDED)) + if(0 == axutil_strcmp(str_child_name,OXS_NODE_EMBEDDED)) { if(!rampart_context_is_key_identifier_type_supported(rampart_context,token,RAMPART_STR_EMBEDDED,env)) { @@ -617,7 +617,7 @@ cert = oxs_x509_cert_create(env); status = rampart_token_process_embedded(env,str_child_node,cert); } - else if(0 == axis2_strcmp(str_child_name,OXS_NODE_KEY_IDENTIFIER)) + else if(0 == axutil_strcmp(str_child_name,OXS_NODE_KEY_IDENTIFIER)) { if(!rampart_context_is_key_identifier_type_supported(rampart_context,token,RAMPART_STR_KEY_IDENTIFIER,env)) { @@ -627,7 +627,7 @@ cert = get_receiver_x509_cert(env,rampart_context); status = AXIS2_SUCCESS; } - else if(0 == axis2_strcmp(str_child_name,OXS_NODE_X509_DATA)) + else if(0 == axutil_strcmp(str_child_name,OXS_NODE_X509_DATA)) { if(!rampart_context_is_key_identifier_type_supported(rampart_context,token,RAMPART_STR_ISSUER_SERIAL,env)) { @@ -665,7 +665,7 @@ else { /*In such case policy support only Isssuer Serial scenario.*/ - if(axis2_strcmp(eki,RAMPART_STR_ISSUER_SERIAL)==0) + if(axutil_strcmp(eki,RAMPART_STR_ISSUER_SERIAL)==0) { key_info_child_node = axiom_node_get_first_element(key_info_node,env); if(key_info_child_node) @@ -674,7 +674,7 @@ key_info_child_name = axiom_util_get_localname(key_info_child_node, env); if(key_info_child_name) { - if(0 == axis2_strcmp(key_info_child_name,OXS_NODE_X509_DATA)) + if(0 == axutil_strcmp(key_info_child_name,OXS_NODE_X509_DATA)) { status = rampart_token_process_x509_data(env,key_info_child_node,cert); if(status!=AXIS2_SUCCESS || !cert) Modified: webservices/rampart/trunk/c/src/util/rampart_signature.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_signature.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_signature.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_signature.c Tue Apr 3 01:45:32 2007 @@ -392,7 +392,7 @@ AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Security Token element creation failed in Direct reference."); return AXIS2_FAILURE; } - cert_id_ref = axis2_stracat(env, "#",cert_id); + cert_id_ref = axutil_stracat(env, "#",cert_id); reference_node = oxs_token_build_reference_element(env,str_node,cert_id_ref,OXS_VALUE_X509V3); if(!reference_node) { @@ -407,15 +407,15 @@ { return AXIS2_FAILURE; } - if(axis2_strcmp(eki,RAMPART_STR_EMBEDDED)==0) + if(axutil_strcmp(eki,RAMPART_STR_EMBEDDED)==0) { status = rampart_token_build_security_token_reference(env,key_info_node,cert,RTBP_EMBEDDED); } - else if(axis2_strcmp(eki,RAMPART_STR_ISSUER_SERIAL)==0) + else if(axutil_strcmp(eki,RAMPART_STR_ISSUER_SERIAL)==0) { status = rampart_token_build_security_token_reference(env,key_info_node,cert,RTBP_X509DATA_ISSUER_SERIAL); } - else if(axis2_strcmp(eki,RAMPART_STR_KEY_IDENTIFIER)==0) + else if(axutil_strcmp(eki,RAMPART_STR_KEY_IDENTIFIER)==0) { status = rampart_token_build_security_token_reference(env,key_info_node,cert,RTBP_KEY_IDENTIFIER); } Modified: webservices/rampart/trunk/c/src/util/rampart_token_processor.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_token_processor.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_token_processor.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_token_processor.c Tue Apr 3 01:45:32 2007 @@ -46,13 +46,13 @@ child_node = axiom_node_get_first_element(st_ref_node, env); child_name = axiom_util_get_localname(child_node, env); - if(0 == axis2_strcmp(child_name, OXS_NODE_REFERENCE)){ + if(0 == axutil_strcmp(child_name, OXS_NODE_REFERENCE)){ status = rampart_token_process_direct_ref(env, child_node, scope_node, cert); - }else if(0 == axis2_strcmp(child_name, OXS_NODE_EMBEDDED)){ + }else if(0 == axutil_strcmp(child_name, OXS_NODE_EMBEDDED)){ status = rampart_token_process_embedded(env, child_node, cert); - }else if(0 == axis2_strcmp(child_name, OXS_NODE_KEY_IDENTIFIER)){ + }else if(0 == axutil_strcmp(child_name, OXS_NODE_KEY_IDENTIFIER)){ status = rampart_token_process_key_identifier(env, child_node, cert); - }else if(0 == axis2_strcmp(child_name, OXS_NODE_X509_DATA)){ + }else if(0 == axutil_strcmp(child_name, OXS_NODE_X509_DATA)){ status = rampart_token_process_x509_data(env, child_node, cert); }else{ oxs_error(env, ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Unsupported child %s of wsse:SecurityTokenReference ", child_name); @@ -78,7 +78,7 @@ /*Select ref using node*/ ref = oxs_token_get_reference(env, ref_node); - ref_id = axutil_string_substring_starting_at(axis2_strdup(env, ref), 1); + ref_id = axutil_string_substring_starting_at(axutil_strdup(env, ref), 1); /*Find the token with the id=ref_id within the scope of scope_node*/ bst_node = oxs_axiom_get_node_by_id(env, scope_node,"wsu:Id",ref_id); Modified: webservices/rampart/trunk/c/src/util/rampart_util.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_util.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_util.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_util.c Tue Apr 3 01:45:32 2007 @@ -128,7 +128,7 @@ return RAMPART_AUTHN_PROVIDER_GENERAL_ERROR; } /*If password digest*/ - if(0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)){ + if(0 == axutil_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)){ auth_status = RAMPART_AUTHN_PROVIDER_CHECK_PASSWORD_DIGEST(authp, env, msg_ctx, username, nonce, created, password); }else{ auth_status = RAMPART_AUTHN_PROVIDER_CHECK_PASSWORD(authp, env, msg_ctx, username, password); Modified: webservices/rampart/trunk/c/src/util/timestamp_token.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/timestamp_token.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/timestamp_token.c (original) +++ webservices/rampart/trunk/c/src/util/timestamp_token.c Tue Apr 3 01:45:32 2007 @@ -127,7 +127,7 @@ /*First child MUST be the Created element*/ created_node = axiom_node_get_first_element(ts_node, env); created_ele = (axiom_element_t*)axiom_node_get_data_element(created_node, env); - if (axis2_strcmp(RAMPART_SECURITY_TIMESTAMP_CREATED , + if (axutil_strcmp(RAMPART_SECURITY_TIMESTAMP_CREATED , axiom_element_get_localname(created_ele, env)) != 0) { AXIS2_LOG_INFO(env->log, "[rampart][ts]Timestamp not valid: Cannot find created in timestamp element. The first element MUST be CREATED"); @@ -154,7 +154,7 @@ return AXIS2_SUCCESS; } expires_ele = (axiom_element_t*)axiom_node_get_data_element(expires_node, env); - if (axis2_strcmp(RAMPART_SECURITY_TIMESTAMP_EXPIRES , + if (axutil_strcmp(RAMPART_SECURITY_TIMESTAMP_EXPIRES , axiom_element_get_localname(expires_ele, env)) != 0) { AXIS2_LOG_INFO(env->log, "[rampart][ts] Timestamp not valid: The second element of timestamp token (if any) MUST be EXPIRES"); Modified: webservices/rampart/trunk/c/src/util/username_token.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/username_token.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/src/util/username_token.c (original) +++ webservices/rampart/trunk/c/src/util/username_token.c Tue Apr 3 01:45:32 2007 @@ -140,7 +140,7 @@ password_type = rampart_context_get_password_type(rampart_context,env); if(!password_type) password_type = RAMPART_PASSWORD_TEXT; - if (0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST)) + if (0 == axutil_strcmp(password_type, RAMPART_PASSWORD_DIGEST)) { axis2_char_t *nonce_val = NULL; axis2_char_t *created_val = NULL; @@ -301,12 +301,12 @@ element = axiom_node_get_data_element(node, env); localname = axiom_element_get_localname(element, env); - if (0 == axis2_strcmp(localname, RAMPART_SECURITY_USERNAMETOKEN_USERNAME)) + if (0 == axutil_strcmp(localname, RAMPART_SECURITY_USERNAMETOKEN_USERNAME)) { username = axiom_element_get_text(element, env, node); } - else if (0 == axis2_strcmp(localname , RAMPART_SECURITY_USERNAMETOKEN_PASSWORD)) + else if (0 == axutil_strcmp(localname , RAMPART_SECURITY_USERNAMETOKEN_PASSWORD)) { password_type = axiom_element_get_attribute_value_by_name(element, env, @@ -323,17 +323,17 @@ if(!password_type_pol) password_type_pol = RP_PLAINTEXT; - if(axis2_strcmp(password_type_pol,RP_DIGEST)==0) + if(axutil_strcmp(password_type_pol,RP_DIGEST)==0) { - if(0 != axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) + if(0 != axutil_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password Type is Wrong"); return AXIS2_FAILURE; } } - else if(axis2_strcmp(password_type_pol,RP_PLAINTEXT)==0) + else if(axutil_strcmp(password_type_pol,RP_PLAINTEXT)==0) { - if(0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) + if(0 == axutil_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password Type is Wrong"); return AXIS2_FAILURE; @@ -342,13 +342,13 @@ password = axiom_element_get_text(element, env, node); } - else if (0 == axis2_strcmp(localname, RAMPART_SECURITY_USERNAMETOKEN_NONCE)) + else if (0 == axutil_strcmp(localname, RAMPART_SECURITY_USERNAMETOKEN_NONCE)) { nonce = axiom_element_get_text(element, env, node); rampart_set_security_processed_result(env, msg_ctx, RAMPART_SPR_UT_NONCE, nonce); } - else if (0 == axis2_strcmp(localname , RAMPART_SECURITY_USERNAMETOKEN_CREATED)) + else if (0 == axutil_strcmp(localname , RAMPART_SECURITY_USERNAMETOKEN_CREATED)) { created = axiom_element_get_text(element, env, node); rampart_set_security_processed_result(env, msg_ctx, RAMPART_SPR_UT_CREATED, created); @@ -391,7 +391,7 @@ *use function pointers. */ /*authn_module_name = "/home/kau/axis2/c/deploy/bin/samples/rampart/authn_provider/libauthn.so";*/ - if (0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) + if (0 == axutil_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) { authenticate_with_digest = rampart_context_get_auth_digest_function(rampart_context,env); if(authenticate_with_digest) @@ -482,7 +482,7 @@ } /*Alright NOW we have the password. Is digest needed?*/ - if (0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) + if (0 == axutil_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Generating digest to compare from the password"); password_to_compare = rampart_crypto_sha1(env, nonce, created, password_from_svr); @@ -493,7 +493,7 @@ } /*The BIG moment. Compare passwords*/ - if (0 == axis2_strcmp(password_to_compare , password)) + if (0 == axutil_strcmp(password_to_compare , password)) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password comparison SUCCESS"); rampart_set_security_processed_result(env, msg_ctx,RAMPART_SPR_UT_CHECKED, RAMPART_YES); Modified: webservices/rampart/trunk/c/test/omxmlsec/test.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/omxmlsec/test.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/test/omxmlsec/test.c (original) +++ webservices/rampart/trunk/c/test/omxmlsec/test.c Tue Apr 3 01:45:32 2007 @@ -135,7 +135,7 @@ signed_result = axiom_node_to_string(tmpl, env) ; outf = fopen(signed_filename, "wb"); - fwrite(signed_result, 1, axis2_strlen(signed_result), outf); + fwrite(signed_result, 1, axutil_strlen(signed_result), outf); return AXIS2_SUCCESS; @@ -237,7 +237,7 @@ printf("Cannot load certificate"); } - if(0 == axis2_strcmp(operation, "S")){ + if(0 == axutil_strcmp(operation, "S")){ sign(env, filename, prvkey, cert); }else{ verify(env, filename, prvkey, cert); Modified: webservices/rampart/trunk/c/test/openssl/block_cipher_test.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/openssl/block_cipher_test.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/test/openssl/block_cipher_test.c (original) +++ webservices/rampart/trunk/c/test/openssl/block_cipher_test.c Tue Apr 3 01:45:32 2007 @@ -119,10 +119,10 @@ bc1_ctx = openssl_evp_block_cipher_ctx_create(env); if (!bc1_ctx) return(-1); /*Set the key*/ - bc1_ctx->key = key; /*axis2_strdup(key, env);*/ + bc1_ctx->key = key; /*axutil_strdup(key, env);*/ bc1_ctx->key_initialized = 1; /*Set the IV*/ - bc1_ctx->iv = axis2_strdup(env, iv); + bc1_ctx->iv = axutil_strdup(env, iv); ret = openssl_evp_block_cipher_ctx_init(env, bc1_ctx, OPENSSL_ENCRYPT, cipher_name); if (ret < 0) @@ -150,10 +150,10 @@ bc2_ctx = openssl_evp_block_cipher_ctx_create(env); if (!bc2_ctx) return(-1); /*Set the key*/ - bc2_ctx->key = key; /*axis2_strdup(key, env);*/ + bc2_ctx->key = key; /*axutil_strdup(key, env);*/ bc2_ctx->key_initialized = 1; /*Set the IV*/ - bc2_ctx->iv = axis2_strdup(env, iv); + bc2_ctx->iv = axutil_strdup(env, iv); ret = openssl_evp_block_cipher_ctx_init(env, bc2_ctx, OPENSSL_DECRYPT, cipher_name); if (ret < 0) Modified: webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c?view=diff&rev=525088&r1=525087&r2=525088 ============================================================================== --- webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c (original) +++ webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c Tue Apr 3 01:45:32 2007 @@ -41,7 +41,7 @@ env = test_init(); plaintxt = (unsigned char *)"We will we will rock ya..."; - openssl_md5(env, plaintxt , axis2_strlen(plaintxt)); + openssl_md5(env, plaintxt , axutil_strlen(plaintxt)); printf("Finish md5() \n"); return 0; }
