svn commit: r569259 - in /webservices/rampart/trunk/c/src/util: rampart_context.c rampart_encryption.c

[ma...@apache.org]

Author: manjula
Date: Thu Aug 23 22:49:09 2007
New Revision: 569259

URL: http://svn.apache.org/viewvc?rev=569259&view=rev
Log:
Some minor bug fixes.

Modified:
    webservices/rampart/trunk/c/src/util/rampart_context.c
    webservices/rampart/trunk/c/src/util/rampart_encryption.c

Modified: webservices/rampart/trunk/c/src/util/rampart_context.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_context.c?rev=569259&r1=569258&r2=569259&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_context.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_context.c Thu Aug 23 22:49:09 2007
@@ -160,7 +160,7 @@
     rampart_context->prv_key_password = NULL;
     rampart_context->pwcb_function = NULL;
     rampart_context->is_replayed_function = NULL;
-    rampart_context->ttl = 0;
+    rampart_context->ttl = 300;
     rampart_context->rd_val = NULL;
     rampart_context->password_type = NULL;
     rampart_context->private_key_file = NULL;

Modified: webservices/rampart/trunk/c/src/util/rampart_encryption.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_encryption.c?rev=569259&r1=569258&r2=569259&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_encryption.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_encryption.c Thu Aug 23 22:49:09 2007
@@ -96,8 +96,8 @@
 
     /*Get nodes to be encrypted*/
     
-    server_side = axis2_msg_ctx_get_server_side(msg_ctx,env);
-    nodes_to_encrypt = axutil_array_list_create(env,0);
+    server_side = axis2_msg_ctx_get_server_side(msg_ctx, env);
+    nodes_to_encrypt = axutil_array_list_create(env, 0);
 
     signature_protection = rampart_context_is_encrypt_signature(
             rampart_context, env);
@@ -183,7 +183,11 @@
     }
 
     /*Key will be duplicated inside the function. So no worries freeing it here*/
-    rampart_context_set_session_key(rampart_context, env, session_key);
+    if(rampart_context_is_encrypt_before_sign(rampart_context, env)
+        && signature_protection)
+    {    
+        rampart_context_set_session_key(rampart_context, env, session_key);
+    }
 
     /*Create a list to store EncDataIds. This will be used in building the ReferenceList*/