Author: milinda
Date: Fri May 30 04:36:16 2008
New Revision: 661659
URL: http://svn.apache.org/viewvc?rev=661659&view=rev
Log:
Linux build break fixed.
Modified:
webservices/rampart/trunk/c/include/rampart_saml.h
webservices/rampart/trunk/c/include/saml.h
webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c
webservices/rampart/trunk/c/src/util/rampart_saml.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
Modified: webservices/rampart/trunk/c/include/rampart_saml.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_saml.h?rev=661659&r1=661658&r2=661659&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_saml.h (original)
+++ webservices/rampart/trunk/c/include/rampart_saml.h Fri May 30 04:36:16 2008
@@ -136,7 +136,7 @@
AXIS2_EXTERN rampart_saml_token_t * AXIS2_CALL
rampart_saml_add_token(rampart_context_t *rampart_context,
- axutil_env_t *env, axiom_node_t
*assertion,
+ const axutil_env_t *env,
axiom_node_t *assertion,
axiom_node_t *str,
rampart_st_type_t type);
#ifdef __cplusplus
Modified: webservices/rampart/trunk/c/include/saml.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/saml.h?rev=661659&r1=661658&r2=661659&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/saml.h (original)
+++ webservices/rampart/trunk/c/include/saml.h Fri May 30 04:36:16 2008
@@ -2141,7 +2141,7 @@
* @param pvt_key private key used to encrypt the session key
*/
AXIS2_EXTERN oxs_key_t * AXIS2_CALL
-saml_assertion_get_session_key(axutil_env_t *env, axiom_node_t *assertion,
+saml_assertion_get_session_key(const axutil_env_t *env, axiom_node_t
*assertion,
openssl_pkey_t *pvt_key);
#ifdef __cplusplus
Modified: webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c?rev=661659&r1=661658&r2=661659&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/saml/sutil.c Fri May 30 04:36:16
2008
@@ -64,7 +64,7 @@
AXIS2_EXTERN oxs_key_t * AXIS2_CALL
-saml_assertion_get_session_key(axutil_env_t *env, axiom_node_t *assertion,
+saml_assertion_get_session_key(const axutil_env_t *env, axiom_node_t
*assertion,
openssl_pkey_t *pvt_key)
{
axiom_node_t *encrypted_key_node = NULL;
Modified: webservices/rampart/trunk/c/src/util/rampart_saml.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_saml.c?rev=661659&r1=661658&r2=661659&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_saml.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_saml.c Fri May 30 04:36:16 2008
@@ -176,7 +176,8 @@
AXIS2_EXTERN rampart_saml_token_t * AXIS2_CALL
rampart_saml_add_token(rampart_context_t *rampart_context,
- axutil_env_t *env, axiom_node_t
*assertion,
+ const axutil_env_t *env,
+ axiom_node_t *assertion,
axiom_node_t *str,
rampart_st_type_t type)
{
@@ -206,7 +207,6 @@
if(rp_property_get_type(binding,env) == RP_PROPERTY_SYMMETRIC_BINDING)
{
rp_symmetric_binding_t *sym_binding = NULL;
- rp_property_t *token = NULL;
sym_binding = (rp_symmetric_binding_t
*)rp_property_get_value(binding,env);
if(sym_binding)
{
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=661659&r1=661658&r2=661659&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 May
30 04:36:16 2008
@@ -202,7 +202,7 @@
axiom_node_t* key_info_node,
rampart_context_t* rampart_context,
axis2_msg_ctx_t *msg_ctx,
- axis2_bool_t
*is_signature)
+ axis2_bool_t
is_signature)
{
oxs_key_t *key = NULL;
axiom_node_t *str_node = NULL;
@@ -255,7 +255,6 @@
axiom_node_t *assertion = NULL;
rampart_saml_token_t *saml = NULL;
rampart_st_type_t tok_type;
- void *param = NULL;
oxs_key_mgr_t *key_mgr = NULL;
openssl_pkey_t *pvt_key = NULL;