Author: kaushalye
Date: Wed Apr 4 02:36:41 2007
New Revision: 525476
URL: http://svn.apache.org/viewvc?view=rev&rev=525476
Log:
Code improvement in Rampart
Modified:
webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c
webservices/rampart/trunk/c/src/util/rampart_engine.c
webservices/rampart/trunk/c/src/util/rampart_util.c
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c?view=diff&rev=525476&r1=525475&r2=525476
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c Wed Apr 4
02:36:41 2007
@@ -40,7 +40,7 @@
encoded_str = AXIS2_MALLOC(env->allocator,
axutil_base64_encode_len(SIZE_HASH));
axutil_base64_encode(encoded_str, (char*)md, SHA_DIGEST_LENGTH);
- AXIS2_LOG_INFO(env->log, "[openssl][sha1-output]\n\n%s\n\n", encoded_str);
+ /*AXIS2_LOG_INFO(env->log, "[openssl][sha1-output]\n\n%s\n\n",
encoded_str);*/
return encoded_str;
}
Modified: webservices/rampart/trunk/c/src/util/rampart_engine.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_engine.c?view=diff&rev=525476&r1=525475&r2=525476
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_engine.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_engine.c Wed Apr 4 02:36:41
2007
@@ -61,6 +61,7 @@
value =
rampart_get_rampart_configuration(env,msg_ctx,INFLOW_RAMPART_CONTEXT);
if(value)
{
+ /*We need a rampart_context*/
rampart_context = (rampart_context_t *)value;
if(!rampart_context)
{
@@ -68,15 +69,13 @@
return NULL;
}
return
get_rampart_context_with_secpolicy_from_om(rampart_context,env);
- }
- else
- {
+ }else{
if(axis2_msg_ctx_get_server_side(msg_ctx,env))
{
+ /*If the server side*/
return
get_rampart_context_in_server_side(env,msg_ctx,IN_MESSAGE_SECURITY);
- }
- else
- {
+ }else{
+ /*We are in the client/incoming side*/
value =
rampart_get_rampart_configuration(env,msg_ctx,RAMPART_INFLOW_SECURITY_POLICY);
if(!value)
{
@@ -87,10 +86,8 @@
return build_rampart_context_from_file(env,file_name);
}
}
- }
-
- else
- {
+ }else{
+ /*Outflow*/
value =
rampart_get_rampart_configuration(env,msg_ctx,OUTFLOW_RAMPART_CONTEXT);
if(value)
{
@@ -101,9 +98,7 @@
return NULL;
}
return
get_rampart_context_with_secpolicy_from_om(rampart_context,env);
- }
- else
- {
+ }else{
if(axis2_msg_ctx_get_server_side(msg_ctx,env))
{
return
get_rampart_context_in_server_side(env,msg_ctx,OUT_MESSAGE_SECURITY);
Modified: webservices/rampart/trunk/c/src/util/rampart_util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_util.c?view=diff&rev=525476&r1=525475&r2=525476
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_util.c Wed Apr 4 02:36:41 2007
@@ -50,6 +50,7 @@
axutil_param_t *impl_info_param = NULL;
void *ptr = NULL;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rampart_util] Trying to
load module = %s", module_name);
dll_desc = axutil_dll_desc_create(env);
axutil_dll_desc_set_name(dll_desc, env, module_name);
impl_info_param = axutil_param_create(env, NULL, NULL);
@@ -142,7 +143,7 @@
axis2_char_t *callback_module_name)
{
rampart_callback_t *cb = NULL;
-
+
cb = (rampart_callback_t*)rampart_load_module(env, callback_module_name);
if (!cb)
{
@@ -166,7 +167,7 @@
/*Get the password thru the callback*/
password = RAMPART_CALLBACK_CALLBACK_PASSWORD(callback_module, env,
username, cb_prop_val);
- AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password taken
from the callback module . SUCCESS");
+ AXIS2_LOG_INFO(env->log, "[rampart][rampart_util] Password taken from the
callback module . SUCCESS");
return password;
}
@@ -227,90 +228,6 @@
{
return AXIS2_FAILURE;
}
-#if 0
- yyyy1 = axutil_date_time_get_year(dt1, env);
- mm1 = axutil_date_time_get_month(dt1, env);
- dd1 = axutil_date_time_get_date(dt1, env);
- hh1 = axutil_date_time_get_hour(dt1, env);
- mi1 = axutil_date_time_get_minute(dt1, env);
- ss1 = axutil_date_time_get_second(dt1, env);
- ml1 = axutil_date_time_get_msec(dt1, env);
-
- yyyy2 = axutil_date_time_get_year(dt2, env);
- mm2 = axutil_date_time_get_month(dt2, env);
- dd2 = axutil_date_time_get_date(dt2, env);
- hh2 = axutil_date_time_get_hour(dt2, env);
- mi2 = axutil_date_time_get_minute(dt2, env);
- ss2 = axutil_date_time_get_second(dt2, env);
- ml2 = axutil_date_time_get_msec(dt2, env);
- /**
- Comparison.
- We expect dt1_str < dt2_str/ Otherwise FAILURE
- */
- if (yyyy1 < yyyy2)
- {
- return AXIS2_SUCCESS;
- }
- else if (yyyy1 > yyyy2)
- {
- return AXIS2_FAILURE;
- }
-
- if (mm1 < mm2)
- {
- return AXIS2_SUCCESS;
- }
- else if (mm1 > mm2)
- {
- return AXIS2_FAILURE;
- }
-
- if (dd1 < dd2)
- {
- return AXIS2_SUCCESS;
- }
- else if (dd1 > dd2)
- {
- return AXIS2_FAILURE;
- }
-
- if (hh1 < hh2)
- {
- return AXIS2_SUCCESS;
- }
- else if (hh1 > hh2)
- {
- return AXIS2_FAILURE;
- }
- if (mi1 < mi2)
- {
- return AXIS2_SUCCESS;
- }
- else if (mi1 > mi2)
- {
- return AXIS2_FAILURE;
- }
-
- if (ss1 < ss2)
- {
- return AXIS2_SUCCESS;
- }
- else if (ss1 > ss2)
- {
- return AXIS2_FAILURE;
- }
-
- if (ml1 < ml2)
- {
- return AXIS2_SUCCESS;
- }
- else if (ml1 > ml2)
- {
- return AXIS2_FAILURE;
- }
- return AXIS2_SUCCESS;
-#else
- /*Moved comparison logic to axutil_date_time */
/*dt1<dt2 for SUCCESS*/
res = axutil_date_time_compare(dt1, env, dt2);
@@ -320,7 +237,6 @@
return AXIS2_FAILURE;
}
-#endif
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
