Author: kaushalye
Date: Fri Jan 25 01:17:29 2008
New Revision: 615157
URL: http://svn.apache.org/viewvc?rev=615157&view=rev
Log:
1. Fixing build break
2. modifying samples
Modified:
webservices/rampart/trunk/c/samples/client/Makefile.am
webservices/rampart/trunk/c/samples/server/Makefile.am
webservices/rampart/trunk/c/samples/server/sec_echo/echo.c
webservices/rampart/trunk/c/samples/server/sec_echo/echo.h
webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c
webservices/rampart/trunk/c/src/omxmlsec/encryption.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c
webservices/rampart/trunk/c/src/util/rampart_crypto_util.c
Modified: webservices/rampart/trunk/c/samples/client/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/Makefile.am?rev=615157&r1=615156&r2=615157&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/Makefile.am Fri Jan 25 01:17:29
2008
@@ -1,3 +1,3 @@
TESTS =
-SUBDIRS = sec_echo
+SUBDIRS = sec_echo
Modified: webservices/rampart/trunk/c/samples/server/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/Makefile.am?rev=615157&r1=615156&r2=615157&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/Makefile.am Fri Jan 25 01:17:29
2008
@@ -1,4 +1,5 @@
samplesdir=$(prefix)/samples/server
+#SUBDIRS = sec_echo manuf
SUBDIRS = sec_echo
#EXTRA_DIST = axis2.xml axis2.log
#samples_DATA= Makefile.am Makefile.in
Modified: webservices/rampart/trunk/c/samples/server/sec_echo/echo.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/sec_echo/echo.c?rev=615157&r1=615156&r2=615157&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/sec_echo/echo.c (original)
+++ webservices/rampart/trunk/c/samples/server/sec_echo/echo.c Fri Jan 25
01:17:29 2008
@@ -23,7 +23,7 @@
build_om_programatically(const axutil_env_t *env, axis2_char_t *text);
axiom_node_t *
-axis2_echo_echo(const axutil_env_t *env, axiom_node_t *node)
+axis2_echo_echo(const axutil_env_t *env, axiom_node_t *node, axis2_msg_ctx_t
*msg_ctx)
{
axiom_node_t *ret_node = NULL;
axis2_char_t *name = NULL;
@@ -31,6 +31,15 @@
name = axiom_util_get_localname(node, env);
AXIS2_LOG_INFO(env->log, "[rampart][sec_echo_service] Recieved node %s",
name);
+/*
+ * This shows how to acces the security processed results from the message
context
+ {
+ axis2_char_t *username = NULL;
+
+ username = (axis2_char_t*)rampart_get_security_processed_result(env,
msg_ctx, "SPR_UT_username");
+ printf("Username of the Token is = %s ", username);
+ }
+*/
ret_node = build_om_programatically(env, name);
return ret_node;
}
Modified: webservices/rampart/trunk/c/samples/server/sec_echo/echo.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/sec_echo/echo.h?rev=615157&r1=615156&r2=615157&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/sec_echo/echo.h (original)
+++ webservices/rampart/trunk/c/samples/server/sec_echo/echo.h Fri Jan 25
01:17:29 2008
@@ -25,6 +25,6 @@
#include <axiom_node.h>
#include <axiom_element.h>
-axiom_node_t *axis2_echo_echo(const axutil_env_t *env, axiom_node_t *node);
+axiom_node_t *axis2_echo_echo(const axutil_env_t *env, axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx);
#endif /* CALC_H*/
Modified: webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c?rev=615157&r1=615156&r2=615157&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c
(original)
+++ webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c Fri Jan
25 01:17:29 2008
@@ -100,7 +100,7 @@
* math sample.
*/
- return axis2_echo_echo(env, node);
+ return axis2_echo_echo(env, node, msg_ctx);
}
/* On fault, handle the fault */
Modified: webservices/rampart/trunk/c/src/omxmlsec/encryption.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/encryption.c?rev=615157&r1=615156&r2=615157&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/encryption.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/encryption.c Fri Jan 25 01:17:29
2008
@@ -296,7 +296,7 @@
axutil_base64_decode_len(
(char*)oxs_buffer_get_data(input, env)));
- ret = axutil_base64_decode_binary((char*)decoded_encrypted_str,
+ ret = axutil_base64_decode_binary(decoded_encrypted_str,
(char*)oxs_buffer_get_data(input, env));
dec_enc_buf = oxs_buffer_create(env);
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c?rev=615157&r1=615156&r2=615157&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c Fri Jan 25 01:17:29
2008
@@ -207,7 +207,7 @@
oxs_key_set_nonce(derived_key, env, seed);
decoded_seed_len = axutil_base64_decode_len(seed);
decoded_seed = AXIS2_MALLOC(env->allocator, decoded_seed_len);
- axutil_base64_decode_binary(decoded_seed, seed);
+ axutil_base64_decode_binary((unsigned char*)decoded_seed, seed);
AXIS2_FREE(env->allocator, seed);
seed = NULL;
}
@@ -215,7 +215,7 @@
{
decoded_seed_len = axutil_base64_decode_len(seed);
decoded_seed = AXIS2_MALLOC(env->allocator, decoded_seed_len);
- axutil_base64_decode_binary(decoded_seed, seed);
+ axutil_base64_decode_binary((unsigned char*)decoded_seed, seed);
}
if(decoded_seed)
Modified: webservices/rampart/trunk/c/src/util/rampart_crypto_util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_crypto_util.c?rev=615157&r1=615156&r2=615157&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_crypto_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_crypto_util.c Fri Jan 25
01:17:29 2008
@@ -47,7 +47,7 @@
int ret;
decoded_nonce_length = axutil_base64_decode_len(nonce);
decoded_nonce = AXIS2_MALLOC(env->allocator, decoded_nonce_length);
- ret = axutil_base64_decode_binary(decoded_nonce, nonce);
+ ret = axutil_base64_decode_binary((unsigned char *)decoded_nonce,
nonce);
}
if ((!nonce) && (!created))
