[prev in list] [next in list] [prev in thread] [next in thread] 

List:       axis-cvs
Subject:    svn commit: r418034 - in /webservices/axis2/trunk/c/rampart/src/omxmlsec:
From:       damitha () apache ! org
Date:       2006-06-29 13:18:30
Message-ID: 20060629131830.C62B91A983E () eris ! apache ! org
[Download RAW message or body]

Author: damitha
Date: Thu Jun 29 06:18:29 2006
New Revision: 418034

URL: http://svn.apache.org/viewvc?rev=418034&view=rev
Log:
Applying patches for omxmlsec

Modified:
    webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_ctx.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_enc.c

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_ctx.c?rev=418034&r1=418033&r2=418034&view=diff
 ==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_ctx.c Thu Jun 29 06:18:29 2006
@@ -16,8 +16,8 @@
 
 #include <stdio.h>
 #include <axis2_util.h>
-#include <omxmlsec/oxs_constants.h>
-#include <omxmlsec/oxs_ctx.h>
+#include <oxs_constants.h>
+#include <oxs_ctx.h>
 
 
 AXIS2_EXTERN enc_ctx_t* AXIS2_CALL

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_enc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_enc.c?rev=418034&r1=418033&r2=418034&view=diff
 ==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_enc.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/oxs_enc.c Thu Jun 29 06:18:29 2006
@@ -18,36 +18,9 @@
 #include <axiom_namespace.h>
 #include <stdio.h>
 #include <axis2_util.h>
-#include <omxmlsec/oxs_constants.h>
-#include <omxmlsec/oxs_ctx.h>
-#include <omxmlsec/oxs_enc.h>
-
-/************** Function Headers ****************************/
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-oxs_enc_xml_encrypt(const axis2_env_t *env,
-                        enc_ctx_t* ctx,
-                        axiom_node_t* tmpl,
-                        axiom_node_t* node
-                    );
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-oxs_enc_binary_encrypt(const axis2_env_t *env,
-                        enc_ctx_t* ctx,
-                        axiom_node_t* tmpl,
-                        axis2_char_t* data
-                    );
-
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-oxs_enc_populate_ctx(const axis2_env_t *env,
-                    enc_ctx_t* ctx,
-                    axiom_node_t* tmpl
-                    );
-
-*/
-
-/************* End of function headers **********************/
+#include <oxs_constants.h>
+#include <oxs_ctx.h>
+#include <oxs_enc.h>
 
 
 
@@ -118,7 +91,7 @@
      
     qname = axis2_qname_create(env, OXS_NodeEncryptionMethod, NULL, \
NULL);/*EncryptionMethod*/  
-    enc_method_ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(enc_data_ele, env, \
qname, enc_data_node, enc_method_node); +    enc_method_ele = \
AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(enc_data_ele, env, qname, enc_data_node, \
                &enc_method_node);
     if(!enc_method_ele){ printf("\nNo EncryptionMethod element"); return \
AXIS2_FAILURE; }  
     ctx->encmtd_algorithm = \
AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(enc_method_ele, env, OXS_AttrAlgorithm); @@ \
-128,7 +101,7 @@  qname= NULL;
     qname = axis2_qname_create(env, OXS_NodeKeyInfo, NULL, NULL);/*KeyInfo*/
 
-    key_info_ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(enc_data_ele, env, \
qname, enc_data_node, key_info_node);     +    key_info_ele = \
AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(enc_data_ele, env, qname, enc_data_node, \
&key_info_node);      
     if(key_info_ele)
     {
@@ -138,14 +111,14 @@
     AXIS2_QNAME_FREE(qname, env);
     qname= NULL;
     qname = axis2_qname_create(env, OXS_NodeCipherData, NULL, NULL);/*CipherData*/
-    cipher_data_ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(enc_data_ele, env, \
qname,  enc_data_node, cipher_data_node); +    cipher_data_ele = \
AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(enc_data_ele, env, qname,  enc_data_node, \
&cipher_data_node);  
     if(cipher_data_ele)
     {
         AXIS2_QNAME_FREE(qname, env);
         qname= NULL;
         qname = axis2_qname_create(env, OXS_NodeCipherValue, NULL, \
                NULL);/*CipherValue*/
-        cipher_val_ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(cipher_data_ele, \
env, qname, cipher_data_node, cipher_val_node); +        cipher_val_ele = \
AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(cipher_data_ele, env, qname, \
cipher_data_node, &cipher_val_node);  if(cipher_val_ele){
             printf("\nCipherValue Element found");
             ctx->cipher_value_node = cipher_val_node;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]