You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ka...@apache.org on 2006/12/12 07:36:29 UTC
svn commit: r486046 - in /webservices/axis2/trunk/c: modules/core/engine/
rampart/samples/ rampart/samples/client/enc_echo/
rampart/src/omxmlsec/openssl/ rampart/src/util/
Author: kaushalye
Date: Mon Dec 11 22:36:28 2006
New Revision: 486046
URL: http://svn.apache.org/viewvc?view=rev&rev=486046
Log:
Fixed bug in JIRA AXIS2C-456
Plus some minor modifications in rampart
Modified:
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/rampart/samples/client/enc_echo/deploy_client_repo.sh
webservices/axis2/trunk/c/rampart/samples/client/enc_echo/echo.c
webservices/axis2/trunk/c/rampart/samples/configure.ac
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c
webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=486046&r1=486045&r2=486046
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Dec 11 22:36:28 2006
@@ -432,6 +432,14 @@
return NULL;
}
+ config_impl->handlers = axis2_array_list_create(env, 0);
+ if (NULL == config_impl->handlers)
+ {
+ axis2_conf_free(&(config_impl->conf), env);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
config_impl->in_phases_upto_and_including_post_dispatch =
axis2_array_list_create(env, 0);
if (NULL == config_impl->in_phases_upto_and_including_post_dispatch)
@@ -442,12 +450,25 @@
}
else
{
+ axis2_disp_t *uri_dispatch = NULL;
+
phase = axis2_phase_create(env, AXIS2_PHASE_TRANSPORTIN);
if (NULL == phase)
{
axis2_conf_free(&(config_impl->conf), env);
return NULL;
}
+ uri_dispatch = axis2_req_uri_disp_create(env);
+ if (uri_dispatch)
+ {
+ axis2_handler_t *handler = NULL;
+ handler = AXIS2_DISP_GET_BASE(uri_dispatch, env);
+ AXIS2_DISP_FREE(uri_dispatch, env);
+ AXIS2_PHASE_ADD_HANDLER_AT(phase, env, 0, handler);
+ AXIS2_ARRAY_LIST_ADD(config_impl->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
+ handler = NULL;
+ }
+
status = AXIS2_ARRAY_LIST_ADD(config_impl->
in_phases_upto_and_including_post_dispatch, env, phase);
if (AXIS2_FAILURE == status)
@@ -473,13 +494,6 @@
}
}
- config_impl->handlers = axis2_array_list_create(env, 0);
- if (NULL == config_impl->handlers)
- {
- axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
config_impl->all_svcs = axis2_hash_make(env);
if (NULL == config_impl->all_svcs)
Modified: webservices/axis2/trunk/c/rampart/samples/client/enc_echo/deploy_client_repo.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/enc_echo/deploy_client_repo.sh?view=diff&rev=486046&r1=486045&r2=486046
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/enc_echo/deploy_client_repo.sh (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/enc_echo/deploy_client_repo.sh Mon Dec 11 22:36:28 2006
@@ -29,3 +29,4 @@
echo "Copying latest modules to client_repo"
cp -r $AXIS2C_HOME/modules $CLIENT_REPO/
+echo "WARNING: Make sure that you have correct configurations in server/client axis2.xml files"
Modified: webservices/axis2/trunk/c/rampart/samples/client/enc_echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/enc_echo/echo.c?view=diff&rev=486046&r1=486045&r2=486046
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/enc_echo/echo.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/enc_echo/echo.c Mon Dec 11 22:36:28 2006
@@ -66,8 +66,8 @@
AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
AXIS2_OPTIONS_SET_ACTION(options, env,
"http://ws.apache.org/axis2/c/samples/echoString");
-
-
+ /*Added*/
+ AXIS2_OPTIONS_SET_SOAP_ACTION(options, env, "urn:echo");
/*
* Set security params. If you need to enable dynamic settings uncomment
Modified: webservices/axis2/trunk/c/rampart/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/configure.ac?view=diff&rev=486046&r1=486045&r2=486046
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/configure.ac (original)
+++ webservices/axis2/trunk/c/rampart/samples/configure.ac Mon Dec 11 22:36:28 2006
@@ -81,7 +81,6 @@
client/Makefile
client/enc_echo/Makefile \
client/enc_echo/data/Makefile \
- client/enc_echo/keys/Makefile \
client/echo/Makefile \
client/echo/data/Makefile
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c?view=diff&rev=486046&r1=486045&r2=486046
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c Mon Dec 11 22:36:28 2006
@@ -57,10 +57,12 @@
/*Init ctx*/
EVP_CIPHER_CTX_init(&ctx);
ret = EVP_CipherInit_ex(&ctx, (EVP_CIPHER *)OPENSSL_CIPHER_CTX_GET_CIPHER(oc_ctx, env), NULL, NULL, NULL, do_encrypt);
-
+
+ /*EVP_CIPHER_CTX_set_padding(&ctx, 1);*/
+
ret = EVP_CipherInit_ex(&ctx, NULL, NULL, key_data,
/*(unsigned char*)OPENSSL_CIPHER_CTX_GET_IV(oc_ctx, env),*/
- NULL,/*NULL instead of IV. Here we do not use IV*/
+ NULL, /*>>NULL instead of IV. Here we do not use IV*/
do_encrypt);
for (;;)
{
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=486046&r1=486045&r2=486046
==============================================================================
--- 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 Mon Dec 11 22:36:28 2006
@@ -98,39 +98,6 @@
}
}
-#if 0
-static axis2_char_t*
-rampart_shp_callback_encuser_password(const axis2_env_t *env,
- rampart_actions_t *actions,
- axis2_msg_ctx_t *msg_ctx)
-{
- axis2_char_t *enc_user = NULL;
- axis2_char_t *pw_callback_module = NULL;
- axis2_char_t *password = NULL;
- axis2_ctx_t *ctx = NULL;
-
- enc_user = RAMPART_ACTIONS_GET_ENC_USER(actions, env);
- pw_callback_module = RAMPART_ACTIONS_GET_PW_CB_CLASS(actions, env);
- if(!pw_callback_module){
- return NULL;
- }
- if(!enc_user){
- /*If a special enc_user hasn't specified try to get the user.
- * But it is advisable to use enc_user instead of user.*/
- enc_user = RAMPART_ACTIONS_GET_USER(actions, env);
- if(!enc_user){
- return NULL;
- }
- }
- /*Get axis2_ctx_t. This is for designed specially for PHP*/
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
-
- password = rampart_callback_password(env, pw_callback_module, enc_user, ctx);
-
- return password;
-}
-#endif
-
static axis2_status_t
rampart_shp_process_encrypted_key(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org