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 sh...@apache.org on 2008/04/30 07:15:54 UTC
svn commit: r652262 [2/2] - in /webservices/rampart/trunk/c: include/
src/omxmlsec/ src/omxmlsec/openssl/ src/omxmlsec/tokens/ src/secconv/
src/util/
Modified: webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c Tue Apr 29 22:15:53 2008
@@ -95,11 +95,11 @@
if(tr_func){
output_dtype = (*tr_func)(env, tr_input, input_dtype, &tr_output);
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Cannot get the transform implementation for %s", tr_id);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Cannot get the transform implementation for %s", tr_id);
}
/*If the output data type is unknown OR the output is NULL its an error*/
if((output_dtype == OXS_TRANSFORM_TYPE_UNKNOWN) || (!tr_output)){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Transform failed for %s", tr_id);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Transform failed for %s", tr_id);
return NULL;
}
}/*eof for loop*/
@@ -117,7 +117,7 @@
}
else{
/*Error*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Unsupported transform data type %d", output_dtype);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Unsupported transform data type %d", output_dtype);
}
}else{
/*No transforms defined. Thus we simply direct the node, to make the digest*/
@@ -127,7 +127,7 @@
if(0 == axutil_strcmp( OXS_HREF_SHA1 , digest_mtd)){
digest = openssl_sha1(env, serialized_node, axutil_strlen(serialized_node));
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Unsupported digest method %s", digest_mtd);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Unsupported digest method %s", digest_mtd);
return NULL;
}
@@ -450,7 +450,7 @@
if(reffed_node){
oxs_sign_part_set_node(sign_part, env, reffed_node);
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find node with Id=%s ", ref_id2 );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find node with Id=%s ", ref_id2 );
AXIS2_FREE(env->allocator, ref_id2);
ref_id2 = NULL;
return AXIS2_FAILURE; /*No such node. Its an error*/
@@ -484,7 +484,7 @@
tr = oxs_transforms_factory_produce_transform(env, tr_id);
if(!tr) {
/*The transform not supported*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Cannot produce the transform for %s", tr_id);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Cannot produce the transform for %s", tr_id);
return AXIS2_FAILURE;
}
/*Add the transform to the list*/
@@ -492,7 +492,7 @@
}else{
/*<ds:Transforms> cant have any other element*/
/*NOTE: Removed this check for interop testing*/
- /*oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"<ds:Transforms> cannot have node %s ", node_name );
+ /*oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"<ds:Transforms> cannot have node %s ", node_name );
return AXIS2_FAILURE;*/
}
/*Set the next node to be processed*/
@@ -524,7 +524,7 @@
axiom_util_get_next_sibling_element(axiom_node_get_data_element(child_node, env), env,
child_node, &child_node);
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:DigestMethod> " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:DigestMethod> " );
return AXIS2_FAILURE;
}
@@ -536,7 +536,7 @@
digest_val = oxs_token_get_digest_value(env, child_node);
oxs_sign_part_set_digest_val(sign_part, env, digest_val);
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:DigestValue> " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:DigestValue> " );
return AXIS2_FAILURE;
}
@@ -572,7 +572,7 @@
OXS_NODE_SIGNEDINFO, NULL,NULL);*/
if(!signed_info_node){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:SignedInfo> " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:SignedInfo> " );
return AXIS2_FAILURE;
}
/*Create the list for sign parts*/
@@ -604,7 +604,7 @@
sign_part = oxs_sign_part_create(env);
status = oxs_xml_sig_process_ref_node(env, sign_part, cur_node, scope_node);
if(status == AXIS2_FAILURE){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"<ds:Reference> node processing failed " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"<ds:Reference> node processing failed " );
return AXIS2_FAILURE;
}
@@ -632,14 +632,14 @@
sig_val = oxs_token_get_signature_value(env, sig_val_node);
if(!sig_val)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find signature value. " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find signature value. " );
return AXIS2_FAILURE;
}
/*We now remove \n in this text.Otherwise verifications failed.*/
newline_removed = oxs_util_get_newline_removed_string(env,sig_val);
if(!newline_removed)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot Remove new lines. " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot Remove new lines. " );
return AXIS2_FAILURE;
}
oxs_sign_ctx_set_sig_val(sign_ctx, env, newline_removed);
@@ -649,7 +649,7 @@
newline_removed = NULL;
}else{
/*Error the node should be the ds:SignatureValue*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:SignatureValue> " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot find <ds:SignatureValue> " );
return AXIS2_FAILURE;
}
@@ -684,7 +684,7 @@
AXIS2_LOG_INFO(env->log, "[oxs][xml_sig] Digest verification success for node Id= %s ", id );
status = AXIS2_SUCCESS;
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Digest verification failed for node Id= %s ", id );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Digest verification failed for node Id= %s ", id );
status = AXIS2_FAILURE;
}
@@ -742,7 +742,7 @@
status = oxs_xml_sig_process_signature_node(env, sign_ctx, signature_node, scope_node);
if(status != AXIS2_SUCCESS){
/*Something went wrong while processing the Signature node!!! :(*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"<ds:Signature> node processing failed " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"<ds:Signature> node processing failed " );
return AXIS2_FAILURE;
}
@@ -790,7 +790,7 @@
content = NULL;
if(AXIS2_FAILURE == status){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Signature is not valid " );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Signature is not valid " );
return AXIS2_FAILURE;
}else{
return AXIS2_SUCCESS;
Modified: webservices/rampart/trunk/c/src/secconv/security_context_token.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secconv/security_context_token.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/secconv/security_context_token.c (original)
+++ webservices/rampart/trunk/c/src/secconv/security_context_token.c Tue Apr 29 22:15:53 2008
@@ -286,7 +286,7 @@
token_ele = axiom_element_create(env, NULL, OXS_NODE_SECURITY_CONTEXT_TOKEN, ns_obj_sc, &sct_token);
if (!token_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating SecurityContextToken element");
return NULL;
}
@@ -304,7 +304,7 @@
identifier_ele = axiom_element_create(env, sct_token, OXS_NODE_IDENTIFIER, ns_obj_sc, &identifier_node);
if(!identifier_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating SecurityContextToken element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/util/rampart_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_token_builder.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_token_builder.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_token_builder.c Tue Apr 29 22:15:53 2008
@@ -53,7 +53,7 @@
}else if(RTBP_X509DATA_ISSUER_SERIAL == pattern){
status = rampart_token_build_x509_data_issuer_serial(env, stref_node, cert);
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Unsupported pattern %d to build wsse:SecurityTokenReference ", pattern);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Unsupported pattern %d to build wsse:SecurityTokenReference ", pattern);
/*We do not support*/
return AXIS2_FAILURE;
}
@@ -75,7 +75,7 @@
/*Get data from the certificate*/
data = oxs_x509_cert_get_data(cert, env);
if(!data){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Cannot get data from the x509 certificate");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Cannot get data from the x509 certificate");
return AXIS2_FAILURE;
}
embedded_node = oxs_token_build_embedded_element(env, parent, "ID");
@@ -94,7 +94,7 @@
ki = oxs_x509_cert_get_key_identifier(cert, env);
if(!ki){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Cannot get key identifier from the x509 certificate");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Cannot get key identifier from the x509 certificate");
return AXIS2_FAILURE;
}
ki_node = oxs_token_build_key_identifier_element(env, parent, OXS_ENCODING_BASE64BINARY,
Modified: webservices/rampart/trunk/c/src/util/rampart_token_processor.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_token_processor.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_token_processor.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_token_processor.c Tue Apr 29 22:15:53 2008
@@ -54,7 +54,7 @@
}else if(0 == axutil_strcmp(child_name, OXS_NODE_X509_DATA)){
status = rampart_token_process_x509_data(env, child_node, cert);
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Unsupported child %s of wsse:SecurityTokenReference ", child_name);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Unsupported child %s of wsse:SecurityTokenReference ", child_name);
/*We do not support*/
return AXIS2_FAILURE;
}
@@ -82,7 +82,7 @@
/*Find the token with the id=ref_id within the scope of scope_node*/
bst_node = oxs_axiom_get_node_by_id(env, scope_node, "Id", ref_id, OXS_WSU_XMLNS);
if(!bst_node){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Error retrieving element with ID=%s", ref_id);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "Error retrieving element with ID=%s", ref_id);
return AXIS2_FAILURE;
}
@@ -92,7 +92,7 @@
if(_cert){
status = AXIS2_SUCCESS;
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT, "Cannot load certificate from string =%s", data);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT, "Cannot load certificate from string =%s", data);
status = AXIS2_FAILURE;
}
@@ -117,7 +117,7 @@
bst_node = axiom_node_get_first_element(embed_node, env);
if(!bst_node){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "BST element is not found");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ELEMENT_FAILED, "BST element is not found");
return AXIS2_FAILURE;
}