You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ka...@apache.org on 2007/03/22 06:54:51 UTC
svn commit: r521125 - in /webservices/axis2/trunk/c/rampart:
include/oxs_ctx.h src/omxmlsec/ctx.c
Author: kaushalye
Date: Wed Mar 21 22:54:49 2007
New Revision: 521125
URL: http://svn.apache.org/viewvc?view=rev&rev=521125
Log:
Code cleaning in OMXMLSecurity
Modified:
webservices/axis2/trunk/c/rampart/include/oxs_ctx.h
webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c
Modified: webservices/axis2/trunk/c/rampart/include/oxs_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_ctx.h?view=diff&rev=521125&r1=521124&r2=521125
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_ctx.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_ctx.h Wed Mar 21 22:54:49 2007
@@ -206,55 +206,6 @@
oxs_ctx_t *ctx,
const axis2_env_t *env
);
-
- /**
- *
- * @param ctx The OMXMLSecurity context
- * @param env pointer to environment struct
- * @return of the context
- */
- axiom_node_t *(AXIS2_CALL *
- get_enc_data_node)(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
- );
-
- /**
- *
- * @param ctx The OMXMLSecurity context
- * @param env pointer to environment struct
- * @return of the context
- */
- axiom_node_t *(AXIS2_CALL *
- get_enc_method_node)(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
- );
-
- /**
- *
- * @param ctx The OMXMLSecurity context
- * @param env pointer to environment struct
- * @return of the context
- */
- axiom_node_t *(AXIS2_CALL *
- get_key_info_node)(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
- );
-
- /**
- *
- * @param ctx The OMXMLSecurity context
- * @param env pointer to environment struct
- * @return of the context
- */
- axiom_node_t *(AXIS2_CALL *
- get_cipher_value_node)(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
- );
-
/**
*
* @param ctx The OMXMLSecurity context
@@ -407,63 +358,6 @@
const axis2_env_t *env,
axis2_char_t *input_data
);
-
- /**
- *
- * @param ctx The OMXMLSecurity context
- * @param env pointer to environment struct
- * @param enc_data_node reference to the EncryptionData node
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_enc_data_node)(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *enc_data_node
- );
-
- /**
- *
- * @param ctx The OMXMLSecurity context
- * @param env pointer to environment struct
- * @param enc_method_node reference to the EncryptionMethod node
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_enc_method_node)(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *enc_method_node
- );
-
- /**
- *
- * @param ctx The OMXMLSecurity context
- * @param env pointer to environment struct
- * @param key_info_node reference to the KeyInfo node
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_key_info_node)(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *key_info_node
- );
-
- /**
- *
- * @param ctx The OMXMLSecurity context
- * @param env pointer to environment struct
- * @param cipher_value_node reference to the cipherValue node
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_cipher_value_node)(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *cipher_value_node
- );
-
};
struct oxs_ctx
@@ -514,18 +408,6 @@
#define OXS_CTX_GET_INPUT_DATA(ctx, env) \
((ctx)->ops->get_input_data(ctx, env) )
-#define OXS_CTX_GET_ENC_DATA_NODE(ctx, env) \
- ((ctx)->ops->get_enc_data_node(ctx, env) )
-
-#define OXS_CTX_GET_ENC_METHOD_NODE(ctx, env) \
- ((ctx)->ops->get_enc_method_node(ctx, env) )
-
-#define OXS_CTX_GET_KEY_INFO_NODE(ctx, env) \
- ((ctx)->ops->get_key_info_node(ctx, env) )
-
-#define OXS_CTX_GET_CIPHER_VALUE_NODE(ctx, env) \
- ((ctx)->ops->get_cipher_value_node(ctx, env) )
-
#define OXS_CTX_SET_MODE(ctx, env, mode) \
((ctx)->ops->set_mode(ctx, env, mode) )
@@ -559,19 +441,6 @@
#define OXS_CTX_SET_INPUT_DATA(ctx, env, input_data) \
((ctx)->ops->set_input_data(ctx, env, input_data) )
-#define OXS_CTX_SET_ENC_DATA_NODE(ctx, env, enc_data_node) \
- ((ctx)->ops->set_enc_data_node(ctx, env, enc_data_node) )
-
-#define OXS_CTX_SET_ENC_METHOD_NODE(ctx, env, enc_method_node) \
- ((ctx)->ops->set_enc_method_node(ctx, env, enc_method_node) )
-
-#define OXS_CTX_SET_KEY_INFO_NODE(ctx, env, key_info_node) \
- ((ctx)->ops->set_key_info_node(ctx, env, key_info_node) )
-
-#define OXS_CTX_SET_CIPHER_VALUE_NODE(ctx, env, cipher_value_node) \
- ((ctx)->ops->set_cipher_value_node(ctx, env, cipher_value_node) )
-
-
/** @} */
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c?view=diff&rev=521125&r1=521124&r2=521125
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c Wed Mar 21 22:54:49 2007
@@ -48,11 +48,6 @@
/*Used in decryption process to keep the data to be decrypted*/
axis2_char_t* input_data;
- /*TODO: Not in use. Remove later*/
- axiom_node_t* enc_data_node;
- axiom_node_t* enc_method_node;
- axiom_node_t* key_info_node;
- axiom_node_t* cipher_value_node;
}
oxs_ctx_impl_t;
@@ -138,31 +133,6 @@
oxs_ctx_t *ctx,
const axis2_env_t *env
);
-
-axiom_node_t *AXIS2_CALL
-oxs_ctx_get_enc_data_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
-);
-
-axiom_node_t *AXIS2_CALL
-oxs_ctx_get_enc_method_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
-);
-
-axiom_node_t *AXIS2_CALL
-oxs_ctx_get_key_info_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
-);
-
-axiom_node_t *AXIS2_CALL
-oxs_ctx_get_cipher_value_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
-);
-
axis2_status_t AXIS2_CALL
oxs_ctx_set_mode(
oxs_ctx_t *ctx,
@@ -240,35 +210,6 @@
axis2_char_t *input_data
);
-axis2_status_t AXIS2_CALL
-oxs_ctx_set_enc_data_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *enc_data_node
-);
-
-axis2_status_t AXIS2_CALL
-oxs_ctx_set_enc_method_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *enc_method_node
-);
-
-axis2_status_t AXIS2_CALL
-oxs_ctx_set_key_info_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *key_info_node
-);
-
-axis2_status_t AXIS2_CALL
-oxs_ctx_set_cipher_value_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *cipher_value_node
-);
-
-
/******************* end of function headers ******************************/
AXIS2_EXTERN oxs_ctx_t *AXIS2_CALL
oxs_ctx_create(const axis2_env_t *env)
@@ -294,10 +235,6 @@
ctx_impl->carried_key_name = NULL;
ctx_impl->enc_mtd_algorithm = NULL;
ctx_impl->input_data = NULL;
- ctx_impl->enc_data_node = NULL;
- ctx_impl->enc_method_node = NULL;
- ctx_impl->key_info_node = NULL;
- ctx_impl->cipher_value_node = NULL;
ctx_impl->ctx.ops = AXIS2_MALLOC(env->allocator, sizeof(oxs_ctx_ops_t));
@@ -331,10 +268,6 @@
ctx->ops->get_carried_key_name = oxs_ctx_get_carried_key_name ;
ctx->ops->get_enc_mtd_algorithm = oxs_ctx_get_enc_mtd_algorithm ;
ctx->ops->get_input_data = oxs_ctx_get_input_data ;
- ctx->ops->get_enc_data_node = oxs_ctx_get_enc_data_node ;
- ctx->ops->get_enc_method_node = oxs_ctx_get_enc_method_node ;
- ctx->ops->get_key_info_node = oxs_ctx_get_key_info_node ;
- ctx->ops->get_cipher_value_node = oxs_ctx_get_cipher_value_node ;
ctx->ops->set_mode = oxs_ctx_set_mode ;
ctx->ops->set_operation = oxs_ctx_set_operation ;
@@ -347,10 +280,6 @@
ctx->ops->set_carried_key_name = oxs_ctx_set_carried_key_name ;
ctx->ops->set_enc_mtd_algorithm = oxs_ctx_set_enc_mtd_algorithm ;
ctx->ops->set_input_data = oxs_ctx_set_input_data ;
- ctx->ops->set_enc_data_node = oxs_ctx_set_enc_data_node ;
- ctx->ops->set_enc_method_node = oxs_ctx_set_enc_method_node ;
- ctx->ops->set_key_info_node = oxs_ctx_set_key_info_node ;
- ctx->ops->set_cipher_value_node = oxs_ctx_set_cipher_value_node ;
}
/*public functions*/
@@ -574,62 +503,6 @@
}
-axiom_node_t *AXIS2_CALL
-oxs_ctx_get_enc_data_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
-)
-{
- oxs_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
- ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
-
- return ctx_impl->enc_data_node ;
-}
-
-
-axiom_node_t *AXIS2_CALL
-oxs_ctx_get_enc_method_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
-)
-{
- oxs_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
- ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
-
- return ctx_impl->enc_method_node ;
-}
-
-
-axiom_node_t *AXIS2_CALL
-oxs_ctx_get_key_info_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
-)
-{
- oxs_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
- ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
-
- return ctx_impl->key_info_node ;
-}
-
-
-axiom_node_t *AXIS2_CALL
-oxs_ctx_get_cipher_value_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env
-)
-{
- oxs_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
- ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
-
- return ctx_impl->cipher_value_node ;
-}
-
-
axis2_status_t AXIS2_CALL
oxs_ctx_set_mode(
oxs_ctx_t *ctx,
@@ -858,92 +731,4 @@
return AXIS2_SUCCESS;
}
-
-axis2_status_t AXIS2_CALL
-oxs_ctx_set_enc_data_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *enc_data_node
-)
-{
- oxs_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
- if (ctx_impl->enc_data_node)
- {
- AXIS2_FREE(env->allocator, ctx_impl->enc_data_node);
- ctx_impl->enc_data_node = NULL;
- }
- ctx_impl->enc_data_node = enc_data_node ;
-
- return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL
-oxs_ctx_set_enc_method_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *enc_method_node
-)
-{
- oxs_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
- if (ctx_impl->enc_method_node)
- {
- AXIS2_FREE(env->allocator, ctx_impl->enc_method_node);
- ctx_impl->enc_method_node = NULL;
- }
- ctx_impl->enc_method_node = enc_method_node ;
-
- return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL
-oxs_ctx_set_key_info_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *key_info_node
-)
-{
- oxs_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
- if (ctx_impl->key_info_node)
- {
- AXIS2_FREE(env->allocator, ctx_impl->key_info_node);
- ctx_impl->key_info_node = NULL;
- }
- ctx_impl->key_info_node = key_info_node ;
-
- return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL
-oxs_ctx_set_cipher_value_node(
- oxs_ctx_t *ctx,
- const axis2_env_t *env,
- axiom_node_t *cipher_value_node
-)
-{
- oxs_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
- if (ctx_impl->cipher_value_node)
- {
- AXIS2_FREE(env->allocator, ctx_impl->cipher_value_node);
- ctx_impl->cipher_value_node = NULL;
- }
- ctx_impl->cipher_value_node = cipher_value_node ;
-
- return AXIS2_SUCCESS;
-}
-
-
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org