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 mi...@apache.org on 2008/01/27 17:10:39 UTC
svn commit: r615615 - in /webservices/rampart/scratch/c/trust/c: include/
src/trust/
Author: milinda
Date: Sun Jan 27 08:10:37 2008
New Revision: 615615
URL: http://svn.apache.org/viewvc?rev=615615&view=rev
Log:
Fix windows build errors.
Modified:
webservices/rampart/scratch/c/trust/c/include/trust_claims.h
webservices/rampart/scratch/c/trust/c/include/trust_constants.h
webservices/rampart/scratch/c/trust/c/include/trust_entropy.h
webservices/rampart/scratch/c/trust/c/include/trust_life_time.h
webservices/rampart/scratch/c/trust/c/include/trust_rstr.h
webservices/rampart/scratch/c/trust/c/include/trust_util.h
webservices/rampart/scratch/c/trust/c/src/trust/context.c
webservices/rampart/scratch/c/trust/c/src/trust/policy_util.c
webservices/rampart/scratch/c/trust/c/src/trust/rst.c
webservices/rampart/scratch/c/trust/c/src/trust/util.c
Modified: webservices/rampart/scratch/c/trust/c/include/trust_claims.h
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/include/trust_claims.h?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/include/trust_claims.h (original)
+++ webservices/rampart/scratch/c/trust/c/include/trust_claims.h Sun Jan 27 08:10:37 2008
@@ -22,6 +22,7 @@
#include <axiom.h>
#include <trust_constants.h>
+#include <trust_util.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/rampart/scratch/c/trust/c/include/trust_constants.h
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/include/trust_constants.h?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/include/trust_constants.h (original)
+++ webservices/rampart/scratch/c/trust/c/include/trust_constants.h Sun Jan 27 08:10:37 2008
@@ -19,6 +19,8 @@
#ifndef TRUST_CONSTANTS_H
#define TRUST_CONSTANTS_H
+
+#include <axutil_utils.h>
/**
* @file trust_constants.h
* @brief Holds constants for trust implementation
@@ -28,6 +30,8 @@
extern "C"
{
#endif
+
+
/*Trust XML Element names */
#define TRUST_RST_CONTEXT "Context"
Modified: webservices/rampart/scratch/c/trust/c/include/trust_entropy.h
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/include/trust_entropy.h?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/include/trust_entropy.h (original)
+++ webservices/rampart/scratch/c/trust/c/include/trust_entropy.h Sun Jan 27 08:10:37 2008
@@ -19,12 +19,12 @@
#define TRUST_ENTROPY_H
#include <axutil_utils.h>
-#include <axutil_utils.h>
#include <axutil_string.h>
#include <axutil_base64.h>
#include <axiom_soap.h>
#include <axiom.h>
#include <trust_constants.h>
+#include <trust_util.h>
#ifdef __cplusplus
@@ -72,6 +72,11 @@
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
trust_entropy_get_binary_secret(
trust_entropy_t *entropy,
+ const axutil_env_t *env);
+
+ AXIS2_EXTERN trust_bin_sec_type_t AXIS2_CALL
+ trust_entropy_get_bin_sec_type_from_str(
+ axis2_char_t *str,
const axutil_env_t *env);
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
Modified: webservices/rampart/scratch/c/trust/c/include/trust_life_time.h
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/include/trust_life_time.h?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/include/trust_life_time.h (original)
+++ webservices/rampart/scratch/c/trust/c/include/trust_life_time.h Sun Jan 27 08:10:37 2008
@@ -29,6 +29,7 @@
#include <axis2_addr.h>
#include <trust_constants.h>
+#include <trust_util.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/rampart/scratch/c/trust/c/include/trust_rstr.h
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/include/trust_rstr.h?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/include/trust_rstr.h (original)
+++ webservices/rampart/scratch/c/trust/c/include/trust_rstr.h Sun Jan 27 08:10:37 2008
@@ -168,6 +168,12 @@
trust_rstr_t *rstr,
const axutil_env_t *env,
axis2_bool_t in_header);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ trust_rstr_set_wst_ns_uri(
+ trust_rstr_t *rstr,
+ const axutil_env_t *env,
+ axis2_char_t *wst_ns_uri);
Modified: webservices/rampart/scratch/c/trust/c/include/trust_util.h
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/include/trust_util.h?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/include/trust_util.h (original)
+++ webservices/rampart/scratch/c/trust/c/include/trust_util.h Sun Jan 27 08:10:37 2008
@@ -19,6 +19,8 @@
#ifndef TRUST_UTIL
#define TRUST_UTIL
+//#define AXIS2_EXTERN __declspec(dllexport)
+
/**
* @file trust_util.h
* @brief contains generic operations related to trust module
@@ -158,7 +160,7 @@
*@Dialect :URI to indicate the syntax of the claims
**/
- AXIS2_EXTERN axiom_node_t *AXIS2_CALL
+ AXIS2_EXTERN axiom_node_t * AXIS2_CALL
trust_util_create_claims_element(
const axutil_env_t * env,
axis2_char_t *wst_ns_uri,
Modified: webservices/rampart/scratch/c/trust/c/src/trust/context.c
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/src/trust/context.c?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/src/trust/context.c (original)
+++ webservices/rampart/scratch/c/trust/c/src/trust/context.c Sun Jan 27 08:10:37 2008
@@ -15,6 +15,7 @@
* limitations under the License.
*/
#include <trust_context.h>
+#
struct trust_context
{
Modified: webservices/rampart/scratch/c/trust/c/src/trust/policy_util.c
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/src/trust/policy_util.c?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/src/trust/policy_util.c (original)
+++ webservices/rampart/scratch/c/trust/c/src/trust/policy_util.c Sun Jan 27 08:10:37 2008
@@ -15,6 +15,7 @@
* limitations under the License.
*/
#include <trust_policy_util.h>
+#include <trust_constants.h>
AXIS2_EXTERN rp_algorithmsuite_t *AXIS2_CALL
trust_policy_util_get_algorithmsuite(
Modified: webservices/rampart/scratch/c/trust/c/src/trust/rst.c
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/src/trust/rst.c?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/src/trust/rst.c (original)
+++ webservices/rampart/scratch/c/trust/c/src/trust/rst.c Sun Jan 27 08:10:37 2008
@@ -356,7 +356,7 @@
axiom_node_t *rst_node = NULL;
axis2_char_t *key_size = NULL;
- rst_node = (axiom_node_t*)trust_util_create_rst_element(env, rst->wst_ns_uri, parent, rst->attr_context);
+ rst_node = (axiom_node_t*)trust_util_create_rst_element(env, rst->wst_ns_uri, rst->attr_context);
if(rst_node)
{
Modified: webservices/rampart/scratch/c/trust/c/src/trust/util.c
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/src/trust/util.c?rev=615615&r1=615614&r2=615615&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/c/src/trust/util.c (original)
+++ webservices/rampart/scratch/c/trust/c/src/trust/util.c Sun Jan 27 08:10:37 2008
@@ -248,7 +248,7 @@
return applies_to_node;
}
-AXIS2_EXTERN axiom_node_t *AXIS2_CALL
+AXIS2_EXTERN axiom_node_t * AXIS2_CALL
trust_util_create_claims_element(
const axutil_env_t * env,
axis2_char_t *wst_ns_uri,