Author: shankar
Date: Wed Jun 25 05:22:31 2008
New Revision: 671526
URL: http://svn.apache.org/viewvc?rev=671526&view=rev
Log:
modification to rahas - linux compilation
Added:
webservices/rampart/trunk/c/src/rahas/Makefile.am
Modified:
webservices/rampart/trunk/c/configure.ac
webservices/rampart/trunk/c/samples/client/sec_echo/update_n_run.sh
webservices/rampart/trunk/c/samples/secpolicy/run_all.sh
webservices/rampart/trunk/c/samples/secpolicy/test_scen.sh
webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am
webservices/rampart/trunk/c/src/Makefile.am
webservices/rampart/trunk/c/src/rahas/rahas_in_handler.c
webservices/rampart/trunk/c/src/rahas/rahas_request_processor.c
Modified: webservices/rampart/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/configure.ac?rev=671526&r1=671525&r2=671526&view=diff
==============================================================================
--- webservices/rampart/trunk/c/configure.ac (original)
+++ webservices/rampart/trunk/c/configure.ac Wed Jun 25 05:22:31 2008
@@ -142,6 +142,7 @@
src/trust/Makefile \
src/util/Makefile \
src/secconv/Makefile \
+ src/rahas/Makefile \
test/Makefile \
test/omxmlsec/Makefile \
test/c14n/Makefile \
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=671526&r1=671525&r2=671526&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 Wed Jun
25 05:22:31 2008
@@ -7,5 +7,5 @@
cp -r $AXIS2C_HOME/modules/rampart $CLIENT_REPO/modules
#RUN
-./echo http://localhost:9090/axis2/services/sec_echo/echoString $CLIENT_REPO
+./echo http://localhost:9090/axis2/services/sec_echo $CLIENT_REPO
Modified: webservices/rampart/trunk/c/samples/secpolicy/run_all.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/run_all.sh?rev=671526&r1=671525&r2=671526&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/run_all.sh (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/run_all.sh Wed Jun 25
05:22:31 2008
@@ -2,9 +2,9 @@
_SCEN="scenario"
_SMPL_DIR="$PWD"
_PORT=9090
-_SLEEP=3
+_SLEEP=2
#You may change these to scenarios u need to run
-_LST="1 2 3 4 5 6 7 8 9 10 11 12 13 15 16 17 18 19 21 22 23"
+_LST="1 2 3 4 5 6 7 8 9 10 11 12 13 15 16 17 18 19 21 22 23 25 26"
if [ $# -eq 1 ]
then
@@ -28,6 +28,7 @@
cd $AXIS2C_HOME/bin
echo ">Start server @ $_PORT"
./axis2_http_server -p$_PORT &
+ sleep $_SLEEP
#echo "Jump back to samples dir : $_SMPL_DIR"
#cd $_SMPL_DIR
echo ">Go to client directory"
Modified: webservices/rampart/trunk/c/samples/secpolicy/test_scen.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/test_scen.sh?rev=671526&r1=671525&r2=671526&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/test_scen.sh (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/test_scen.sh Wed Jun 25
05:22:31 2008
@@ -18,6 +18,7 @@
cd $AXIS2C_HOME/bin
echo ">Start server @ $_PORT"
./axis2_http_server -p$_PORT &
+ sleep 2
echo ">Go to client directory"
if [ $S_i = 'scenario14' ]
then
Modified: webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am?rev=671526&r1=671525&r2=671526&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am Wed Jun 25
05:22:31 2008
@@ -16,3 +16,4 @@
INCLUDES = @AXIS2INC@ \
-I$(AXIS2C_HOME)/include \
-I ../../../include
+
Modified: webservices/rampart/trunk/c/src/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/Makefile.am?rev=671526&r1=671525&r2=671526&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/Makefile.am Wed Jun 25 05:22:31 2008
@@ -1 +1 @@
-SUBDIRS = omxmlsec handlers trust secconv util core data
+SUBDIRS = omxmlsec handlers trust secconv util core rahas data
Added: webservices/rampart/trunk/c/src/rahas/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/rahas/Makefile.am?rev=671526&view=auto
==============================================================================
--- webservices/rampart/trunk/c/src/rahas/Makefile.am (added)
+++ webservices/rampart/trunk/c/src/rahas/Makefile.am Wed Jun 25 05:22:31 2008
@@ -0,0 +1,30 @@
+TESTS =
+
+prglibdir=$(prefix)/modules/rahas
+
+prglib_LTLIBRARIES = libmod_rahas.la
+
+prglib_DATA= ../data/rahas_module.xml
+
+libmod_rahas_la_SOURCES = mod_rahas.c rahas_in_handler.c
rahas_request_processor.c
+
+libmod_rahas_la_LIBADD = ../util/librampart_util.la \
+ ../omxmlsec/libomxmlsec.la \
+ ../secconv/libsecconv.la \
+ @OPENSSLLIB@ \
+ @AXIS2LIB@ \
+ -lcrypto
+
+
+INCLUDES = -I$(top_builddir)/include \
+ -I ../../include \
+ @OPENSSLINC@ \
+ @AXIS2INC@ \
+ @UTILINC@ \
+ @NEETHIINC@ \
+ @AXIOMINC@
+
+install-data-hook:
+ cp $(prefix)/modules/rahas/libmod_rahas* $(prefix)/lib
+ mv $(prefix)/modules/rahas/rahas_module.xml
$(prefix)/modules/rahas/module.xml
+
Modified: webservices/rampart/trunk/c/src/rahas/rahas_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/rahas/rahas_in_handler.c?rev=671526&r1=671525&r2=671526&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/rahas/rahas_in_handler.c (original)
+++ webservices/rampart/trunk/c/src/rahas/rahas_in_handler.c Wed Jun 25
05:22:31 2008
@@ -28,7 +28,7 @@
static axis2_status_t
rahas_send_reply(
axiom_node_t *body_node,
- axutil_env_t *env,
+ const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx);
static void
@@ -111,12 +111,12 @@
soap_action = axis2_msg_ctx_get_soap_action(msg_ctx, env);
if(soap_action)
{
- action = axutil_string_get_buffer(soap_action, env);
+ action = (axis2_char_t *)axutil_string_get_buffer(soap_action, env);
}
if(!action)
{
- action = axis2_msg_ctx_get_wsa_action(msg_ctx, env);
+ action = (axis2_char_t *)axis2_msg_ctx_get_wsa_action(msg_ctx, env);
}
@@ -192,7 +192,7 @@
static axis2_status_t
rahas_send_reply(
axiom_node_t *body_node,
- axutil_env_t *env,
+ const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
axis2_msg_ctx_t *out_msg_ctx = NULL;
Modified: webservices/rampart/trunk/c/src/rahas/rahas_request_processor.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/rahas/rahas_request_processor.c?rev=671526&r1=671525&r2=671526&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/rahas/rahas_request_processor.c (original)
+++ webservices/rampart/trunk/c/src/rahas/rahas_request_processor.c Wed Jun 25
05:22:31 2008
@@ -41,6 +41,33 @@
security_context_token_t *sct,
axis2_msg_ctx_t *msg_ctx);
+static axis2_status_t
+rahas_validate_issue_request_parameters(
+ const axutil_env_t *env,
+ trust_rst_t *rst,
+ trust_rstr_t *rstr,
+ axis2_msg_ctx_t *msg_ctx,
+ int trust_version,
+ axis2_bool_t client_entropy_needed,
+ trust_entropy_t** requester_entropy);
+
+static axis2_status_t
+rahas_populate_rstr_for_issue_request(
+ const axutil_env_t *env,
+ trust_rstr_t *rstr,
+ int trust_version,
+ axis2_bool_t client_entropy_needed,
+ oxs_buffer_t *server_secret,
+ security_context_token_t *sct,
+ int key_size);
+
+static axis2_status_t
+rahas_find_sts_policy(
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ axis2_bool_t *client_entropy_needed,
+ axis2_bool_t *server_entropy_needed);
+
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rahas_process_issue_request(
const axutil_env_t *env,
@@ -496,4 +523,4 @@
}
return status;
-}
\ No newline at end of file
+}
