You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by di...@apache.org on 2009/01/12 15:17:58 UTC
svn commit: r733770 - in /webservices/rampart/trunk/c:
samples/authn_provider/ samples/client/issued_token/
samples/client/saml_echo/ samples/client/saml_protect/
samples/client/sts_client/ samples/credential_provider/
samples/omxmlsec/xmlenc/ samples/...
Author: dimuthu
Date: Mon Jan 12 06:17:49 2009
New Revision: 733770
URL: http://svn.apache.org/viewvc?rev=733770&view=rev
Log:
fixing RAMPARTC-129 and fixing some minor warning to compile with Werror flag
Modified:
webservices/rampart/trunk/c/samples/authn_provider/Makefile.am
webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am
webservices/rampart/trunk/c/samples/client/issued_token/echo.c
webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am
webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am
webservices/rampart/trunk/c/samples/client/saml_protect/echo.c
webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am
webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
webservices/rampart/trunk/c/samples/omxmlsec/xmlenc/Makefile.am
webservices/rampart/trunk/c/samples/omxmlsec/xmlsig/Makefile.am
webservices/rampart/trunk/c/samples/replay_detector/Makefile.am
webservices/rampart/trunk/c/samples/sct_provider/Makefile.am
webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am
webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am
webservices/rampart/trunk/c/src/core/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am
webservices/rampart/trunk/c/src/secconv/Makefile.am
webservices/rampart/trunk/c/src/trust/Makefile.am
webservices/rampart/trunk/c/src/util/Makefile.am
webservices/rampart/trunk/c/src/util/rampart_replay_detector.c
Modified: webservices/rampart/trunk/c/samples/authn_provider/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/authn_provider/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/authn_provider/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/authn_provider/Makefile.am Mon Jan 12 06:17:49 2009
@@ -1,7 +1,7 @@
prglibdir=$(prefix)/bin/samples/rampart/authn_provider
prglib_LTLIBRARIES = libauthn.la
libauthn_la_SOURCES = authn_provider.c
-libauthn_la_LIBADD = ../../src/util/librampart_util.la \
- ../../src/omxmlsec/openssl/libomopenssl.la
+libauthn_la_LIBADD = ../../src/core/libmod_rampart.la
+
INCLUDES = -I ../../include\
@AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am Mon Jan 12 06:17:49 2009
@@ -9,17 +9,15 @@
issued_token_LDADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-L$(AXIS2C_HOME)/modules/rampart \
+ -lmod_rampart \
-laxutil \
-laxis2_axiom \
-lneethi \
- -lsecconv \
-laxis2_engine \
-laxis2_parser \
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -ltrust \
- -lmod_rampart \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/rampart/trunk/c/samples/client/issued_token/echo.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/issued_token/echo.c?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/issued_token/echo.c (original)
+++ webservices/rampart/trunk/c/samples/client/issued_token/echo.c Mon Jan 12 06:17:49 2009
@@ -34,7 +34,7 @@
build_om_payload_for_echo_svc(const axutil_env_t *env);
rampart_issued_token_t * AXIS2_CALL
-get_issued_token(axutil_env_t *env, rp_property_t *issued_token, rampart_context_t *rampart_context);
+get_issued_token(const axutil_env_t *env, rp_property_t *issued_token, rampart_context_t *rampart_context);
axis2_char_t *policy_file = NULL;
axis2_char_t *sts_ploicy = NULL;
@@ -111,7 +111,7 @@
return 0;
}
- rampart_config_set_issued_token_aquire_function(client_config, env, get_issued_token);
+ rampart_config_set_issued_token_aquire_function(client_config, env, (rampart_issued_token_t*)get_issued_token);
property = axutil_property_create_with_args(env, AXIS2_SCOPE_REQUEST ,
AXIS2_TRUE, (void *)rampart_config_free, client_config);
@@ -243,7 +243,7 @@
rampart_issued_token_t * AXIS2_CALL
-get_issued_token(axutil_env_t *env, rp_property_t *issued_token, rampart_context_t *rampart_context)
+get_issued_token(const axutil_env_t *env, rp_property_t *issued_token, rampart_context_t *rampart_context)
{
axis2_endpoint_ref_t *endpoint_ref = NULL;
axis2_options_t *options = NULL;
Modified: webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am Mon Jan 12 06:17:49 2009
@@ -9,17 +9,15 @@
saml_echo_LDADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-L$(AXIS2C_HOME)/modules/rampart \
+ -lmod_rampart \
-laxutil \
-laxis2_axiom \
-lneethi \
- -lsecconv \
-laxis2_engine \
-laxis2_parser \
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -lmod_rampart \
- -lomxmlsec \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am Mon Jan 12 06:17:49 2009
@@ -10,14 +10,12 @@
-laxutil \
-laxis2_axiom \
-lneethi \
- -lsecconv \
-laxis2_engine \
-laxis2_parser \
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -lmod_rampart \
- -lomxmlsec \
+ -lmod_rampart \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/rampart/trunk/c/samples/client/saml_protect/echo.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/saml_protect/echo.c?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/saml_protect/echo.c (original)
+++ webservices/rampart/trunk/c/samples/client/saml_protect/echo.c Mon Jan 12 06:17:49 2009
@@ -79,7 +79,6 @@
rampart_config_t* client_config = NULL;
axutil_property_t *property = NULL;
rampart_saml_token_t *saml = NULL;
- axiom_node_t *assertion = NULL;
/* Set up the environment */
env = axutil_env_create_all("echo.log", AXIS2_LOG_LEVEL_TRACE);
@@ -278,7 +277,6 @@
oxs_sign_ctx_t *sign_ctx = NULL;
oxs_x509_cert_t *cert = NULL;
openssl_pkey_t *prv_key = NULL;
- axiom_node_t *sig_node = NULL;
rampart_saml_token_t *saml = NULL;
axutil_date_time_t *time = NULL;
Modified: webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am Mon Jan 12 06:17:49 2009
@@ -7,9 +7,7 @@
sts_client_LDADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-L$(AXIS2C_HOME)/modules/rampart \
- -lmod_rampart \
- -lsecconv \
- -ltrust \
+ -lmod_rampart \
-laxutil \
-laxis2_axiom \
-lneethi \
Modified: webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/credential_provider/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/credential_provider/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/credential_provider/Makefile.am Mon Jan 12 06:17:49 2009
@@ -1,7 +1,7 @@
prglibdir=$(prefix)/bin/samples/rampart/credential_provider
prglib_LTLIBRARIES = libcredential.la
libcredential_la_SOURCES = cred_provider.c
-libcredential_la_LIBADD = ../../src/util/librampart_util.la \
- ../../src/omxmlsec/openssl/libomopenssl.la
+libcredential_la_LIBADD = ../../src/core/libmod_rampart.la
+
INCLUDES = -I ../../include\
@AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/omxmlsec/xmlenc/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/omxmlsec/xmlenc/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/omxmlsec/xmlenc/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/omxmlsec/xmlenc/Makefile.am Mon Jan 12 06:17:49 2009
@@ -9,9 +9,7 @@
enc_LDADD = -laxutil \
-laxis2_axiom \
-lxml2 \
- ../../../src/omxmlsec/libomxmlsec.la \
- ../../../src/omxmlsec/openssl/libomopenssl.la \
- ../../../src/omxmlsec/tokens/liboxstokens.la
+ ../../src/core/libmod_rampart.la
EXTRA_DIST = input.xml
Modified: webservices/rampart/trunk/c/samples/omxmlsec/xmlsig/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/omxmlsec/xmlsig/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/omxmlsec/xmlsig/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/omxmlsec/xmlsig/Makefile.am Mon Jan 12 06:17:49 2009
@@ -9,9 +9,7 @@
sign_LDADD = -laxutil \
-laxis2_axiom \
-lxml2 \
- ../../../src/omxmlsec/libomxmlsec.la \
- ../../../src/omxmlsec/openssl/libomopenssl.la \
- ../../../src/omxmlsec/tokens/liboxstokens.la
+ ../../src/core/libmod_rampart.la
Modified: webservices/rampart/trunk/c/samples/replay_detector/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/replay_detector/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/replay_detector/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/replay_detector/Makefile.am Mon Jan 12 06:17:49 2009
@@ -4,6 +4,7 @@
librdflatfile_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-laxutil \
- ../../src/util/librampart_util.la
+ ../../src/core/libmod_rampart.la
+
INCLUDES = -I ../../include\
@AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/sct_provider/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/sct_provider/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/sct_provider/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/sct_provider/Makefile.am Mon Jan 12 06:17:49 2009
@@ -4,17 +4,13 @@
libsctprovider_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-laxutil \
- ../../src/util/librampart_util.la \
- ../../src/secconv/libsecconv.la \
- ../../src/omxmlsec/libomxmlsec.la
+ ../../src/core/libmod_rampart.la
libsctprovider_hashdb_la_SOURCES = sct_provider_hash_map.c
libsctprovider_hashdb_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-laxutil \
- ../../src/util/librampart_util.la \
- ../../src/secconv/libsecconv.la \
- ../../src/omxmlsec/libomxmlsec.la \
- ../../src/trust/libtrust.la
+ ../../src/core/libmod_rampart.la
+
INCLUDES = -I ../../include\
@AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am Mon Jan 12 06:17:49 2009
@@ -10,9 +10,7 @@
libsaml_sts_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-L$(AXIS2C_HOME)/modules/rampart \
- -lomxmlsec \
- -lmod_rampart \
- -ltrust
+ -lmod_rampart
INCLUDES = @AXIS2INC@ \
Modified: webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am Mon Jan 12 06:17:49 2009
@@ -10,8 +10,7 @@
libsecconv_echo_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-L$(AXIS2C_HOME)/modules/rampart \
- -lmod_rampart \
- -ltrust
+ -lmod_rampart
Modified: webservices/rampart/trunk/c/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/core/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/core/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/core/Makefile.am Mon Jan 12 06:17:49 2009
@@ -12,6 +12,7 @@
../util/librampart_util.la \
../omxmlsec/libomxmlsec.la \
../secconv/libsecconv.la \
+ ../trust/libtrust.la \
@OPENSSLLIB@ \
@AXIS2LIB@ \
-lcrypto \
Modified: webservices/rampart/trunk/c/src/omxmlsec/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/Makefile.am Mon Jan 12 06:17:49 2009
@@ -1,5 +1,5 @@
SUBDIRS = tokens openssl c14n
-lib_LTLIBRARIES = libomxmlsec.la
+noinst_LTLIBRARIES = libomxmlsec.la
libomxmlsec_la_SOURCES = ctx.c buffer.c key.c cipher.c error.c axis2_utils.c axiom.c \
iv.c xml_encryption.c encryption.c\
@@ -15,8 +15,7 @@
-lssl \
tokens/liboxstokens.la \
openssl/libomopenssl.la \
- c14n/liboxsc14n.la \
- -lcrypto
+ c14n/liboxsc14n.la
INCLUDES = -I$(top_builddir)/include \
-I ../../include \
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am Mon Jan 12 06:17:49 2009
@@ -1,9 +1,6 @@
-lib_LTLIBRARIES =libomopenssl.la
+noinst_LTLIBRARIES =libomopenssl.la
libomopenssl_la_SOURCES = cipher_ctx.c crypt.c rsa.c pkey.c util.c cipher_property.c digest.c x509.c pkcs12.c pem.c sign.c hmac.c pkcs12_keystore.c
-libomopenssl_la_LIBADD = -lssl\
- -lcrypto
-
INCLUDES = -I$(top_builddir)/include \
-I ../../../../util/include \
-I ../../../../include \
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am Mon Jan 12 06:17:49 2009
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES =liboxstokens.la
+noinst_LTLIBRARIES =liboxstokens.la
liboxstokens_la_SOURCES = token_encrypted_data.c token_encryption_method.c token_cipher_value.c \
token_cipher_data.c token_key_name.c token_key_info.c token_binary_security_token.c \
Modified: webservices/rampart/trunk/c/src/secconv/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secconv/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/secconv/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/secconv/Makefile.am Mon Jan 12 06:17:49 2009
@@ -1,10 +1,8 @@
-lib_LTLIBRARIES = libsecconv.la
+noinst_LTLIBRARIES = libsecconv.la
libsecconv_la_SOURCES = sct_provider_utility.c \
security_context_token.c
-libsecconv_la_LIBADD = ../trust/libtrust.la
-
INCLUDES = -I$(top_builddir)/include \
-I ../../../../util/include \
-I ../../../../include \
Modified: webservices/rampart/trunk/c/src/trust/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/trust/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/trust/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/trust/Makefile.am Mon Jan 12 06:17:49 2009
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libtrust.la
+noinst_LTLIBRARIES = libtrust.la
libtrust_la_SOURCES = context.c \
claims.c \
Modified: webservices/rampart/trunk/c/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/Makefile.am?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/util/Makefile.am Mon Jan 12 06:17:49 2009
@@ -11,12 +11,6 @@
rampart_issued.c rampart_issued_token.c
-librampart_util_la_LIBADD = -lssl \
- ../omxmlsec/libomxmlsec.la \
- ../secconv/libsecconv.la \
- -lcrypto \
- @OPENSSLLIB@
-
INCLUDES = -I$(top_builddir)/include \
-I ../../include \
@OPENSSLINC@ \
Modified: webservices/rampart/trunk/c/src/util/rampart_replay_detector.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_replay_detector.c?rev=733770&r1=733769&r2=733770&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_replay_detector.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_replay_detector.c Mon Jan 12 06:17:49 2009
@@ -78,7 +78,7 @@
rampart_replay_detector_linked_list_contains(
axutil_linked_list_t *linked_list,
const axutil_env_t *env,
- axis2_char_t *id)
+ const axis2_char_t *id)
{
int count = 0;
int i = 0;
@@ -184,7 +184,7 @@
}
/* If the table already have the same key it's a replay */
- if(rampart_replay_detector_linked_list_contains(ll, env, (void*)msg_id))
+ if(rampart_replay_detector_linked_list_contains(ll, env, msg_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,"[rampart]For ID=%s, a replay detected", msg_id);
axutil_allocator_switch_to_local_pool(env->allocator);