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/09/18 06:36:40 UTC
svn commit: r447234 - in /webservices/axis2/trunk/c/rampart:
include/rampart_crypto_engine.h samples/client/enc_echo/echo.c
src/util/username_token.c
Author: kaushalye
Date: Sun Sep 17 21:36:39 2006
New Revision: 447234
URL: http://svn.apache.org/viewvc?view=rev&rev=447234
Log:
Committing changes made
Modified:
webservices/axis2/trunk/c/rampart/include/rampart_crypto_engine.h
webservices/axis2/trunk/c/rampart/samples/client/enc_echo/echo.c
webservices/axis2/trunk/c/rampart/src/util/username_token.c
Modified: webservices/axis2/trunk/c/rampart/include/rampart_crypto_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rampart_crypto_engine.h?view=diff&rev=447234&r1=447233&r2=447234
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rampart_crypto_engine.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rampart_crypto_engine.h Sun Sep 17 21:36:39 2006
@@ -55,6 +55,18 @@
rampart_crypto_engine_t *engine,
const axis2_env_t *env);
+ /**
+ * Encrypts a message depending on the information in the SOAP header.
+ * Encryption algorithm, How to retrieve the key all these will be determined
+ * by inspecting hte header elements.
+ * @param engine pointer to engine
+ * @param env pointer to environment struct
+ * @param msg_ctx message context
+ * @param actions actions defined in the descriptor file
+ * @param soap_envelope the SOAP envelope
+ * @param sec_node The security element
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
axis2_status_t (AXIS2_CALL *
encrypt_message) (
rampart_crypto_engine_t *engine,
@@ -65,6 +77,18 @@
axiom_node_t *sec_node
);
+ /**
+ * Decrypts a message depending on the information in the SOAP header.
+ * Dncryption algorithm, How to retrieve the key all these will be determined
+ * by inspecting the header elements.
+ * @param engine pointer to engine
+ * @param env pointer to environment struct
+ * @param msg_ctx message context
+ * @param actions actions defined in the descriptor file
+ * @param soap_envelope the SOAP envelope
+ * @param sec_node The security element
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
axis2_status_t (AXIS2_CALL *
decrypt_message) (
rampart_crypto_engine_t *engine,
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=447234&r1=447233&r2=447234
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/enc_echo/echo.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/enc_echo/echo.c Sun Sep 17 21:36:39 2006
@@ -136,11 +136,12 @@
AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
- if (endpoint_ref)
+/* if (endpoint_ref)
{
AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env);
endpoint_ref = NULL;
}
+*/
return 0;
}
Modified: webservices/axis2/trunk/c/rampart/src/util/username_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/username_token.c?view=diff&rev=447234&r1=447233&r2=447234
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/username_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/username_token.c Sun Sep 17 21:36:39 2006
@@ -280,13 +280,8 @@
if(0 == AXIS2_STRCMP(password_type, RAMPART_PASSWORD_DIGEST) )
{
axiom_namespace_t *dec_ns = NULL;
- #if 1
nonce_val = rampart_generate_nonce(env) ;
created_val = rampart_generate_time(env,0);
- #else
- nonce_val = NULL;
- created_val = NULL;
- #endif
digest_val = rampart_crypto_sha1(env, nonce_val, created_val, password);
pw_ele = axiom_element_create (env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_PASSWORD, sec_ns_obj,
@@ -309,7 +304,6 @@
om_attr, pw_node);
}
- #if 1
nonce_ele = axiom_element_create (env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_NONCE, sec_ns_obj,
&nonce_node);
if(NULL != nonce_ele)
@@ -320,11 +314,6 @@
RAMPART_WSSE_XMLNS,
RAMPART_WSSE);
}
- #else
- nonce_ele = NULL;
- nonce_node = NULL;
- #endif
- #if 1
created_ele = axiom_element_create (env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_CREATED, sec_ns_obj,
&created_node);
if(NULL != created_ele)
@@ -338,16 +327,7 @@
AXIOM_ELEMENT_SET_NAMESPACE(created_ele, env, wsu_ns_obj, created_node);
}
- #else
- created_ele = NULL;
- created_node = NULL;
- #endif
- /*
- AXIS2_FREE(env->allocator, nonce_val);
- AXIS2_FREE(env->allocator, created_val);
- AXIS2_FREE(env->allocator, digest_val);
- */
}else /*default is passwordText*/
{
pw_ele = axiom_element_create (env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_PASSWORD, sec_ns_obj,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org