Author: shankar
Date: Fri Feb 8 02:41:26 2008
New Revision: 619827
URL: http://svn.apache.org/viewvc?rev=619827&view=rev
Log:
secure conversation implementation - solving compilation problem on linux
Modified:
webservices/rampart/trunk/c/configure.ac
webservices/rampart/trunk/c/samples/client/sec_echo/echo.c
webservices/rampart/trunk/c/samples/client/sec_echo/update_n_run.sh
webservices/rampart/trunk/c/samples/configure.ac
webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c
webservices/rampart/trunk/c/samples/server/secconv_echo/echo.c
webservices/rampart/trunk/c/src/Makefile.am
webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c
webservices/rampart/trunk/c/src/secconv/sct_provider.c
webservices/rampart/trunk/c/src/secconv/security_context_token.c
webservices/rampart/trunk/c/src/trust/sts_client.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
webservices/rampart/trunk/c/src/util/rampart_signature.c
webservices/rampart/trunk/c/src/util/rampart_util.c
Modified: webservices/rampart/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/configure.ac?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/configure.ac (original)
+++ webservices/rampart/trunk/c/configure.ac Fri Feb 8 02:41:26 2008
@@ -140,6 +140,7 @@
src/core/Makefile \
src/trust/Makefile \
src/util/Makefile \
+ src/secconv/Makefile \
test/Makefile \
test/omxmlsec/Makefile \
test/c14n/Makefile \
Modified: webservices/rampart/trunk/c/samples/client/sec_echo/echo.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/sec_echo/echo.c?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/sec_echo/echo.c (original)
+++ webservices/rampart/trunk/c/samples/client/sec_echo/echo.c Fri Feb 8
02:41:26 2008
@@ -70,7 +70,7 @@
options = axis2_options_create(env);
axis2_options_set_to(options, env, endpoint_ref);
axis2_options_set_action(options, env,
- "http://example.com/ws/2004/09/policy/Test/EchoRequest";);
+ "http://xmlsoap.org/Ping";);
/*axis2_options_set_action(options, env,
"urn:echo");*/
@@ -200,12 +200,13 @@
axiom_namespace_t *ns1 = NULL;
axis2_char_t *om_str = NULL;
- ns1 = axiom_namespace_create(env,
"http://ws.apache.org/rampart/c/samples";, "ns1");
- echo_om_ele = axiom_element_create(env, NULL, "echoIn", ns1,
&echo_om_node);
+ ns1 = axiom_namespace_create(env, "http://xmlsoap.org/Ping";, "ns0");
+ echo_om_ele = axiom_element_create(env, NULL, "Ping", ns1, &echo_om_node);
- text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL,
&text_om_node);
- axiom_element_set_text(text_om_ele, env, "Hello", text_om_node);
+ /*text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL,
&text_om_node);
+ */
+ axiom_element_set_text(echo_om_ele, env, "Hello", echo_om_node);
om_str = axiom_node_to_string(echo_om_node, env);
if (om_str){
Modified: webservices/rampart/trunk/c/samples/client/sec_echo/update_n_run.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/sec_echo/update_n_run.sh?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/sec_echo/update_n_run.sh
(original)
+++ webservices/rampart/trunk/c/samples/client/sec_echo/update_n_run.sh Fri Feb
8 02:41:26 2008
@@ -8,3 +8,6 @@
#RUN
./echo http://localhost:9090/axis2/services/sec_echo/echoString $CLIENT_REPO
+#./echo http://192.168.1.57:1110/services/UsernameForCertificateSign
$CLIENT_REPO
+#./echo http://localhost:9090/services/UsernameForCertificateSign $CLIENT_REPO
+#./echo http://localhost:9090/services/MutualCertificate10SignEncrypt
$CLIENT_REPO
Modified: webservices/rampart/trunk/c/samples/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/configure.ac?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/configure.ac (original)
+++ webservices/rampart/trunk/c/samples/configure.ac Fri Feb 8 02:41:26 2008
@@ -109,10 +109,12 @@
callback/htpasswd_callback/Makefile \
authn_provider/Makefile \
replay_detector/Makefile \
+ sct_provider/Makefile \
credential_provider/Makefile \
server/Makefile \
server/sec_echo/Makefile \
server/saml_sts/Makefile \
+ server/secconv_echo/Makefile \
client/Makefile
client/sec_echo/Makefile \
client/sec_echo/data/Makefile \
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=619827&r1=619826&r2=619827&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 Feb
8 02:41:26 2008
@@ -99,7 +99,7 @@
* To see how to deal with multiple impl methods, have a look at the
* math sample.
*/
-
+ AXIS2_LOG_INFO(env->log,"%s:%d",__FILE__, __LINE__);
return axis2_echo_echo(env, node, msg_ctx);
}
Modified: webservices/rampart/trunk/c/samples/server/secconv_echo/echo.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/secconv_echo/echo.c?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/secconv_echo/echo.c (original)
+++ webservices/rampart/trunk/c/samples/server/secconv_echo/echo.c Fri Feb 8
02:41:26 2008
@@ -32,7 +32,7 @@
axiom_node_t *
build_om_programatically(const axutil_env_t *env, axis2_char_t *text);
-axutil_hash_t *
+static axutil_hash_t *
secconv_echo_get_sct_db(const axutil_env_t *env, axis2_msg_ctx_t* msg_ctx);
axiom_node_t *
@@ -107,13 +107,13 @@
}
/*check whether rst is valid and can be processed*/
- token_type = trust_rst_get_token_type(rst, env, node);
+ token_type = trust_rst_get_token_type(rst, env);
if((!token_type) || (0 != axutil_strcmp(token_type,
OXS_VALUE_TYPE_SECURITY_CONTEXT_TOKEN)))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][secconv_service]
token type is not valid");
return NULL;
}
- request_type = trust_rst_get_request_type(rst, env, node);
+ request_type = trust_rst_get_request_type(rst, env);
if(!request_type) /*|| (0 != axutil_strcmp(request_type,
TRUST_REQ_TYPE_ISSUE)))*/
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][secconv_service]
request type is not valid");
@@ -208,4 +208,5 @@
}
return db;
-}
\ No newline at end of file
+}
+
Modified: webservices/rampart/trunk/c/src/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/Makefile.am?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/Makefile.am Fri Feb 8 02:41:26 2008
@@ -1 +1 @@
-SUBDIRS = omxmlsec handlers util core data trust secconv
+SUBDIRS = omxmlsec handlers util secconv core data trust
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?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c (original)
+++ webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c Fri Feb 8
02:41:26 2008
@@ -73,7 +73,7 @@
axis2_status_t status = AXIS2_FAILURE;
axiom_node_t *sec_node = NULL;
rampart_context_t *rampart_context = NULL;
- axis2_bool_t serverside = AXIS2_FALSE;
+ /*axis2_bool_t serverside = AXIS2_FALSE;*/
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
Modified: webservices/rampart/trunk/c/src/secconv/sct_provider.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secconv/sct_provider.c?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/secconv/sct_provider.c (original)
+++ webservices/rampart/trunk/c/src/secconv/sct_provider.c Fri Feb 8 02:41:26
2008
@@ -35,7 +35,7 @@
sct_id = rampart_context_get_signature_sct_id(rampart_context,
env);
}
- sct_provider = rampart_context_get_sct_provider(rampart_context, env);
+ sct_provider =
(rampart_sct_provider_t*)rampart_context_get_sct_provider(rampart_context, env);
if(!sct_provider)
{
AXIS2_LOG_INFO(env->log, "[rampart][sct_provider] Security context
token provider module is not set");
Modified: webservices/rampart/trunk/c/src/secconv/security_context_token.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secconv/security_context_token.c?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/secconv/security_context_token.c (original)
+++ webservices/rampart/trunk/c/src/secconv/security_context_token.c Fri Feb 8
02:41:26 2008
@@ -352,4 +352,6 @@
axiom_node_t *node)
{
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
+
+
Modified: webservices/rampart/trunk/c/src/trust/sts_client.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/trust/sts_client.c?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/trust/sts_client.c (original)
+++ webservices/rampart/trunk/c/src/trust/sts_client.c Fri Feb 8 02:41:26 2008
@@ -441,4 +441,5 @@
}
return;
-}
\ No newline at end of file
+}
+
Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
(original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c Fri Feb
8 02:41:26 2008
@@ -970,7 +970,6 @@
axiom_node_t *envelope_node = NULL;
axiom_node_t *key_info_node = NULL;
oxs_key_t *key_to_verify = NULL;
- axis2_char_t *key_name = NULL;
/*Get the envelope node*/
envelope_node = axiom_soap_envelope_get_base_node(soap_envelope, env);
Modified: webservices/rampart/trunk/c/src/util/rampart_signature.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_signature.c?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_signature.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_signature.c Fri Feb 8
02:41:26 2008
@@ -497,9 +497,6 @@
axis2_bool_t is_direct_reference = AXIS2_TRUE;
axis2_bool_t include = AXIS2_FALSE;
axiom_node_t *key_reference_node = NULL;
- int i = 0;
- oxs_x509_cert_t *cert = NULL;
- axiom_node_t *bst_node = NULL;
axis2_char_t *cert_id = NULL;
/*Get nodes to be signed*/
Modified: webservices/rampart/trunk/c/src/util/rampart_util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_util.c?rev=619827&r1=619826&r2=619827&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_util.c Fri Feb 8 02:41:26 2008
@@ -330,4 +330,6 @@
}
return AXIS2_FALSE;
-}
\ No newline at end of file
+}
+
+
