Author: milinda
Date: Mon Oct 15 00:21:22 2007
New Revision: 584698
URL: http://svn.apache.org/viewvc?rev=584698&view=rev
Log: (empty)
Modified:
webservices/rampart/scratch/c/trust/include/trust_util.h
webservices/rampart/scratch/c/trust/src/util.c
webservices/rampart/scratch/c/trust/src/validator/validator.c
Modified: webservices/rampart/scratch/c/trust/include/trust_util.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/include/trust_util.h?rev=584698&r1=584697&r2=584698&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/include/trust_util.h (original)
+++ webservices/rampart/scratch/c/trust/include/trust_util.h Mon Oct 15
00:21:22 2007
@@ -62,18 +62,45 @@
axiom_node_t *parent_node,
const axis2_char_t *address,
const axis2_char_t *addressing_ns);
-
+
+ AXIS2_EXPORT axiom_node_t* AXIS2_CALL
trust_util_requested_security_token_element(
+ const axutil_env_t *env,
+ const int version,
+ axiom_node_t *parent_node);
+
+ AXIS2_EXPORT axiom_node_t* AXIS2_CALL
trust_util_create_requsted_proof_token_element(
+ const axutil_env_t *env,
+ const int version,
+ axiom_node_t *parent_node);
+
+ AXIS2_EXPORT axiom_node_t* AXIS2_CALL trust_util_create_entropy_element(
+ const axutil_env_t *env,
+ const int version,
+ axiom_node_t *parent_node);
+
+ AXIS2_EXPORT axiom_node_t* AXIS2_CALL trust_util_computed_key_element(
+ const axutil_env_t *env,
+ const int version,
+ axiom_node_t *parent_node);
/* Internal Operation */
/* create generic axiom nodes - internal */
- AXIS2_EXPORT axiom_node_t* AXIS2_CALL trust_util_create_om_node(
+ axiom_node_t* AXIS2_CALL trust_util_create_om_node(
const axutil_env_t *env,
- axiom_node_t *parent_om_node,
+ axiom_node_t *parent_node,
const axis2_char_t *ns,
const axis2_char_t *ln,
const axis2_char_t *prefix);
+
+ axiom_node_t* AXIS2_CALL trust_util_create_om_node_with_text(
+ const axutil_env_t *env,
+ axiom_node_t *parent_node,
+ const axis2_char_t *ns,
+ const axis2_char_t *ln,
+ const axis2_char_t *prefix,
+ const axis2_char_t *text);
- AXIS2_EXPORT axis2_char_t* AXIS2_CALL trust_util_get_wst_ns(
+ axis2_char_t* AXIS2_CALL trust_util_get_wst_ns(
const axutil_env_t *env,
const int version);
Modified: webservices/rampart/scratch/c/trust/src/util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/src/util.c?rev=584698&r1=584697&r2=584698&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/src/util.c (original)
+++ webservices/rampart/scratch/c/trust/src/util.c Mon Oct 15 00:21:22 2007
@@ -16,7 +16,7 @@
*/
-#include "trust_util.h"
+#include <trust_util.h>
AXIS2_EXPORT axiom_node_t* AXIS2_CALL trust_util_create_rst_element(
const axutil_env_t *env,
@@ -166,28 +166,47 @@
return trust_util_create_om_node(env, parent_node, wst_ns,
TRUST_COMPUTED_KEY, TRUST_WST);
}
-
-AXIS2_EXPORT axiom_node_t* AXIS2_CALL trust_util_create_om_node(
+axiom_node_t* AXIS2_CALL trust_util_create_om_node(
const axutil_env_t *env,
- axiom_node_t *parent_om_node,
+ axiom_node_t *parent_node,
const axis2_char_t *ns,
const axis2_char_t *ln,
const axis2_char_t *prefix)
{
- axiom_node_t *util_om_node = NULL;
- axiom_element_t *util_om_ele = NULL;
- axiom_namespace_t *util_ns = NULL;
+ axiom_node_t *om_node = NULL;
+ axiom_element_t *om_ele = NULL;
+ axiom_namespace_t *ns = NULL;
AXIS2_ENV_CHECK(env, NULL);
- util_ns = axiom_namespace_create(env, ns, prefix);
- util_om_ele = axiom_element_create(env, parent_om_node, ln, util_ns,
&util_om_node);
+ ns = axiom_namespace_create(env, ns, prefix);
+ om_ele = axiom_element_create(env, parent_node, ln, ns, &om_node);
- return util_om_node;
+ return om_node;
}
+axiom_node_t* AXIS2_CALL trust_util_create_om_node_with_text(
+ const axutil_env_t *env,
+ axiom_node_t *parent_node,
+ const axis2_char_t *ns,
+ const axis2_char_t *ln,
+ const axis2_char_t *prefix,
+ const axis2_char_t *text)
+{
+ axiom_node_t *om_node = NULL;
+ axiom_element_t *om_ele = NULL;
+ axiom_namespace_t *ns = NULL;
+
+ AXIS2_ENV_CHECK(env, NULL);
+
+ ns = axiom_namespace_create(env, ns, prefix);
+ om_ele = axiom_element_create(env, parent_node, ln, ns, &om_node);
+ axiom_element_set_text(om_ele, env, text, om_node);
+
+ return om_node;
+}
-AXIS2_EXPORT axis2_char_t* AXIS2_CALL trust_util_get_wst_ns(
+axis2_char_t* AXIS2_CALL trust_util_get_wst_ns(
const axutil_env_t *env,
const int version)
{
Modified: webservices/rampart/scratch/c/trust/src/validator/validator.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/src/validator/validator.c?rev=584698&r1=584697&r2=584698&view=diff
==============================================================================
--- webservices/rampart/scratch/c/trust/src/validator/validator.c (original)
+++ webservices/rampart/scratch/c/trust/src/validator/validator.c Mon Oct 15
00:21:22 2007
@@ -3,6 +3,7 @@
#include <trust_sts.h>
#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
AXIS2_EXPORT int axis2_get_instance(trust_token_validator_t **inst, const
axutil_env_t *env)
{
