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 di...@apache.org on 2007/03/17 09:13:00 UTC
svn commit: r519261 [2/6] - in /webservices/axis2/trunk/c:
guththila/samples/ guththila/src/ rampart/samples/authn_provider/
rampart/samples/callback/ rampart/samples/callback/htpasswd_callback/
rampart/samples/client/sec_echo/ rampart/samples/omxmlsec...
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_ctx.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_ctx.c Sat Mar 17 01:12:54 2007
@@ -164,7 +164,7 @@
AXIS2_FREE(env->allocator, sign_ctx->sign_mtd_algo);
sign_ctx->sign_mtd_algo = NULL;
}
- sign_ctx->sign_mtd_algo = AXIS2_STRDUP(sign_mtd_algo, env);
+ sign_ctx->sign_mtd_algo = axis2_strdup(sign_mtd_algo, env);
return AXIS2_SUCCESS;
}
@@ -181,7 +181,7 @@
AXIS2_FREE(env->allocator, sign_ctx->c14n_mtd);
sign_ctx->c14n_mtd = NULL;
}
- sign_ctx->c14n_mtd = AXIS2_STRDUP(c14n_mtd, env);
+ sign_ctx->c14n_mtd = axis2_strdup(c14n_mtd, env);
return AXIS2_SUCCESS;
}
@@ -197,7 +197,7 @@
AXIS2_FREE(env->allocator, sign_ctx->sig_val);
sign_ctx->sig_val = NULL;
}
- sign_ctx->sig_val = AXIS2_STRDUP(sig_val, env);
+ sign_ctx->sig_val = axis2_strdup(sig_val, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_part.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_part.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_part.c Sat Mar 17 01:12:54 2007
@@ -83,7 +83,7 @@
AXIS2_FREE(env->allocator, sign_part->id);
sign_part->id = NULL;
}
- sign_part->id = AXIS2_STRDUP(id, env);
+ sign_part->id = axis2_strdup(id, env);
return AXIS2_SUCCESS;
}
@@ -99,7 +99,7 @@
AXIS2_FREE(env->allocator, sign_part->digest_mtd);
sign_part->digest_mtd = NULL;
}
- sign_part->digest_mtd = AXIS2_STRDUP(digest_mtd, env);
+ sign_part->digest_mtd = axis2_strdup(digest_mtd, env);
return AXIS2_SUCCESS;
}
@@ -115,7 +115,7 @@
AXIS2_FREE(env->allocator, sign_part->digest_val);
sign_part->digest_val = NULL;
}
- sign_part->digest_val = AXIS2_STRDUP(digest_val, env);
+ sign_part->digest_val = axis2_strdup(digest_val, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/signature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/signature.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/signature.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/signature.c Sat Mar 17 01:12:54 2007
@@ -57,7 +57,7 @@
encodedlen = axis2_base64_encode_len(signedlen);
encoded_str = AXIS2_MALLOC(env->allocator, encodedlen);
ret = axis2_base64_encode(encoded_str, (const char *)OXS_BUFFER_GET_DATA(signed_result_buf, env), signedlen);
- status = OXS_BUFFER_POPULATE(output, env, (unsigned char*)AXIS2_STRDUP(encoded_str, env), encodedlen);
+ status = OXS_BUFFER_POPULATE(output, env, (unsigned char*)axis2_strdup(encoded_str, env), encodedlen);
/*Free signed_result_buf*/
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c Sat Mar 17 01:12:54 2007
@@ -80,7 +80,7 @@
}
c14n_mtd = axiom_element_get_attribute_value_by_name(c14n_mtd_ele, env, OXS_ATTR_ALGORITHM);
- if((!c14n_mtd) ||(0 == AXIS2_STRCMP("", c14n_mtd))){
+ if((!c14n_mtd) ||(0 == axis2_strcmp("", c14n_mtd))){
return NULL;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c Sat Mar 17 01:12:54 2007
@@ -80,7 +80,7 @@
}
digest_mtd = axiom_element_get_attribute_value_by_name(digest_mtd_ele, env, OXS_ATTR_ALGORITHM);
- if((!digest_mtd) ||(0 == AXIS2_STRCMP("", digest_mtd))){
+ if((!digest_mtd) ||(0 == axis2_strcmp("", digest_mtd))){
return NULL;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c Sat Mar 17 01:12:54 2007
@@ -80,7 +80,7 @@
}
enc_mtd = axiom_element_get_attribute_value_by_name(enc_mtd_ele, env, OXS_ATTR_ALGORITHM);
- if((!enc_mtd) ||(0 == AXIS2_STRCMP("", enc_mtd))){
+ if((!enc_mtd) ||(0 == axis2_strcmp("", enc_mtd))){
return NULL;
}
return enc_mtd;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c Sat Mar 17 01:12:54 2007
@@ -65,7 +65,7 @@
axis2_char_t *id = NULL;
/*We need to prepend # to the id in the list to create the reference*/
- id = AXIS2_STRACAT("#",(axis2_char_t*)axis2_array_list_get(id_list, env, i), env);
+ id = axis2_stracat("#",(axis2_char_t*)axis2_array_list_get(id_list, env, i), env);
data_ref_node = oxs_token_build_data_reference_element(env, ref_list_node, id);
if(!data_ref_node) {return AXIS2_FAILURE;}
@@ -92,7 +92,7 @@
/*Get children*/
qname = axis2_qname_create(env, OXS_NODE_DATA_REFERENCE, NULL, NULL);
iter = axiom_element_get_children_with_qname(ref_list_ele, env, qname, ref_list_node);
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
qname = NULL;
if(!iter){
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c Sat Mar 17 01:12:54 2007
@@ -80,7 +80,7 @@
}
enc_mtd = axiom_element_get_attribute_value_by_name(enc_mtd_ele, env, OXS_ATTR_ALGORITHM);
- if((!enc_mtd) ||(0 == AXIS2_STRCMP("", enc_mtd))){
+ if((!enc_mtd) ||(0 == axis2_strcmp("", enc_mtd))){
return NULL;
}
return enc_mtd;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c Sat Mar 17 01:12:54 2007
@@ -80,7 +80,7 @@
}
transform = axiom_element_get_attribute_value_by_name(transform_ele, env, OXS_ATTR_ALGORITHM);
- if((!transform) ||(0 == AXIS2_STRCMP("", transform))){
+ if((!transform) ||(0 == axis2_strcmp("", transform))){
return NULL;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/transform.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/transform.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/transform.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/transform.c Sat Mar 17 01:12:54 2007
@@ -73,7 +73,7 @@
AXIS2_FREE(env->allocator, transform->id);
transform->id = NULL;
}
- transform->id = AXIS2_STRDUP(id, env);
+ transform->id = axis2_strdup(id, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/utility.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/utility.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/utility.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/utility.c Sat Mar 17 01:12:54 2007
@@ -32,9 +32,9 @@
char _id[50];
axis2_char_t *random ;
- random = AXIS2_STRNDUP(axis2_uuid_gen(env),18, env);
+ random = axis2_strndup(axis2_uuid_gen(env),18, env);
sprintf(_id, "%s-%s",prefix,random);
- id = (axis2_char_t*)AXIS2_STRDUP(_id, env);
+ id = (axis2_char_t*)axis2_strdup(_id, env);
return id;
}
@@ -47,7 +47,7 @@
if(!file_name){
return OXS_ASYM_CTX_FORMAT_UNKNOWN;
}
- extension = AXIS2_RINDEX(file_name, '.');
+ extension = axis2_rindex(file_name, '.');
if(!extension){
/*No extension*/
/*Its safe to assume that PEM can be without extension*/
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/x509_cert.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/x509_cert.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/x509_cert.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/x509_cert.c Sat Mar 17 01:12:54 2007
@@ -195,7 +195,7 @@
AXIS2_FREE(env->allocator, x509_cert->subject);
x509_cert->subject = NULL;
}
- x509_cert->subject = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ x509_cert->subject = (axis2_char_t *)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -208,7 +208,7 @@
AXIS2_FREE(env->allocator, x509_cert->issuer);
x509_cert->issuer = NULL;
}
- x509_cert->issuer = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ x509_cert->issuer = (axis2_char_t *)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -221,7 +221,7 @@
AXIS2_FREE(env->allocator, x509_cert->key_identifier);
x509_cert->key_identifier = NULL;
}
- x509_cert->key_identifier = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ x509_cert->key_identifier = (axis2_char_t *)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
@@ -235,7 +235,7 @@
AXIS2_FREE(env->allocator, x509_cert->fingerprint);
x509_cert->fingerprint = NULL;
}
- x509_cert->fingerprint = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ x509_cert->fingerprint = (axis2_char_t *)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -248,7 +248,7 @@
AXIS2_FREE(env->allocator, x509_cert->date);
x509_cert->date = NULL;
}
- x509_cert->date = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ x509_cert->date = (axis2_char_t *)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -261,7 +261,7 @@
AXIS2_FREE(env->allocator, x509_cert->hash);
x509_cert->hash = NULL;
}
- x509_cert->hash = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ x509_cert->hash = (axis2_char_t *)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -274,7 +274,7 @@
AXIS2_FREE(env->allocator, x509_cert->data);
x509_cert->data = NULL;
}
- x509_cert->data = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ x509_cert->data = (axis2_char_t *)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c Sat Mar 17 01:12:54 2007
@@ -207,13 +207,13 @@
*/
cur_node = axiom_node_get_first_element(st_ref_node, env);
node_name = axiom_util_get_localname(cur_node, env);
- if(0 == AXIS2_STRCMP(OXS_NODE_REFERENCE, node_name)){
+ if(0 == axis2_strcmp(OXS_NODE_REFERENCE, node_name)){
- }else if(0 == AXIS2_STRCMP(OXS_NODE_KEY_IDENTIFIER, node_name)){
+ }else if(0 == axis2_strcmp(OXS_NODE_KEY_IDENTIFIER, node_name)){
- }else if(0 == AXIS2_STRCMP(OXS_NODE_X509_DATA, node_name)){
+ }else if(0 == axis2_strcmp(OXS_NODE_X509_DATA, node_name)){
- }else if(0 == AXIS2_STRCMP(OXS_NODE_EMBEDDED, node_name)){
+ }else if(0 == axis2_strcmp(OXS_NODE_EMBEDDED, node_name)){
}else{
/*Unsupported*/
@@ -236,7 +236,7 @@
/*Serialize node*/
serialized_data = AXIOM_NODE_TO_STRING(node, env);
serialized_buf = oxs_buffer_create(env);
- ret = OXS_BUFFER_POPULATE(serialized_buf, env, (unsigned char *)serialized_data, AXIS2_STRLEN(serialized_data));
+ ret = OXS_BUFFER_POPULATE(serialized_buf, env, (unsigned char *)serialized_data, axis2_strlen(serialized_data));
/*We call encrypt_data*/
ret = oxs_xml_enc_encrypt_data(env, enc_ctx, serialized_buf, enc_type_node);
@@ -316,7 +316,7 @@
"Data encryption failed");
return AXIS2_FAILURE;
}
- decrypted_data = AXIS2_STRMEMDUP(OXS_BUFFER_GET_DATA(result_buf, env), OXS_BUFFER_GET_SIZE(result_buf, env), env);
+ decrypted_data = axis2_strmemdup(OXS_BUFFER_GET_DATA(result_buf, env), OXS_BUFFER_GET_SIZE(result_buf, env), env);
/*De-serialize the decrypted content to build the node*/
deserialized_node = (axiom_node_t*)oxs_axiom_deserialize_node(env, decrypted_data);
if(!deserialized_node){
@@ -375,7 +375,7 @@
/*Create input buffer with cipher data obtained*/
input_buf = oxs_buffer_create(env);
- OXS_BUFFER_POPULATE(input_buf, env, (unsigned char*)cipher_val, AXIS2_STRLEN(cipher_val) );
+ OXS_BUFFER_POPULATE(input_buf, env, (unsigned char*)cipher_val, axis2_strlen(cipher_val) );
/*Decrypt*/
OXS_CTX_SET_OPERATION(enc_ctx, env, OXS_CTX_OPERATION_DECRYPT);
@@ -439,17 +439,17 @@
stref_node = oxs_token_build_security_token_reference_element(env, key_info_node);
/*Get the ST REF pattern. If not set the default*/
st_ref_pattern = oxs_asym_ctx_get_st_ref_pattern(asym_ctx, env);
- if((!st_ref_pattern) || (0 == AXIS2_STRCMP(st_ref_pattern, ""))){
+ if((!st_ref_pattern) || (0 == axis2_strcmp(st_ref_pattern, ""))){
st_ref_pattern = OXS_STR_DEFAULT;
}
- if(0 == AXIS2_STRCMP(st_ref_pattern, OXS_STR_ISSUER_SERIAL)){
+ if(0 == axis2_strcmp(st_ref_pattern, OXS_STR_ISSUER_SERIAL)){
status = oxs_xml_enc_populate_stref_with_issuer_serial(env, asym_ctx, stref_node);
- }else if(0 == AXIS2_STRCMP(st_ref_pattern, OXS_STR_EMBEDDED)){
+ }else if(0 == axis2_strcmp(st_ref_pattern, OXS_STR_EMBEDDED)){
status = oxs_xml_enc_populate_stref_with_embedded(env, asym_ctx, stref_node);
- }else if(0 == AXIS2_STRCMP(st_ref_pattern, OXS_STR_DIRECT_REFERENCE)){
+ }else if(0 == axis2_strcmp(st_ref_pattern, OXS_STR_DIRECT_REFERENCE)){
status = oxs_xml_enc_populate_stref_with_bst(env, asym_ctx, stref_node, parent);
- }else if(0 == AXIS2_STRCMP(st_ref_pattern, OXS_STR_KEY_IDENTIFIER)){
+ }else if(0 == axis2_strcmp(st_ref_pattern, OXS_STR_KEY_IDENTIFIER)){
status = oxs_xml_enc_populate_stref_with_key_identifier(env, asym_ctx, stref_node);
}
@@ -507,7 +507,7 @@
/*Get the pkey used to decrypt the session key. If found set it to the asym_ctx*/
/*Create the input buffer*/
input_buf = oxs_buffer_create(env);
- OXS_BUFFER_POPULATE(input_buf, env, (unsigned char*)cipher_val, AXIS2_STRLEN(cipher_val));
+ OXS_BUFFER_POPULATE(input_buf, env, (unsigned char*)cipher_val, axis2_strlen(cipher_val));
/*Create a results buffer*/
result_buf = oxs_buffer_create(env);
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c Sat Mar 17 01:12:54 2007
@@ -143,7 +143,7 @@
/*Get the reference ID from the node and hence to the ds:Reference node*/
id = oxs_axiom_get_attribute_value_of_node_by_name(env, node, "wsu:Id");
- ref_id = AXIS2_STRACAT("#", id, env);/* <ds:Reference URI="#id">*/
+ ref_id = axis2_stracat("#", id, env);/* <ds:Reference URI="#id">*/
reference_node = oxs_token_build_ds_reference_element(env, parent ,NULL, ref_id, NULL);
/*Get transforms if any*/
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c Sat Mar 17 01:12:54 2007
@@ -101,7 +101,7 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(AXIS2_STRCMP(local_name,RP_INITIATOR_TOKEN)==0)
+ if(axis2_strcmp(local_name,RP_INITIATOR_TOKEN)==0)
{
if(rp_match_secpolicy_qname(env,RP_INITIATOR_TOKEN,node,element))
{
@@ -115,7 +115,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_RECIPIENT_TOKEN)==0)
+ else if(axis2_strcmp(local_name,RP_RECIPIENT_TOKEN)==0)
{
if(rp_match_secpolicy_qname(env,RP_RECIPIENT_TOKEN,node,element))
{
@@ -140,10 +140,10 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FALSE);
- if(AXIS2_STRCMP(local_name,RP_INITIATOR_TOKEN)==0)
+ if(axis2_strcmp(local_name,RP_INITIATOR_TOKEN)==0)
return AXIS2_TRUE;
- else if(AXIS2_STRCMP(local_name,RP_RECIPIENT_TOKEN)==0)
+ else if(axis2_strcmp(local_name,RP_RECIPIENT_TOKEN)==0)
return AXIS2_TRUE;
else
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/binding_commons_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/binding_commons_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/binding_commons_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/binding_commons_builder.c Sat Mar 17 01:12:54 2007
@@ -34,7 +34,7 @@
AXIS2_PARAM_CHECK(env->error,local_name,AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error,commons,AXIS2_FAILURE);
- if(AXIS2_STRCMP(local_name,RP_ALGORITHM_SUITE)==0)
+ if(axis2_strcmp(local_name,RP_ALGORITHM_SUITE)==0)
{
if(rp_match_secpolicy_qname(env,RP_ALGORITHM_SUITE,node,element))
{
@@ -49,7 +49,7 @@
}
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_LAYOUT)==0)
+ else if(axis2_strcmp(local_name,RP_LAYOUT)==0)
{
if(rp_match_secpolicy_qname(env,RP_LAYOUT,node,element))
{
@@ -64,7 +64,7 @@
}
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_INCLUDE_TIMESTAMP)==0)
+ else if(axis2_strcmp(local_name,RP_INCLUDE_TIMESTAMP)==0)
{
if(rp_match_secpolicy_qname(env,RP_INCLUDE_TIMESTAMP,node,element))
{
@@ -73,7 +73,7 @@
}
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_SIGNED_SUPPORTING_TOKENS)==0)
+ else if(axis2_strcmp(local_name,RP_SIGNED_SUPPORTING_TOKENS)==0)
{
if(rp_match_secpolicy_qname(env,RP_SIGNED_SUPPORTING_TOKENS,node,element))
{
@@ -91,7 +91,7 @@
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_SIGNED_ENDORSING_SUPPORTING_TOKENS)==0)
+ else if(axis2_strcmp(local_name,RP_SIGNED_ENDORSING_SUPPORTING_TOKENS)==0)
{
if(rp_match_secpolicy_qname(env,RP_SIGNED_ENDORSING_SUPPORTING_TOKENS,node,element))
{
@@ -108,7 +108,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_ENDORSING_SUPPORTING_TOKENS)==0)
+ else if(axis2_strcmp(local_name,RP_ENDORSING_SUPPORTING_TOKENS)==0)
{
if(rp_match_secpolicy_qname(env,RP_ENDORSING_SUPPORTING_TOKENS,node,element))
{
@@ -125,7 +125,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_SUPPORTING_TOKENS)==0)
+ else if(axis2_strcmp(local_name,RP_SUPPORTING_TOKENS)==0)
{
if(rp_match_secpolicy_qname(env,RP_SUPPORTING_TOKENS,node,element))
{
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c Sat Mar 17 01:12:54 2007
@@ -114,7 +114,7 @@
inclusion_value = axiom_element_get_attribute_value(element,env,qname);
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return rp_https_token_set_inclusion(token,env,inclusion_value);
@@ -134,9 +134,9 @@
if(value)
{
- if(AXIS2_STRCMP(value,"true")==0)
+ 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)
+ else if(axis2_strcmp(value,"false")==0)
return rp_https_token_set_require_client_certificate(token,env,AXIS2_FALSE);
else
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c Sat Mar 17 01:12:54 2007
@@ -74,7 +74,7 @@
local_name = axiom_element_get_localname(root_ele,env);
if(local_name)
{
- if(AXIS2_STRCMP(local_name,RP_POLICY)==0)
+ if(axis2_strcmp(local_name,RP_POLICY)==0)
{
if(!rp_match_policy_qname(env,local_name,root,root_ele))
{
@@ -102,7 +102,7 @@
local_name = axiom_element_get_localname(exat_ele,env);
if(local_name)
{
- if(AXIS2_STRCMP(local_name,RP_EXACTLY_ONE)==0)
+ if(axis2_strcmp(local_name,RP_EXACTLY_ONE)==0)
{
if(!rp_match_policy_qname(env,local_name,exat_node,exat_ele))
{
@@ -133,7 +133,7 @@
local_name = axiom_element_get_localname(all_ele,env);
if(local_name)
{
- if(AXIS2_STRCMP(local_name,RP_ALL)==0)
+ if(axis2_strcmp(local_name,RP_ALL)==0)
{
if(!rp_match_policy_qname(env,local_name,all_node,all_ele))
{
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c Sat Mar 17 01:12:54 2007
@@ -39,12 +39,12 @@
if(!node_qname)
{
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return AXIS2_FALSE;
}
- if(AXIS2_QNAME_EQUALS(qname,env,node_qname))
+ if(axis2_qname_equals(qname,env,node_qname))
return AXIS2_TRUE;
return AXIS2_FALSE;
@@ -71,14 +71,14 @@
if(!node_qname)
{
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return AXIS2_FALSE;
}
- if(AXIS2_QNAME_EQUALS(qname,env,node_qname))
+ if(axis2_qname_equals(qname,env,node_qname))
{
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return AXIS2_TRUE;
}
@@ -108,12 +108,12 @@
if(!node_qname)
{
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return AXIS2_FALSE;
}
- if(AXIS2_QNAME_EQUALS(qname,env,node_qname))
+ if(axis2_qname_equals(qname,env,node_qname))
return AXIS2_TRUE;
return AXIS2_FALSE;
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c Sat Mar 17 01:12:54 2007
@@ -89,7 +89,7 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(AXIS2_STRCMP(local_name,RP_USER)==0)
+ if(axis2_strcmp(local_name,RP_USER)==0)
{
if(rp_match_rampart_config_qname(env,RP_USER,node,element))
{
@@ -101,7 +101,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_ENCRYPTION_USER)==0)
+ else if(axis2_strcmp(local_name,RP_ENCRYPTION_USER)==0)
{
if(rp_match_rampart_config_qname(env,RP_ENCRYPTION_USER,node,element))
{
@@ -112,7 +112,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_PASSWORD_CALLBACK_CLASS)==0)
+ else if(axis2_strcmp(local_name,RP_PASSWORD_CALLBACK_CLASS)==0)
{
if(rp_match_rampart_config_qname(env,RP_PASSWORD_CALLBACK_CLASS,node,element))
{
@@ -123,7 +123,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_AUTHN_MODULE_NAME)==0)
+ else if(axis2_strcmp(local_name,RP_AUTHN_MODULE_NAME)==0)
{
if(rp_match_rampart_config_qname(env,RP_AUTHN_MODULE_NAME,node,element))
{
@@ -134,7 +134,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_PASSWORD_TYPE)==0)
+ else if(axis2_strcmp(local_name,RP_PASSWORD_TYPE)==0)
{
if(rp_match_rampart_config_qname(env,RP_PASSWORD_TYPE,node,element))
{
@@ -146,7 +146,7 @@
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_CERTIFICATE)==0)
+ else if(axis2_strcmp(local_name,RP_CERTIFICATE)==0)
{
if(rp_match_rampart_config_qname(env,RP_CERTIFICATE,node,element))
{
@@ -158,7 +158,7 @@
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_RECEIVER_CERTIFICATE)==0)
+ else if(axis2_strcmp(local_name,RP_RECEIVER_CERTIFICATE)==0)
{
if(rp_match_rampart_config_qname(env,RP_RECEIVER_CERTIFICATE,node,element))
{
@@ -170,7 +170,7 @@
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_PRIVATE_KEY)==0)
+ else if(axis2_strcmp(local_name,RP_PRIVATE_KEY)==0)
{
if(rp_match_rampart_config_qname(env,RP_PRIVATE_KEY,node,element))
{
@@ -181,7 +181,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_TIME_TO_LIVE)==0)
+ else if(axis2_strcmp(local_name,RP_TIME_TO_LIVE)==0)
{
if(rp_match_rampart_config_qname(env,RP_TIME_TO_LIVE,node,element))
{
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c Sat Mar 17 01:12:54 2007
@@ -80,7 +80,7 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(AXIS2_STRCMP(local_name,RP_SYMMETRIC_BINDING)==0)
+ if(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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_WSS10)==0)
+ else if(axis2_strcmp(local_name,RP_WSS10)==0)
{
if(rp_match_secpolicy_qname(env,RP_WSS10,node,element))
{
@@ -329,7 +329,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_WSS11)==0)
+ else if(axis2_strcmp(local_name,RP_WSS11)==0)
{
if(rp_match_secpolicy_qname(env,RP_WSS11,node,element))
{
@@ -357,7 +357,7 @@
else
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_RAMPART_CONFIG)==0)
+ else if(axis2_strcmp(local_name,RP_RAMPART_CONFIG)==0)
{
if(rp_match_rampart_config_qname(env,RP_RAMPART_CONFIG,node,element))
{
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c Sat Mar 17 01:12:54 2007
@@ -104,7 +104,7 @@
inclusion_value = axiom_element_get_attribute_value(element,env,qname);
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return rp_security_context_token_set_inclusion(token,env,inclusion_value);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c Sat Mar 17 01:12:54 2007
@@ -114,7 +114,7 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(AXIS2_STRCMP(local_name,RP_ALGORITHM_SUITE)==0)
+ if(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_strcmp(local_name,RP_USERNAME_TOKEN)==0)
return AXIS2_TRUE;
- else if(AXIS2_STRCMP(local_name,RP_X509_TOKEN)==0)
+ else if(axis2_strcmp(local_name,RP_X509_TOKEN)==0)
return AXIS2_TRUE;
- else if(AXIS2_STRCMP(local_name,RP_SECURITY_CONTEXT_TOKEN)==0)
+ else if(axis2_strcmp(local_name,RP_SECURITY_CONTEXT_TOKEN)==0)
return AXIS2_TRUE;
else
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c Sat Mar 17 01:12:54 2007
@@ -30,7 +30,7 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(AXIS2_STRCMP(local_name,RP_ENCRYPT_BEFORE_SIGNING)==0)
+ if(axis2_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(axis2_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(axis2_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(axis2_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/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c Sat Mar 17 01:12:54 2007
@@ -102,7 +102,7 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(AXIS2_STRCMP(local_name,RP_PROTECTION_TOKEN)==0)
+ if(axis2_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(axis2_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(axis2_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(axis2_strcmp(local_name,RP_PROTECTION_TOKEN)==0)
return AXIS2_TRUE;
- else if(AXIS2_STRCMP(local_name,RP_ENCRYPTION_TOKEN)==0)
+ else if(axis2_strcmp(local_name,RP_ENCRYPTION_TOKEN)==0)
return AXIS2_TRUE;
- else if(AXIS2_STRCMP(local_name,RP_SIGNATURE_TOKEN)==0)
+ else if(axis2_strcmp(local_name,RP_SIGNATURE_TOKEN)==0)
return AXIS2_TRUE;
else
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c Sat Mar 17 01:12:54 2007
@@ -77,7 +77,7 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(AXIS2_STRCMP(value,RP_USERNAME_TOKEN)==0)
+ if(axis2_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(axis2_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(axis2_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(axis2_strcmp(value,RP_HTTPS_TOKEN)==0)
{
if(rp_match_secpolicy_qname(env,RP_HTTPS_TOKEN,node,element))
{
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c Sat Mar 17 01:12:54 2007
@@ -95,7 +95,7 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(AXIS2_STRCMP(local_name,RP_TRANSPORT_TOKEN)==0)
+ if(axis2_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(axis2_strcmp(local_name,RP_TRANSPORT_TOKEN)==0)
return AXIS2_TRUE;
else
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c Sat Mar 17 01:12:54 2007
@@ -107,7 +107,7 @@
inclusion_value = axiom_element_get_attribute_value(element,env,qname);
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return rp_username_token_set_inclusion(token,env,inclusion_value);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c Sat Mar 17 01:12:54 2007
@@ -105,7 +105,7 @@
inclusion_value = axiom_element_get_attribute_value(element,env,qname);
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return rp_x509_token_set_inclusion(token,env,inclusion_value);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/model/algorithmsuite.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/model/algorithmsuite.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/model/algorithmsuite.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/model/algorithmsuite.c Sat Mar 17 01:12:54 2007
@@ -118,7 +118,7 @@
algorithmsuite->algosuite_string = algosuite_string;
- if(AXIS2_STRCMP(algosuite_string,RP_ALGO_SUITE_BASIC256)==0)
+ if(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_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(axis2_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_SHA256_RSA15)==0)
{
algorithmsuite->digest = RP_SHA256;
algorithmsuite->encryption = RP_TRIPLE_DES;
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_action.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_action.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_action.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_action.c Sat Mar 17 01:12:54 2007
@@ -595,7 +595,7 @@
actions_impl->encryption_user = NULL;
}
- actions_impl->encryption_user = AXIS2_STRDUP(encryption_user, env);
+ actions_impl->encryption_user = axis2_strdup(encryption_user, env);
if(!actions_impl->encryption_user){
return AXIS2_FAILURE;
}
@@ -620,7 +620,7 @@
AXIS2_FREE(env->allocator, actions_impl->encryption_sym_algorithm);
actions_impl->encryption_sym_algorithm = NULL;
}
- actions_impl->encryption_sym_algorithm = AXIS2_STRDUP(encryption_sym_algorithm, env);
+ actions_impl->encryption_sym_algorithm = axis2_strdup(encryption_sym_algorithm, env);
if(!actions_impl->encryption_sym_algorithm ){
return AXIS2_FAILURE;
}
@@ -645,7 +645,7 @@
actions_impl->encryption_key_transport_algorithm = NULL;
}
actions_impl->encryption_key_transport_algorithm =
- AXIS2_STRDUP(encryption_key_transport_algorithm, env);
+ axis2_strdup(encryption_key_transport_algorithm, env);
if(!actions_impl->encryption_key_transport_algorithm ){
return AXIS2_FAILURE;
}
@@ -670,7 +670,7 @@
AXIS2_FREE(env->allocator, actions_impl->items);
actions_impl->items = NULL;
}
- actions_impl->items = AXIS2_STRDUP(items, env) ;
+ actions_impl->items = axis2_strdup(items, env) ;
if(!actions_impl->items ){
return AXIS2_FAILURE;
}
@@ -695,7 +695,7 @@
AXIS2_FREE(env->allocator, actions_impl->password_type);
actions_impl->password_type = NULL;
}
- actions_impl->password_type = AXIS2_STRDUP(password_type, env) ;
+ actions_impl->password_type = axis2_strdup(password_type, env) ;
if(!actions_impl->password_type ){
return AXIS2_FAILURE;
}
@@ -720,7 +720,7 @@
AXIS2_FREE(env->allocator, actions_impl->user);
actions_impl->user = NULL;
}
- actions_impl->user = AXIS2_STRDUP(user, env) ;
+ actions_impl->user = axis2_strdup(user, env) ;
if(!actions_impl->user ){
return AXIS2_FAILURE;
}
@@ -745,7 +745,7 @@
AXIS2_FREE(env->allocator, actions_impl->password_callback_class);
actions_impl->password_callback_class = NULL;
}
- actions_impl->password_callback_class = AXIS2_STRDUP(password_callback_class, env) ;
+ actions_impl->password_callback_class = axis2_strdup(password_callback_class, env) ;
if(!actions_impl->password_callback_class ){
return AXIS2_FAILURE;
}
@@ -770,7 +770,7 @@
AXIS2_FREE(env->allocator, actions_impl->authn_module_name);
actions_impl->authn_module_name = NULL;
}
- actions_impl->authn_module_name = AXIS2_STRDUP(authn_module_name, env) ;
+ actions_impl->authn_module_name = axis2_strdup(authn_module_name, env) ;
if(!actions_impl->authn_module_name ){
return AXIS2_FAILURE;
}
@@ -795,7 +795,7 @@
AXIS2_FREE(env->allocator, actions_impl->encryption_key_file);
actions_impl->encryption_key_file = NULL;
}
- actions_impl->encryption_key_file = AXIS2_STRDUP(encryption_key_file, env) ;
+ actions_impl->encryption_key_file = axis2_strdup(encryption_key_file, env) ;
if(!actions_impl->encryption_key_file ){
return AXIS2_FAILURE;
}
@@ -820,7 +820,7 @@
AXIS2_FREE(env->allocator, actions_impl->decryption_key_file);
actions_impl->decryption_key_file = NULL;
}
- actions_impl->decryption_key_file = AXIS2_STRDUP(decryption_key_file, env) ;
+ actions_impl->decryption_key_file = axis2_strdup(decryption_key_file, env) ;
if(!actions_impl->decryption_key_file ){
return AXIS2_FAILURE;
}
@@ -845,7 +845,7 @@
AXIS2_FREE(env->allocator, actions_impl->signature_prop_file);
actions_impl->signature_prop_file = NULL;
}
- actions_impl->signature_prop_file = AXIS2_STRDUP(signature_prop_file, env) ;
+ actions_impl->signature_prop_file = axis2_strdup(signature_prop_file, env) ;
if(!actions_impl->signature_prop_file ){
return AXIS2_FAILURE;
}
@@ -869,7 +869,7 @@
AXIS2_FREE(env->allocator, actions_impl->signature_key_identifier);
actions_impl->signature_key_identifier = NULL;
}
- actions_impl->signature_key_identifier = AXIS2_STRDUP(signature_key_identifier, env);
+ actions_impl->signature_key_identifier = axis2_strdup(signature_key_identifier, env);
if(!actions_impl->signature_key_identifier ){
return AXIS2_FAILURE;
}
@@ -893,7 +893,7 @@
AXIS2_FREE(env->allocator, actions_impl->encryption_key_identifier);
actions_impl->encryption_key_identifier = NULL;
}
- actions_impl-> encryption_key_identifier = AXIS2_STRDUP(encryption_key_identifier, env) ;
+ actions_impl-> encryption_key_identifier = axis2_strdup(encryption_key_identifier, env) ;
if(!actions_impl->encryption_key_identifier ){
return AXIS2_FAILURE;
}
@@ -917,7 +917,7 @@
AXIS2_FREE(env->allocator, actions_impl->signature_parts);
actions_impl->signature_parts = NULL;
}
- actions_impl->signature_parts = AXIS2_STRDUP(signature_parts, env);
+ actions_impl->signature_parts = axis2_strdup(signature_parts, env);
if(!actions_impl->signature_parts ){
return AXIS2_FAILURE;
}
@@ -941,7 +941,7 @@
AXIS2_FREE(env->allocator, actions_impl->encryption_parts);
actions_impl->encryption_parts = NULL;
}
- actions_impl->encryption_parts = AXIS2_STRDUP(encryption_parts, env) ;
+ actions_impl->encryption_parts = axis2_strdup(encryption_parts, env) ;
if(!actions_impl->encryption_parts ){
return AXIS2_FAILURE;
}
@@ -966,7 +966,7 @@
AXIS2_FREE(env->allocator, actions_impl->time_to_live);
actions_impl->time_to_live = NULL;
}
- actions_impl->time_to_live = AXIS2_STRDUP(time_to_live, env) ;
+ actions_impl->time_to_live = axis2_strdup(time_to_live, env) ;
if(!actions_impl->time_to_live ){
return AXIS2_FAILURE;
}
@@ -991,7 +991,7 @@
AXIS2_FREE(env->allocator, actions_impl->key_buf);
actions_impl->key_buf = NULL;
}
- actions_impl->key_buf = AXIS2_STRDUP(key_buf, env) ;
+ actions_impl->key_buf = axis2_strdup(key_buf, env) ;
if(!actions_impl->key_buf ){
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_context.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_context.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_context.c Sat Mar 17 01:12:54 2007
@@ -719,9 +719,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((axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)||
+ (axis2_strcmp(inclusion,RP_INCLUDE_ONCE)==0)||
+ (axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0))
return bval;
else
bval = AXIS2_FALSE;
@@ -785,7 +785,7 @@
if(!namespace)
return AXIS2_FAILURE;
- if(AXIS2_STRCMP(namespace,RP_SECURITY_NS)==0)
+ if(axis2_strcmp(namespace,RP_SECURITY_NS)==0)
{
AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] We do not encrypt security namespace headers");
return AXIS2_FAILURE;
@@ -817,7 +817,7 @@
}
}
- else if(AXIS2_STRCMP(local_name,"Security")==0)
+ else if(axis2_strcmp(local_name,"Security")==0)
{
AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] We do not encrypt %s", local_name);
return AXIS2_FAILURE;
@@ -842,7 +842,7 @@
if(ns)
{
namespace_uri = axiom_namespace_get_uri(ns, env);
- if (AXIS2_STRCMP(namespace_uri,namespace) == 0)
+ if (axis2_strcmp(namespace_uri,namespace) == 0)
{
axis2_array_list_add(nodes_to_encrypt,env,ret_node);
return AXIS2_SUCCESS;
@@ -878,7 +878,7 @@
if(!namespace)
return AXIS2_FAILURE;
- if(AXIS2_STRCMP(namespace,RP_SECURITY_NS)==0)
+ if(axis2_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;
@@ -910,7 +910,7 @@
}
}
- else if(AXIS2_STRCMP(local_name,"Security")==0)
+ else if(axis2_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;
@@ -935,7 +935,7 @@
if(ns)
{
namespace_uri = axiom_namespace_get_uri(ns, env);
- if (AXIS2_STRCMP(namespace_uri,namespace) == 0)
+ if (axis2_strcmp(namespace_uri,namespace) == 0)
{
axis2_array_list_add(nodes_to_encrypt_or_sign,env,ret_node);
return AXIS2_SUCCESS;
@@ -1164,10 +1164,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 || axis2_strcmp(protection_order,RP_SIGN_BEFORE_ENCRYPTING)==0)
return AXIS2_FALSE;
- else if(AXIS2_STRCMP(protection_order,RP_ENCRYPT_BEFORE_SIGNING)==0)
+ else if(axis2_strcmp(protection_order,RP_ENCRYPT_BEFORE_SIGNING)==0)
return AXIS2_TRUE;
}
return AXIS2_FALSE;
@@ -1646,12 +1646,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 = ((axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)||
+ (axis2_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 = ((axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)||
+ (axis2_strcmp(inclusion,RP_INCLUDE_ONCE)==0)||
+ (axis2_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0));
if(include)
{
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_util.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_util.c Sat Mar 17 01:12:54 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, axis2_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, axis2_strlen(created) + axis2_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 + axis2_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 + axis2_strlen(created) + axis2_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, axis2_strlen(input));
AXIS2_FREE(env->allocator, input);
AXIS2_FREE(env->allocator, decoded_nonce);
return digest;
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c Sat Mar 17 01:12:54 2007
@@ -95,7 +95,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 == axis2_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/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Sat Mar 17 01:12:54 2007
@@ -133,7 +133,7 @@
property = axis2_ctx_get_property(ctx, env, key, AXIS2_FALSE);
if (property)
{
- str_property = AXIS2_PROPERTY_GET_VALUE(property, env);
+ str_property = axis2_property_get_value(property, env);
property = NULL;
}
@@ -167,9 +167,9 @@
}
/*ERROR HERE param returns TEXT even for DOM*/
- param_type = AXIS2_PARAM_GET_PARAM_TYPE(param_x_flow_security, env);
+ param_type = axis2_param_get_param_type(param_x_flow_security, env);
- action_list = AXIS2_PARAM_GET_VALUE_LIST(param_x_flow_security, env);
+ action_list = axis2_param_get_value_list(param_x_flow_security, env);
if (!action_list)
{
AXIS2_LOG_INFO(env->log, "[rampart][rhu] action_list is NULL ... ERROR ");
@@ -196,10 +196,10 @@
AXIS2_LOG_INFO(env->log, "[rampart][rhu] param_action is NULL");
}
- param_type = AXIS2_PARAM_GET_PARAM_TYPE(param_action, env);
- param_name = AXIS2_PARAM_GET_NAME(param_action, env);
+ param_type = axis2_param_get_param_type(param_action, env);
+ param_name = axis2_param_get_name(param_action, env);
- param_list = AXIS2_PARAM_GET_VALUE_LIST(param_action, env);
+ param_list = axis2_param_get_value_list(param_action, env);
if (!param_list)
{
AXIS2_LOG_INFO(env->log, "[rampart][rhu] param list is NULL");
@@ -211,11 +211,11 @@
param = (axis2_param_t*) axis2_array_list_get(param_list, env, i);
if (param)
{
- tmp_key = AXIS2_PARAM_GET_NAME(param, env);
+ tmp_key = axis2_param_get_name(param, env);
- if (0 == AXIS2_STRCMP(tmp_key , key))
+ if (0 == axis2_strcmp(tmp_key , key))
{
- value = AXIS2_PARAM_GET_VALUE(param, env);
+ value = axis2_param_get_value(param, env);
return value;
}
}
@@ -240,7 +240,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(RAMPART_WSSE_XMLNS, env);
+ sec_ns_str = axis2_strdup(RAMPART_WSSE_XMLNS, env);
header_block_ht = AXIOM_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env);
if (!header_block_ht)
@@ -261,7 +261,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 (axis2_strcmp(ele_localname, RAMPART_SECURITY) == 0)
{
/*Set mustUnderstand = 0*/
AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(header_block, env, AXIS2_FALSE);
@@ -340,7 +340,7 @@
"[rampart][rampart_handler_utils] %s parameter is not set.",param_x_flow_security);
return NULL;
}
- value = AXIS2_PARAM_GET_VALUE(param_x_flow_security, env);
+ value = axis2_param_get_value(param_x_flow_security, env);
return value;
}
@@ -379,8 +379,8 @@
for(i=0; i<size; i++)
{
qname = (axis2_qname_t *) axis2_array_list_get(engaged_modules,env,i);
- local_name = AXIS2_QNAME_GET_LOCALPART(qname,env);
- if(AXIS2_STRCMP(local_name,RAMPART_RAMPART)==0)
+ local_name = axis2_qname_get_localpart(qname,env);
+ if(axis2_strcmp(local_name,RAMPART_RAMPART)==0)
return AXIS2_TRUE;
}
}
@@ -402,8 +402,8 @@
for(i=0; i<size; i++)
{
qname = (axis2_qname_t *) axis2_array_list_get(engaged_modules,env,i);
- local_name = AXIS2_QNAME_GET_LOCALPART(qname,env);
- if(AXIS2_STRCMP(local_name,RAMPART_RAMPART)==0)
+ local_name = axis2_qname_get_localpart(qname,env);
+ if(axis2_strcmp(local_name,RAMPART_RAMPART)==0)
{
axis2_conf_set_enable_security(conf,env,AXIS2_TRUE);
return AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c Sat Mar 17 01:12:54 2007
@@ -60,25 +60,25 @@
if(!local_name)
return AXIS2_FALSE;
- if(AXIS2_STRCMP(local_name,RAMPART_SECURITY_TIMESTAMP)==0)
+ if(axis2_strcmp(local_name,RAMPART_SECURITY_TIMESTAMP)==0)
qname = axis2_qname_create(env,local_name,RAMPART_WSU_XMLNS,RAMPART_WSU);
- else if(AXIS2_STRCMP(local_name,RAMPART_SECURITY_USERNAMETOKEN)==0)
+ else if(axis2_strcmp(local_name,RAMPART_SECURITY_USERNAMETOKEN)==0)
qname = axis2_qname_create(env,local_name,RAMPART_WSSE_XMLNS,RAMPART_WSSE);
- else if(AXIS2_STRCMP(local_name,OXS_NODE_ENCRYPTED_KEY)==0)
+ else if(axis2_strcmp(local_name,OXS_NODE_ENCRYPTED_KEY)==0)
qname = axis2_qname_create(env,local_name,OXS_ENC_NS,OXS_XENC);
- else if(AXIS2_STRCMP(local_name,OXS_NODE_ENCRYPTED_DATA)==0)
+ else if(axis2_strcmp(local_name,OXS_NODE_ENCRYPTED_DATA)==0)
qname = axis2_qname_create(env,local_name,OXS_ENC_NS,OXS_XENC);
- else if(AXIS2_STRCMP(local_name,OXS_NODE_SIGNATURE)==0)
+ else if(axis2_strcmp(local_name,OXS_NODE_SIGNATURE)==0)
qname = axis2_qname_create(env,local_name,OXS_DSIG_NS,OXS_DS);
- else if(AXIS2_STRCMP(local_name,OXS_NODE_BINARY_SECURITY_TOKEN)==0)
+ else if(axis2_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(axis2_strcmp(local_name,OXS_NODE_REFERENCE_LIST)==0)
return AXIS2_FALSE;
else return AXIS2_FALSE;
@@ -90,14 +90,14 @@
if(!node_qname)
{
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return AXIS2_FALSE;
}
- if(AXIS2_QNAME_EQUALS(qname,env,node_qname))
+ if(axis2_qname_equals(qname,env,node_qname))
{
- AXIS2_QNAME_FREE(qname,env);
+ axis2_qname_free(qname,env);
qname = NULL;
return AXIS2_TRUE;
}
@@ -254,7 +254,7 @@
if(!enc_asym_algo_in_pol)
return AXIS2_FAILURE;
- if(AXIS2_STRCMP(enc_asym_algo_in_pol,enc_asym_algo)!=0)
+ if(axis2_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;
@@ -390,7 +390,7 @@
if(!sym_algo)
return AXIS2_FAILURE;
- if(AXIS2_STRCMP(sym_algo, enc_sym_algo_in_pol)!=0)
+ if(axis2_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;
@@ -719,7 +719,7 @@
axis2_char_t *item = NULL;
item = axis2_array_list_get(items_list, env, i);
- if (0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_USERNAMETOKEN, AXIS2_STRTRIM(env, item, NULL))){
+ if (0 == axis2_strcmp(RAMPART_ACTION_ITEMS_USERNAMETOKEN, axis2_strtrim(env, item, NULL))){
int num_of_ut = 0;
num_of_ut = oxs_axiom_get_number_of_children_with_qname(env, sec_node,
@@ -730,7 +730,7 @@
"UsernameToken is not available", RAMPART_FAULT_IN_USERNAMETOKEN, msg_ctx);
return AXIS2_FAILURE;
}
- }else if(0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_TIMESTAMP, AXIS2_STRTRIM(env, item, NULL))){
+ }else if(0 == axis2_strcmp(RAMPART_ACTION_ITEMS_TIMESTAMP, axis2_strtrim(env, item, NULL))){
int num_of_ts = 0;
num_of_ts = oxs_axiom_get_number_of_children_with_qname(env, sec_node,
@@ -779,37 +779,37 @@
axis2_char_t *result = NULL;
item = axis2_array_list_get(items_list, env, i);
- if (0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_USERNAMETOKEN, AXIS2_STRTRIM(env, item, NULL))){
+ if (0 == axis2_strcmp(RAMPART_ACTION_ITEMS_USERNAMETOKEN, axis2_strtrim(env, item, NULL))){
result = (axis2_char_t*)rampart_get_security_processed_result(env, msg_ctx, RAMPART_SPR_UT_CHECKED);
- if(!result || (0 != AXIS2_STRCMP(result, RAMPART_YES)) ){
+ if(!result || (0 != axis2_strcmp(result, RAMPART_YES)) ){
AXIS2_LOG_INFO(env->log, "[rampart][shp] UsernameToken is required. But not available");
rampart_create_fault_envelope(env, RAMPART_FAULT_SECURITY_TOKEN_UNAVAILABLE,
"UsernameToken is not available", RAMPART_FAULT_IN_USERNAMETOKEN, msg_ctx);
return AXIS2_FAILURE;
}
result = NULL;
- }else if(0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_TIMESTAMP, AXIS2_STRTRIM(env, item, NULL))){
+ }else if(0 == axis2_strcmp(RAMPART_ACTION_ITEMS_TIMESTAMP, axis2_strtrim(env, item, NULL))){
result = (axis2_char_t*)rampart_get_security_processed_result(env, msg_ctx, RAMPART_SPR_TS_CHECKED);
- if(!result || (0 != AXIS2_STRCMP(result, RAMPART_YES)) ){
+ if(!result || (0 != axis2_strcmp(result, RAMPART_YES)) ){
AXIS2_LOG_INFO(env->log, "[rampart][shp] Timestamp is required. But not available");
rampart_create_fault_envelope(env, RAMPART_FAULT_SECURITY_TOKEN_UNAVAILABLE,
"Timestamp is not available", RAMPART_FAULT_IN_TIMESTAMP, msg_ctx);
return AXIS2_FAILURE;
}
result = NULL;
- }else if(0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_ENCRYPT, AXIS2_STRTRIM(env, item, NULL))){
+ }else if(0 == axis2_strcmp(RAMPART_ACTION_ITEMS_ENCRYPT, axis2_strtrim(env, item, NULL))){
result = (axis2_char_t*)rampart_get_security_processed_result(env, msg_ctx, RAMPART_SPR_ENC_CHECKED);
- if(!result || (0 != AXIS2_STRCMP(result, RAMPART_YES)) ){
+ if(!result || (0 != axis2_strcmp(result, RAMPART_YES)) ){
AXIS2_LOG_INFO(env->log, "[rampart][shp] Encryption is required. But not available");
rampart_create_fault_envelope(env, RAMPART_FAULT_SECURITY_TOKEN_UNAVAILABLE,
"Data are not encrypted", RAMPART_FAULT_IN_ENCRYPTED_KEY, msg_ctx);
return AXIS2_FAILURE;
}
result = NULL;
- }else if (0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_SIGNATURE, AXIS2_STRTRIM(env, item, NULL))){
+ }else if (0 == axis2_strcmp(RAMPART_ACTION_ITEMS_SIGNATURE, axis2_strtrim(env, item, NULL))){
}
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c Sat Mar 17 01:12:54 2007
@@ -71,7 +71,7 @@
sec_processed_results = axis2_hash_make(env);
sec_processed_results_prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_VALUE(sec_processed_results_prop, env, sec_processed_results);
+ axis2_property_set_value(sec_processed_results_prop, env, sec_processed_results);
axis2_msg_ctx_set_property(msg_ctx, env, RAMPART_SECURITY_PROCESSED_RESULTS, sec_processed_results_prop, AXIS2_FALSE);
return AXIS2_SUCCESS;
@@ -90,7 +90,7 @@
return NULL;
}
- sec_processed_results = (axis2_hash_t*)AXIS2_PROPERTY_GET_VALUE(sec_processed_results_prop, env);
+ sec_processed_results = (axis2_hash_t*)axis2_property_get_value(sec_processed_results_prop, env);
if(!sec_processed_results){
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][spr] Cannot get Security Processed Results Hash table from the property");
return NULL;
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_util.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_util.c Sat Mar 17 01:12:54 2007
@@ -53,7 +53,7 @@
dll_desc = axis2_dll_desc_create(env);
axis2_dll_desc_set_name(dll_desc, env, module_name);
impl_info_param = axis2_param_create(env, NULL, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_class_loader_init(env);
ptr = axis2_class_loader_create_dll(env, impl_info_param);
@@ -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 == axis2_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/axis2/trunk/c/rampart/src/util/timestamp_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c Sat Mar 17 01:12:54 2007
@@ -224,7 +224,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 (axis2_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");
@@ -251,7 +251,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 (axis2_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/axis2/trunk/c/rampart/src/util/username_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/username_token.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/username_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/username_token.c Sat Mar 17 01:12:54 2007
@@ -248,7 +248,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 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST))
{
axis2_char_t *nonce_val = NULL;
axis2_char_t *created_val = NULL;
@@ -411,12 +411,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 == axis2_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 == axis2_strcmp(localname , RAMPART_SECURITY_USERNAMETOKEN_PASSWORD))
{
password_type = axiom_element_get_attribute_value_by_name(element,
env,
@@ -433,17 +433,17 @@
if(!password_type_pol)
password_type_pol = RP_PLAINTEXT;
- if(AXIS2_STRCMP(password_type_pol,RP_DIGEST)==0)
+ if(axis2_strcmp(password_type_pol,RP_DIGEST)==0)
{
- if(0 != AXIS2_STRCMP(password_type, RAMPART_PASSWORD_DIGEST_URI))
+ if(0 != axis2_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(axis2_strcmp(password_type_pol,RP_PLAINTEXT)==0)
{
- if(0 == AXIS2_STRCMP(password_type, RAMPART_PASSWORD_DIGEST_URI))
+ if(0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI))
{
AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password Type is Wrong");
return AXIS2_FAILURE;
@@ -452,13 +452,13 @@
password = axiom_element_get_text(element, env, node);
}
- else if (0 == AXIS2_STRCMP(localname, RAMPART_SECURITY_USERNAMETOKEN_NONCE))
+ else if (0 == axis2_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 == axis2_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);
@@ -501,7 +501,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 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI))
{
authenticate_with_digest = rampart_context_get_auth_digest_function(rampart_context,env);
if(authenticate_with_digest)
@@ -585,7 +585,7 @@
}
/*Alright NOW we have the password. Is digest needed?*/
- if (0 == AXIS2_STRCMP(password_type, RAMPART_PASSWORD_DIGEST_URI))
+ if (0 == axis2_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);
@@ -596,7 +596,7 @@
}
/*The BIG moment. Compare passwords*/
- if (0 == AXIS2_STRCMP(password_to_compare , password))
+ if (0 == axis2_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/axis2/trunk/c/rampart/test/omxmlsec/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c Sat Mar 17 01:12:54 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, axis2_strlen(signed_result), outf);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/rampart/test/openssl/block_cipher_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/test/openssl/block_cipher_test.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/openssl/block_cipher_test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/openssl/block_cipher_test.c Sat Mar 17 01:12:54 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; /*axis2_strdup(key, env);*/
bc1_ctx->key_initialized = 1;
/*Set the IV*/
- bc1_ctx->iv = AXIS2_STRDUP(iv, env);
+ bc1_ctx->iv = axis2_strdup(iv, env);
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; /*axis2_strdup(key, env);*/
bc2_ctx->key_initialized = 1;
/*Set the IV*/
- bc2_ctx->iv = AXIS2_STRDUP(iv, env);
+ bc2_ctx->iv = axis2_strdup(iv, env);
ret = openssl_evp_block_cipher_ctx_init(env, bc2_ctx,
OPENSSL_DECRYPT, cipher_name);
if (ret < 0)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org