Author: dushshantha
Date: Thu Mar 29 01:26:39 2007
New Revision: 523617
URL: http://svn.apache.org/viewvc?view=rev&rev=523617
Log:
corrected axis2_strndup and axis2_stracat function calls
Modified:
webservices/rampart/trunk/c/samples/callback/pwcb.c
webservices/rampart/trunk/c/src/omxmlsec/encryption.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c
webservices/rampart/trunk/c/src/omxmlsec/utility.c
webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c
webservices/rampart/trunk/c/src/util/rampart_signature.c
Modified: webservices/rampart/trunk/c/samples/callback/pwcb.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/pwcb.c?view=diff&rev=523617&r1=523616&r2=523617
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/pwcb.c (original)
+++ webservices/rampart/trunk/c/samples/callback/pwcb.c Thu Mar 29 01:26:39 2007
@@ -54,7 +54,7 @@
res[0] = ch;
if(0 == axis2_strcmp(un, username)){
pw = (axis2_char_t *) axis2_strdup(env, &(res[1]));
- password = axis2_strndup(pw, axis2_strlen(pw)-1, env); /*We need
to remove the end of line character*/
+ password = axis2_strndup(env, pw, axis2_strlen(pw)-1); /*We need
to remove the end of line character*/
break;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/encryption.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/encryption.c?view=diff&rev=523617&r1=523616&r2=523617
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/encryption.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/encryption.c Thu Mar 29 01:26:39
2007
@@ -52,11 +52,10 @@
return AXIS2_FAILURE;
}
/*Get the IV*/
- iv = axis2_strndup((axis2_char_t*)oxs_iv_generate_for_algo(
- env,
+ iv = axis2_strndup(env,
+ (axis2_char_t*)oxs_iv_generate_for_algo(env,
oxs_ctx_get_enc_mtd_algorithm(enc_ctx, env)),
- openssl_cipher_property_get_iv_size(cprop, env),
- env);
+ openssl_cipher_property_get_iv_size(cprop, env));
/*Create the openssl context*/
oc_ctx = openssl_cipher_ctx_create(env);
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c?view=diff&rev=523617&r1=523616&r2=523617
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c Thu Mar 29 01:26:39
2007
@@ -387,7 +387,7 @@
i2a_ASN1_OBJECT(out, ci->key->algor->algorithm);
}
n = BIO_get_mem_data(out, &data);
- result = axis2_strndup( data, n, env );
+ result = axis2_strndup( env, data, n);
BIO_free(out);
out = NULL;
Modified: webservices/rampart/trunk/c/src/omxmlsec/utility.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/utility.c?view=diff&rev=523617&r1=523616&r2=523617
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/utility.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/utility.c Thu Mar 29 01:26:39 2007
@@ -32,7 +32,7 @@
char _id[50];
axis2_char_t *random ;
- random = axis2_strndup(axis2_uuid_gen(env),18, env);
+ random = axis2_strndup(env, axis2_uuid_gen(env),18);
sprintf(_id, "%s-%s",prefix,random);
id = (axis2_char_t*)axis2_strdup(env, _id);
return id;
Modified: webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c?view=diff&rev=523617&r1=523616&r2=523617
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c Thu Mar 29
01:26:39 2007
@@ -140,7 +140,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(env, "#", id);/* <ds:Reference URI="#id">*/
reference_node = oxs_token_build_ds_reference_element(env, parent ,NULL,
ref_id, NULL);
/*Get transforms if any*/
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=523617&r1=523616&r2=523617
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_signature.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_signature.c Thu Mar 29
01:26:39 2007
@@ -350,7 +350,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("#",cert_id,env);
+ cert_id_ref = axis2_stracat(env, "#",cert_id);
reference_node =
oxs_token_build_reference_element(env,str_node,cert_id_ref,OXS_VALUE_X509V3);
if(!reference_node)
{
