You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ka...@apache.org on 2007/04/03 08:05:24 UTC
svn commit: r525047 - in /webservices/rampart/trunk/c/src:
core/mod_rampart.c handlers/rampart_in_handler.c
handlers/rampart_out_handler.c omxmlsec/key_mgr.c
Author: kaushalye
Date: Mon Apr 2 23:05:23 2007
New Revision: 525047
URL: http://svn.apache.org/viewvc?view=rev&rev=525047
Log:
Fixing build breaks due to changes in Axis2/C
Modified:
webservices/rampart/trunk/c/src/core/mod_rampart.c
webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c
webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c
webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c
Modified: webservices/rampart/trunk/c/src/core/mod_rampart.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/core/mod_rampart.c?view=diff&rev=525047&r1=525046&r2=525047
==============================================================================
--- webservices/rampart/trunk/c/src/core/mod_rampart.c (original)
+++ webservices/rampart/trunk/c/src/core/mod_rampart.c Mon Apr 2 23:05:23 2007
@@ -32,6 +32,12 @@
mod_rampart_fill_handler_create_func_map(axis2_module_t *module,
const axutil_env_t *env);
+static const axis2_module_ops_t addr_module_ops_var = {
+ mod_rampart_init,
+ mod_rampart_shutdown,
+ mod_rampart_fill_handler_create_func_map
+ };
+
axis2_module_t *
mod_rampart_create(const axutil_env_t *env)
{
@@ -40,14 +46,7 @@
sizeof(axis2_module_t));
- module->ops = AXIS2_MALLOC(
- env->allocator, sizeof(axis2_module_ops_t));
-
- module->ops->shutdown = mod_rampart_shutdown;
- module->ops->init = mod_rampart_init;
- module->ops->fill_handler_create_func_map =
- mod_rampart_fill_handler_create_func_map;
-
+ module->ops = &addr_module_ops_var;
return module;
}
Modified: webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c?view=diff&rev=525047&r1=525046&r2=525047
==============================================================================
--- webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c (original)
+++ webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c Mon Apr 2 23:05:23 2007
@@ -59,9 +59,12 @@
{
return NULL;
}
+#if 0
if (handler->ops)
handler->ops->invoke = rampart_in_handler_invoke;
-
+#else
+ axis2_handler_set_invoke(handler, env, rampart_in_handler_invoke);
+#endif
return handler;
}
Modified: webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c?view=diff&rev=525047&r1=525046&r2=525047
==============================================================================
--- webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c (original)
+++ webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c Mon Apr 2 23:05:23 2007
@@ -59,9 +59,12 @@
}
/* set the base struct's invoke op */
+#if 0
if (handler->ops)
handler->ops->invoke = rampart_out_handler_invoke;
-
+#else
+ axis2_handler_set_invoke(handler, env, rampart_out_handler_invoke);
+#endif
return handler;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c?view=diff&rev=525047&r1=525046&r2=525047
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c Mon Apr 2 23:05:23 2007
@@ -280,14 +280,17 @@
"Error reading the PKCS12 Key Store");
return AXIS2_FAILURE;
}
- if(pkey){
- *prv_key = openssl_pkey_create(env);
- openssl_pkey_populate(*prv_key, env, pkey, filename, OPENSSL_PKEY_TYPE_PRIVATE_KEY);
+ if(*prv_key){
+ if(pkey){
+ *prv_key = openssl_pkey_create(env);
+ openssl_pkey_populate(*prv_key, env, pkey, filename, OPENSSL_PKEY_TYPE_PRIVATE_KEY);
+ }
}
- if(c){
- *cert = oxs_key_mgr_convert_to_x509(env, c);
+ if(*cert){
+ if(c){
+ *cert = oxs_key_mgr_convert_to_x509(env, c);
+ }
}
-
return AXIS2_SUCCESS;
}