Author: kaushalye
Date: Wed Mar 28 00:33:08 2007
New Revision: 523214
URL: http://svn.apache.org/viewvc?view=rev&rev=523214
Log:
Fixing JIRA AXIS2C-570
Modified:
webservices/rampart/trunk/c/include/rampart_constants.h
webservices/rampart/trunk/c/include/rampart_encryption.h
webservices/rampart/trunk/c/include/rampart_sec_header_builder.h
webservices/rampart/trunk/c/include/rampart_username_token.h
Modified: webservices/rampart/trunk/c/include/rampart_constants.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_constants.h?view=diff&rev=523214&r1=523213&r2=523214
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_constants.h (original)
+++ webservices/rampart/trunk/c/include/rampart_constants.h Wed Mar 28 00:33:08
2007
@@ -57,42 +57,6 @@
#define RAMPART_PASSWORD_TEXT_URI
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText";
-/* Inflow outflow security parameter */
-/*
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="action">
- <xs:annotation>
- <xs:documentation>Outflow security 'action'
configuration</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="items" type="xs:string"/>
- <xs:element name="user" type="xs:string"/>
- <xs:element name="passwordCallbackClass" type="xs:string"
minOccurs="0"/>
- <xs:element name="signaturePropFile" type="xs:string"
minOccurs="0"/>
- <xs:element name="encryptionPropFile" type="xs:string"
minOccurs="0"/>
- <xs:element name="decryptionPropFile" type="xs:string"
minOccurs="0"/>
- <xs:element name="signatureKeyIdentifier" type="xs:string"
minOccurs="0"/>
- <xs:element name="encryptionKeyIdentifier" type="xs:string"
minOccurs="0"/>
- <xs:element name="encryptionUser" type="xs:string"
minOccurs="0"/>
- <xs:element name="signatureParts" type="xs:string"
minOccurs="0"/>
- <xs:element name="encryptionParts" type="xs:string"
minOccurs="0"/>
- <xs:element name="optimizeParts" type="xs:string"
minOccurs="0"/>
- <xs:element name="encryptionSymAlgorithm" type="xs:string"
minOccurs="0"/>
- <xs:element name="EmbeddedKeyCallbackClass" type="xs:string"
minOccurs="0"/>
- <xs:element name="encryptionKeyTransportAlgorithm"
type="xs:string" minOccurs="0"/>
- <xs:element name="EmbeddedKeyName" type="xs:string"
minOccurs="0"/>
- <xs:element name="timeToLive" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
-*/
-/*
-#define RAMPART_INFLOW_SECURITY "InflowSecurity"
-#define RAMPART_OUTFLOW_SECURITY "OutflowSecurity"
-*/
#define RAMPART_INFLOW_SECURITY_POLICY "InflowSecurityPolicy"
#define RAMPART_OUTFLOW_SECURITY_POLICY "OutflowSecurityPolicy"
@@ -102,39 +66,8 @@
#define IN_MESSAGE_SECURITY "InMessageSecurity"
#define OUT_MESSAGE_SECURITY "OutMessageSEcurity"
-/*
-#define RAMPART_PASSWORD_TEXT "passwordText"
-#define RAMPART_PASSWORD_DIGEST "passwordDigest"
-*/
#define RAMPART_PASSWORD_TEXT "plainText"
#define RAMPART_PASSWORD_DIGEST "Digest"
-
-#define RAMPART_ACTION "action"
-/*These are the parameters of actions in the axis2.xml file*/
-#define RAMPART_ACTION_ITEMS "items"
-#define RAMPART_ACTION_ITEMS_USERNAMETOKEN "UsernameToken"
-#define RAMPART_ACTION_ITEMS_TIMESTAMP "Timestamp"
-#define RAMPART_ACTION_ITEMS_ENCRYPT "Encrypt"
-#define RAMPART_ACTION_ITEMS_SIGNATURE "Signature"
-#define RAMPART_ACTION_PASSWORD_TYPE "passwordType"
-#define RAMPART_ACTION_USER "user"
-#define RAMPART_ACTION_PW_CALLBACK_CLASS "passwordCallbackClass"
-#define RAMPART_ACTION_AUTHN_MODULE_NAME "authnModuleName"
-#define RAMPART_ACTION_SIGNATURE_PROP_FILE "signaturePropFile"
-#define RAMPART_ACTION_ENCRYPTION_PROP_FILE "encryptionPropFile"
-#define RAMPART_ACTION_DECRYPTION_PROP_FILE "decryptionPropFile"
-#define RAMPART_ACTION_SIGNATURE_KEY_IDENTIFIER "signatureKeyIdentifier"
-#define RAMPART_ACTION_ENCRYPTION_KEY_IDENTIFIER "encryptionKeyIdentifier"
-#define RAMPART_ACTION_ENCRYPTION_USER "encryptionUser"
-#define RAMPART_ACTION_SIGNATURE_PARTS "signatureParts"
-#define RAMPART_ACTION_ENCRYPTION_PARTS "encryptionParts"
-#define RAMPART_ACTION_OPTIMIZE_PARTS "optimizeParts"
-#define RAMPART_ACTION_ENCRYPTION_SYM_ALGORITHM "encryptionSymAlgorithm"
-#define RAMPART_ACTION_EMBEDDED_KEY_CALLBACK_CLASS "EmbeddedKeyCallbackClass"
-#define RAMPART_ACTION_ENCRYPTION_KEY_TRANSFORM_ALGORITHM
"encryptionKeyTransportAlgorithm"
-#define RAMPART_ACTION_EMBEDDED_KEY_NAME "EmbeddedKeyName"
-#define RAMPART_ACTION_TIME_TO_LIVE "timeToLive"
-#define RAMPART_ACTION_KEY_BUF "keyBuffer"
/************fault codes***************/
Modified: webservices/rampart/trunk/c/include/rampart_encryption.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_encryption.h?view=diff&rev=523214&r1=523213&r2=523214
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_encryption.h (original)
+++ webservices/rampart/trunk/c/include/rampart_encryption.h Wed Mar 28
00:33:08 2007
@@ -36,7 +36,6 @@
/**
* @param env pointer to environment struct
* @param msg_ctx message context
-* @param actions actions defined in the descriptor file
* @param soap_envelope the SOAP envelope
* @param sec_node The security element
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
Modified: webservices/rampart/trunk/c/include/rampart_sec_header_builder.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_sec_header_builder.h?view=diff&rev=523214&r1=523213&r2=523214
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_sec_header_builder.h (original)
+++ webservices/rampart/trunk/c/include/rampart_sec_header_builder.h Wed Mar 28
00:33:08 2007
@@ -37,7 +37,6 @@
* Build a message depending on configurations.
* @param env pointer to environment struct
* @param msg_ctx message context
-* @param actions actions defined in the descriptor file
* @param soap_envelope the SOAP envelope
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
Modified: webservices/rampart/trunk/c/include/rampart_username_token.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_username_token.h?view=diff&rev=523214&r1=523213&r2=523214
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_username_token.h (original)
+++ webservices/rampart/trunk/c/include/rampart_username_token.h Wed Mar 28
00:33:08 2007
@@ -32,28 +32,8 @@
#include <axis2_env.h>
#include <rampart_constants.h>
#include <rampart_crypto_util.h>
-#include <rampart_action.h>
#include <rampart_context.h>
- /**
- * Build a username token according to the given parameters.
- * These parameter are taken from the action collection and message
context
- * @param env pointer to environment struct
- * @param ctx axis2 context
- * @param actions collection of actions
- * @param sec_node security node
- * @param sec_ns_obj security namespace object
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
-/* axis2_status_t (AXIS2_CALL *
- build)(rampart_username_token_t *username_token,
- const axis2_env_t *env,
- axis2_ctx_t *ctx,
- rampart_actions_t *actions,
- axiom_node_t *sec_node,
- axiom_namespace_t *sec_ns_obj
- );
-*/
axis2_status_t AXIS2_CALL
rampart_username_token_build(
@@ -66,7 +46,6 @@
* @param env pointer to environment struct
* @param msg_ctx axis2 message context
* @param soap_header SOAP Header
- * @param actions collection of actions
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t AXIS2_CALL
