Author: dushshantha
Date: Wed Mar 28 23:49:38 2007
New Revision: 523590

URL: http://svn.apache.org/viewvc?view=rev&rev=523590
Log:
fixed build break due to the last changes in axis2c


M    test/openssl/block_cipher_test.c
M    src/omxmlsec/ctx.c
M    src/omxmlsec/signature.c
M    src/omxmlsec/openssl/cipher_property.c
M    src/omxmlsec/openssl/x509.c
M    src/omxmlsec/openssl/cipher_ctx.c
M    src/omxmlsec/openssl/pkey.c
M    src/omxmlsec/utility.c
M    src/omxmlsec/transform.c
M    src/omxmlsec/sign_ctx.c
M    src/omxmlsec/xml_signature.c
M    src/omxmlsec/x509_cert.c
M    src/omxmlsec/sign_part.c
M    src/omxmlsec/asym_ctx.c
M    src/omxmlsec/key.c
M    src/omxmlsec/encryption.c
M    samples/callback/pwcb.c

Modified:
    webservices/rampart/trunk/c/samples/callback/pwcb.c
    webservices/rampart/trunk/c/src/omxmlsec/asym_ctx.c
    webservices/rampart/trunk/c/src/omxmlsec/ctx.c
    webservices/rampart/trunk/c/src/omxmlsec/encryption.c
    webservices/rampart/trunk/c/src/omxmlsec/key.c
    webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c
    webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c
    webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c
    webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c
    webservices/rampart/trunk/c/src/omxmlsec/sign_ctx.c
    webservices/rampart/trunk/c/src/omxmlsec/sign_part.c
    webservices/rampart/trunk/c/src/omxmlsec/signature.c
    webservices/rampart/trunk/c/src/omxmlsec/transform.c
    webservices/rampart/trunk/c/src/omxmlsec/utility.c
    webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c
    webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c
    webservices/rampart/trunk/c/test/openssl/block_cipher_test.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=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/pwcb.c (original)
+++ webservices/rampart/trunk/c/samples/callback/pwcb.c Wed Mar 28 23:49:38 2007
@@ -50,10 +50,10 @@
           res = axis2_strstr(line, ":");
           ch = res[0];
           res[0] = '\0';
-          un = (axis2_char_t *) axis2_strdup(line, env);
+          un = (axis2_char_t *) axis2_strdup(env, line);
           res[0] = ch;
           if(0 == axis2_strcmp(un, username)){
-             pw = (axis2_char_t *) axis2_strdup(&(res[1]), env);
+             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*/
 
              break;

Modified: webservices/rampart/trunk/c/src/omxmlsec/asym_ctx.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/asym_ctx.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/asym_ctx.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/asym_ctx.c Wed Mar 28 23:49:38 2007
@@ -132,7 +132,7 @@
         AXIS2_FREE(env->allocator, asym_ctx->file_name);
         asym_ctx->file_name = NULL;
     }
-    asym_ctx->file_name = axis2_strdup(file_name, env);
+    asym_ctx->file_name = axis2_strdup(env, file_name);
     return AXIS2_SUCCESS;
 }
 
@@ -149,7 +149,7 @@
         AXIS2_FREE(env->allocator, asym_ctx->pem_buf);
         asym_ctx->pem_buf = NULL;
     }
-    asym_ctx->pem_buf = axis2_strdup(pem_buf, env);
+    asym_ctx->pem_buf = axis2_strdup(env, pem_buf);
     return AXIS2_SUCCESS;
 }
 
@@ -166,7 +166,7 @@
         AXIS2_FREE(env->allocator, asym_ctx->password);
         asym_ctx->password = NULL;
     }
-    asym_ctx->password = axis2_strdup(password, env);
+    asym_ctx->password = axis2_strdup(env, password);
     return AXIS2_SUCCESS;
 }
 
@@ -195,7 +195,7 @@
         AXIS2_FREE(env->allocator, asym_ctx->algorithm);
         asym_ctx->algorithm = NULL;
     }
-    asym_ctx->algorithm = axis2_strdup(algorithm, env);
+    asym_ctx->algorithm = axis2_strdup(env, algorithm);
     return AXIS2_SUCCESS;
 }
 
@@ -211,7 +211,7 @@
         AXIS2_FREE(env->allocator, asym_ctx->st_ref_pattern);
         asym_ctx->st_ref_pattern = NULL;
     }
-    asym_ctx->st_ref_pattern = axis2_strdup(st_ref_pattern, env);
+    asym_ctx->st_ref_pattern = axis2_strdup(env, st_ref_pattern);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/rampart/trunk/c/src/omxmlsec/ctx.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/ctx.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/ctx.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/ctx.c Wed Mar 28 23:49:38 2007
@@ -335,7 +335,7 @@
         AXIS2_FREE(env->allocator, ctx->id);
         ctx->id = NULL;
     }
-    ctx->id = axis2_strdup(id, env);
+    ctx->id = axis2_strdup(env, id);
 
     return AXIS2_SUCCESS;
 }
@@ -355,7 +355,7 @@
         AXIS2_FREE(env->allocator, ctx->type);
         ctx->type = NULL;
     }
-    ctx->type = axis2_strdup(type, env);
+    ctx->type = axis2_strdup(env, type);
 
     return AXIS2_SUCCESS;
 }
@@ -375,7 +375,7 @@
         AXIS2_FREE(env->allocator, ctx->mime_type);
         ctx->mime_type = NULL;
     }
-    ctx->mime_type = axis2_strdup(mime_type, env);
+    ctx->mime_type = axis2_strdup(env, mime_type);
 
     return AXIS2_SUCCESS;
 }
@@ -395,7 +395,7 @@
         AXIS2_FREE(env->allocator, ctx->encoding);
         ctx->encoding = NULL;
     }
-    ctx->encoding = axis2_strdup(encoding, env);
+    ctx->encoding = axis2_strdup(env, encoding);
 
     return AXIS2_SUCCESS;
 }
@@ -415,7 +415,7 @@
         AXIS2_FREE(env->allocator, ctx->recipient);
         ctx->recipient = NULL;
     }
-    ctx->recipient = axis2_strdup(recipient, env);
+    ctx->recipient = axis2_strdup(env, recipient);
 
     return AXIS2_SUCCESS;
 }
@@ -435,7 +435,7 @@
         AXIS2_FREE(env->allocator, ctx->carried_key_name);
         ctx->carried_key_name = NULL;
     }
-    ctx->carried_key_name = axis2_strdup(carried_key_name, env);
+    ctx->carried_key_name = axis2_strdup(env, carried_key_name);
 
     return AXIS2_SUCCESS;
 }
@@ -455,7 +455,7 @@
         AXIS2_FREE(env->allocator, ctx->enc_mtd_algorithm);
         ctx->enc_mtd_algorithm = NULL;
     }
-    ctx->enc_mtd_algorithm = axis2_strdup(enc_mtd_algorithm, env);
+    ctx->enc_mtd_algorithm = axis2_strdup(env, enc_mtd_algorithm);
 
     return AXIS2_SUCCESS;
 }
@@ -475,7 +475,7 @@
         AXIS2_FREE(env->allocator, ctx->input_data);
         ctx->input_data = NULL;
     }
-    ctx->input_data = axis2_strdup(input_data, env) ;
+    ctx->input_data = axis2_strdup(env, input_data) ;
 
     return AXIS2_SUCCESS;
 }

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=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/encryption.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/encryption.c Wed Mar 28 23:49:38 
2007
@@ -118,7 +118,7 @@
         }
 
         /*Attach the result to the result buf*/
-        ret = oxs_buffer_populate(result, env, (unsigned 
char*)axis2_strdup(encoded_str, env), encodedlen);
+        ret = oxs_buffer_populate(result, env, (unsigned 
char*)axis2_strdup(env, encoded_str), encodedlen);
 
         /*Free*/
         oxs_buffer_free(output, env);
@@ -228,7 +228,7 @@
         encodedlen = axis2_base64_encode_len(enclen);
         encoded_str = AXIS2_MALLOC(env->allocator, encodedlen);
         ret = axis2_base64_encode(encoded_str, (const char 
*)oxs_buffer_get_data(out_buf, env), enclen);
-        status = oxs_buffer_populate(result, env, (unsigned 
char*)axis2_strdup(encoded_str, env), encodedlen);
+        status = oxs_buffer_populate(result, env, (unsigned 
char*)axis2_strdup(env, encoded_str), encodedlen);
 
         /*Free*/
         oxs_buffer_free(out_buf, env);

Modified: webservices/rampart/trunk/c/src/omxmlsec/key.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/key.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/key.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/key.c Wed Mar 28 23:49:38 2007
@@ -91,7 +91,7 @@
         AXIS2_FREE(env->allocator, key->name);
         key->name = NULL;
     }
-    key->name = axis2_strdup(name, env);
+    key->name = axis2_strdup(env, name);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c Wed Mar 28 
23:49:38 2007
@@ -174,7 +174,7 @@
         AXIS2_FREE(env->allocator, ctx->iv);
         ctx->iv = NULL;
     }
-    ctx->iv = axis2_strdup(iv, env);
+    ctx->iv = axis2_strdup(env, iv);
 
     return AXIS2_SUCCESS;
 }
@@ -194,7 +194,7 @@
         AXIS2_FREE(env->allocator, ctx->pad);
         ctx->pad = NULL;
     }
-    ctx->pad = axis2_strdup(pad, env);
+    ctx->pad = axis2_strdup(env, pad);
 
     return AXIS2_SUCCESS;
 }

Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c 
(original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c Wed Mar 
28 23:49:38 2007
@@ -128,7 +128,7 @@
         AXIS2_FREE(env->allocator, cprop->name);
         cprop->name = NULL;
     }
-    cprop->name = axis2_strdup(name, env);
+    cprop->name = axis2_strdup(env, name);
     return AXIS2_SUCCESS;
 }
 
@@ -147,7 +147,7 @@
         AXIS2_FREE(env->allocator, cprop->url);
         cprop->url = NULL;
     }
-    cprop->url = axis2_strdup(url, env);
+    cprop->url = axis2_strdup(env, url);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c Wed Mar 28 23:49:38 
2007
@@ -140,7 +140,7 @@
         pkey->name = NULL;
     }
 
-    pkey->name = axis2_strdup(name, env);
+    pkey->name = axis2_strdup(env, name);
 
     return AXIS2_SUCCESS;
 }

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=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c Wed Mar 28 23:49:38 
2007
@@ -44,7 +44,7 @@
     int decoded_len = -1;
 
     /*We should remove new lines here.*/
-    buf_to_format = (axis2_char_t*)axis2_strdup(b64_encoded_buf,env);
+    buf_to_format = (axis2_char_t*)axis2_strdup(env, b64_encoded_buf);
     if(buf_to_format)
     {
         formatted_buf = oxs_util_get_newline_removed_string(env,buf_to_format);
@@ -221,7 +221,7 @@
     core_tail = axis2_strstr(unformatted, "\n");
     res = axis2_strstr(core_tail,"-----END");
     res[0] = '\0';
-    core = (axis2_char_t*)axis2_strdup(core_tail,env);
+    core = (axis2_char_t*)axis2_strdup(env, core_tail);
     if(core)
     {
         buffer = oxs_util_get_newline_removed_string(env,core);
@@ -307,7 +307,7 @@
     EVP_EncodeFinal(&ctx, (unsigned char*)(output+len), &ret);
 
     ret += len;
-    ski = axis2_strdup(output, env);
+    ski = axis2_strdup(env, output);
     return ski;
 }
 

Modified: webservices/rampart/trunk/c/src/omxmlsec/sign_ctx.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/sign_ctx.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/sign_ctx.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/sign_ctx.c Wed Mar 28 23:49:38 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(env,sign_mtd_algo);
     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(env, c14n_mtd);
     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(env, sig_val);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/rampart/trunk/c/src/omxmlsec/sign_part.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/sign_part.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/sign_part.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/sign_part.c Wed Mar 28 23:49:38 
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(env, id);
     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(env, digest_mtd);
     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(env, digest_val);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/rampart/trunk/c/src/omxmlsec/signature.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/signature.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/signature.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/signature.c Wed Mar 28 23:49:38 
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(env, encoded_str), encodedlen);
 
     /*Free signed_result_buf*/
 

Modified: webservices/rampart/trunk/c/src/omxmlsec/transform.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/transform.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/transform.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/transform.c Wed Mar 28 23:49:38 
2007
@@ -73,7 +73,7 @@
         AXIS2_FREE(env->allocator, transform->id);
         transform->id = NULL;
     }
-    transform->id = axis2_strdup(id, env);
+    transform->id = axis2_strdup(env, id);
     return AXIS2_SUCCESS;
 }
 

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=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/utility.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/utility.c Wed Mar 28 23:49:38 2007
@@ -34,7 +34,7 @@
 
     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(env, _id);
     return id;
 
 }

Modified: webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c?view=diff&rev=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c Wed Mar 28 23:49:38 
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(env, value);
     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(env, value);
     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(env, value);
     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(env, value);
     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(env, value);
     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(env, value);
     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(env, value);
     return AXIS2_SUCCESS;
 }
 AXIS2_EXTERN axis2_status_t AXIS2_CALL

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=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c Wed Mar 28 
23:49:38 2007
@@ -288,7 +288,7 @@
     oxs_sign_part_set_id(sign_part, env, ref_id);
 
     /*Remove the # from the id*/
-    ref_id2 =  axis2_string_substring_starting_at(axis2_strdup(ref_id, env), 
1);
+    ref_id2 =  axis2_string_substring_starting_at(axis2_strdup(env, ref_id), 
1);
 
     /*Find the node refered by this ref_id2 and set to the sign part*/
     reffed_node = oxs_axiom_get_node_by_id(env, scope_node, "wsu:Id", ref_id2 
);

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=523590&r1=523589&r2=523590
==============================================================================
--- webservices/rampart/trunk/c/test/openssl/block_cipher_test.c (original)
+++ webservices/rampart/trunk/c/test/openssl/block_cipher_test.c Wed Mar 28 
23:49:38 2007
@@ -122,7 +122,7 @@
     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(env, iv);
     ret =  openssl_evp_block_cipher_ctx_init(env, bc1_ctx,
             OPENSSL_ENCRYPT, cipher_name);
     if (ret < 0)
@@ -153,7 +153,7 @@
     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(env, iv);
     ret =  openssl_evp_block_cipher_ctx_init(env, bc2_ctx,
             OPENSSL_DECRYPT, cipher_name);
     if (ret < 0)


Reply via email to