You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2007/03/23 08:46:07 UTC
svn commit: r521613 - in /webservices/axis2/trunk/c/rampart/src:
omxmlsec/tokens/token_reference_list.c omxmlsec/xml_encryption.c
omxmlsec/xml_signature.c util/rampart_sec_header_processor.c
Author: manjula
Date: Fri Mar 23 00:46:05 2007
New Revision: 521613
URL: http://svn.apache.org/viewvc?view=rev&rev=521613
Log:
Fixing some failures due to changes in axiom.
Modified:
webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c
webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c?view=diff&rev=521613&r1=521612&r2=521613
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c Fri Mar 23 00:46:05 2007
@@ -90,7 +90,7 @@
ref_list_ele = AXIOM_NODE_GET_DATA_ELEMENT(ref_list_node, env);
/*Get children*/
- qname = axis2_qname_create(env, OXS_NODE_DATA_REFERENCE, NULL, NULL);
+ qname = axis2_qname_create(env, OXS_NODE_DATA_REFERENCE,OXS_ENC_NS,OXS_ENC_NS);
iter = axiom_element_get_children_with_qname(ref_list_ele, env, qname, ref_list_node);
axis2_qname_free(qname, env);
qname = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c?view=diff&rev=521613&r1=521612&r2=521613
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c Fri Mar 23 00:46:05 2007
@@ -187,7 +187,7 @@
axiom_node_t *cur_node = NULL;
axis2_char_t *node_name = NULL;
- st_ref_node = oxs_axiom_get_first_child_node_by_name(env, key_info_node, OXS_NODE_SECURITY_TOKEN_REFRENCE, NULL, NULL);
+ st_ref_node = oxs_axiom_get_first_child_node_by_name(env, key_info_node, OXS_NODE_SECURITY_TOKEN_REFRENCE,OXS_WSSE_XMLNS,OXS_WSSE);
if(!st_ref_node){
return AXIS2_FAILURE;
}
@@ -354,7 +354,7 @@
axis2_status_t status = AXIS2_FAILURE;
/*Get the symmetric encryption algorithm*/
- enc_mtd_node = oxs_axiom_get_first_child_node_by_name(env, enc_type_node, OXS_NODE_ENCRYPTION_METHOD, NULL, NULL);
+ enc_mtd_node = oxs_axiom_get_first_child_node_by_name(env, enc_type_node, OXS_NODE_ENCRYPTION_METHOD,OXS_ENC_NS,OXS_XENC);
sym_algo = oxs_token_get_encryption_method(env, enc_mtd_node);
if(!sym_algo){
return AXIS2_FAILURE;
@@ -369,8 +369,8 @@
OXS_CTX_SET_TYPE(enc_ctx, env, type);
/*Get the cipher value*/
- cd_node = oxs_axiom_get_first_child_node_by_name(env, enc_type_node, OXS_NODE_CIPHER_DATA, NULL, NULL);
- cv_node = oxs_axiom_get_first_child_node_by_name(env, cd_node, OXS_NODE_CIPHER_VALUE, NULL, NULL);
+ cd_node = oxs_axiom_get_first_child_node_by_name(env, enc_type_node, OXS_NODE_CIPHER_DATA,OXS_ENC_NS,OXS_XENC);
+ cv_node = oxs_axiom_get_first_child_node_by_name(env, cd_node, OXS_NODE_CIPHER_VALUE,OXS_ENC_NS,OXS_XENC);
cipher_val = oxs_token_get_cipher_value(env, cv_node);
/*Create input buffer with cipher data obtained*/
@@ -485,20 +485,20 @@
oxs_buffer_t *result_buf = NULL;
/*Get encryption method algorithm*/
- enc_mtd_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_ENCRYPTION_METHOD, NULL, NULL);
+ enc_mtd_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_ENCRYPTION_METHOD,OXS_ENC_NS,OXS_XENC);
enc_mtd_algo = oxs_token_get_encryption_method(env, enc_mtd_node);
if(!enc_mtd_algo){
return AXIS2_FAILURE;
}
/*Get cipher data*/
- cd_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_CIPHER_DATA, NULL, NULL);
+ cd_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_CIPHER_DATA,OXS_ENC_NS,OXS_XENC);
cipher_val = oxs_token_get_cipher_value_from_cipher_data(env, cd_node);
if(!cipher_val){
return AXIS2_FAILURE;
}
/*Get key used to encrypt*/
- key_info_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_KEY_INFO, NULL, NULL);
+ key_info_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_KEY_INFO,OXS_DSIG_NS,OXS_DS);
status = oxs_xml_enc_process_key_info(env, asym_ctx, key_info_node, parent);
/*Right now we support KeyInfo -> SecurityTokenReference -> Reference
KeyInfo -> SecurityTokenReference -> X509IssuerSerial */
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c?view=diff&rev=521613&r1=521612&r2=521613
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c Fri Mar 23 00:46:05 2007
@@ -400,11 +400,11 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_array_list_t *sign_part_list = NULL;
- /*signed_info_node = oxs_axiom_get_first_child_node_by_name(env, signature_node,
- OXS_NODE_SIGNEDINFO, OXS_DSIG_NS, OXS_DS );*/
-
signed_info_node = oxs_axiom_get_first_child_node_by_name(env, signature_node,
- OXS_NODE_SIGNEDINFO, NULL,NULL);
+ OXS_NODE_SIGNEDINFO, OXS_DSIG_NS, OXS_DS );
+
+ /*signed_info_node = oxs_axiom_get_first_child_node_by_name(env, signature_node,
+ OXS_NODE_SIGNEDINFO, NULL,NULL);*/
if(!signed_info_node){
oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:SignedInfo> " );
@@ -588,11 +588,11 @@
signature_val = oxs_sign_ctx_get_sig_val(sign_ctx, env);
/*Then we apply the C14N for the ds:SignedInfo*/
- /*signed_info_node = oxs_axiom_get_first_child_node_by_name(env, signature_node,
- OXS_NODE_SIGNEDINFO, OXS_DSIG_NS, OXS_DS );*/
-
signed_info_node = oxs_axiom_get_first_child_node_by_name(env, signature_node,
- OXS_NODE_SIGNEDINFO, NULL,NULL );
+ OXS_NODE_SIGNEDINFO, OXS_DSIG_NS, OXS_DS );
+
+ /*signed_info_node = oxs_axiom_get_first_child_node_by_name(env, signature_node,
+ OXS_NODE_SIGNEDINFO, NULL,NULL );*/
c14n_mtd = oxs_sign_ctx_get_c14n_mtd(sign_ctx, env);
doc = axiom_node_get_document(signed_info_node, env);
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c?view=diff&rev=521613&r1=521612&r2=521613
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c Fri Mar 23 00:46:05 2007
@@ -231,7 +231,7 @@
void *key_buf = NULL;
/*Get EncryptedData references */
- ref_list_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_REFERENCE_LIST, NULL, NULL);
+ ref_list_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_REFERENCE_LIST,OXS_ENC_NS,OXS_XENC);
reference_list = oxs_token_get_reference_list_data(env, ref_list_node);
/*If there are no references. Nothing to do. Return success*/
if((!reference_list) || (0 == axis2_array_list_size(reference_list, env))){
@@ -241,7 +241,7 @@
AXIS2_LOG_INFO(env->log, "[rampart][shp] Reference List has %d node reference(s)", axis2_array_list_size(reference_list, env));
/*Get the algorithm to decrypt the sesison key*/
- enc_mtd_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_ENCRYPTION_METHOD, NULL, NULL);
+ enc_mtd_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_ENCRYPTION_METHOD,OXS_ENC_NS,OXS_XENC);
enc_asym_algo = oxs_token_get_encryption_method(env, enc_mtd_node);
/*If the reference list > 0 then We have nodes to decrypt. Next step is to get the encrypted key*/
/*Obtain the session key which is encrypted*/
@@ -374,7 +374,7 @@
return AXIS2_FAILURE;
}
/*Create an enc_ctx*/
- mtd_node = oxs_axiom_get_first_child_node_by_name(env, enc_data_node, OXS_NODE_ENCRYPTION_METHOD, NULL, NULL);
+ mtd_node = oxs_axiom_get_first_child_node_by_name(env, enc_data_node, OXS_NODE_ENCRYPTION_METHOD,OXS_ENC_NS,OXS_XENC);
if(!mtd_node)
{
AXIS2_LOG_INFO(env->log, "[rampart][shp] Node with ID=%s cannot be found", id);
@@ -461,11 +461,11 @@
return AXIS2_FAILURE;
}
- /*sign_info_node = oxs_axiom_get_first_child_node_by_name(env, sig_node,
- OXS_NODE_SIGNEDINFO, OXS_DSIG_NS, OXS_DS );
- */
sign_info_node = oxs_axiom_get_first_child_node_by_name(env, sig_node,
- OXS_NODE_SIGNEDINFO, NULL, NULL);
+ OXS_NODE_SIGNEDINFO, OXS_DSIG_NS, OXS_DS );
+
+ /*sign_info_node = oxs_axiom_get_first_child_node_by_name(env, sig_node,
+ OXS_NODE_SIGNEDINFO, NULL, NULL);*/
if(!sign_info_node)
{
@@ -498,10 +498,10 @@
/*Verify each digest method with policy*/
axiom_node_t *digest_mtd_node = NULL;
axis2_char_t *digest_mtd = NULL;
- /*digest_mtd_node = oxs_axiom_get_first_child_node_by_name(env,cur_node,
- OXS_NODE_DIGEST_METHOD, OXS_DSIG_NS, OXS_DS);*/
digest_mtd_node = oxs_axiom_get_first_child_node_by_name(env,cur_node,
- OXS_NODE_DIGEST_METHOD, NULL,NULL);
+ OXS_NODE_DIGEST_METHOD, OXS_DSIG_NS, OXS_DS);
+ /*digest_mtd_node = oxs_axiom_get_first_child_node_by_name(env,cur_node,
+ OXS_NODE_DIGEST_METHOD, NULL,NULL);*/
if(digest_mtd_node)
{
digest_mtd = oxs_token_get_digest_method(env, digest_mtd_node);
@@ -548,22 +548,22 @@
}
is_include_token = rampart_context_is_token_include(rampart_context,token,token_type,server_side,env);
- /*key_info_node = oxs_axiom_get_first_child_node_by_name(env, sig_node,
- OXS_NODE_KEY_INFO,OXS_DSIG_NS, OXS_DS );*/
-
key_info_node = oxs_axiom_get_first_child_node_by_name(env, sig_node,
- OXS_NODE_KEY_INFO,NULL,NULL);
+ OXS_NODE_KEY_INFO,OXS_DSIG_NS, OXS_DS );
+
+ /*key_info_node = oxs_axiom_get_first_child_node_by_name(env, sig_node,
+ OXS_NODE_KEY_INFO,NULL,NULL);*/
if(!key_info_node)
{
AXIS2_LOG_INFO(env->log, "[rampart][shp]Verify failed. Key Info node is not in the message.");
return AXIS2_FAILURE;
}
- /*str_node = oxs_axiom_get_first_child_node_by_name(env,key_info_node,
- OXS_NODE_SECURITY_TOKEN_REFRENCE,OXS_WSSE_XMLNS,OXS_WSSE);*/
-
str_node = oxs_axiom_get_first_child_node_by_name(env,key_info_node,
- OXS_NODE_SECURITY_TOKEN_REFRENCE,NULL,NULL);
+ OXS_NODE_SECURITY_TOKEN_REFRENCE,OXS_WSSE_XMLNS,OXS_WSSE);
+
+ /*str_node = oxs_axiom_get_first_child_node_by_name(env,key_info_node,
+ OXS_NODE_SECURITY_TOKEN_REFRENCE,NULL,NULL);*/
if(str_node)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org