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 [1/2] - in /webservices/rampart/trunk/c: include/
src/omxmlsec/ src/omxmlsec/openssl/ src/omxmlsec/tokens/ src/secconv/
src/util/
Author: shankar
Date: Tue Apr 29 22:15:53 2008
New Revision: 652262
URL: http://svn.apache.org/viewvc?rev=652262&view=rev
Log:
changing ERROR_LOCATION to OXS_ERROR_LOCATION
Modified:
webservices/rampart/trunk/c/include/oxs_error.h
webservices/rampart/trunk/c/src/omxmlsec/axiom.c
webservices/rampart/trunk/c/src/omxmlsec/buffer.c
webservices/rampart/trunk/c/src/omxmlsec/cipher.c
webservices/rampart/trunk/c/src/omxmlsec/derivation.c
webservices/rampart/trunk/c/src/omxmlsec/encryption.c
webservices/rampart/trunk/c/src/omxmlsec/iv.c
webservices/rampart/trunk/c/src/omxmlsec/key.c
webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c
webservices/rampart/trunk/c/src/omxmlsec/signature.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_binary_security_token.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_c14n_method.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_data.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_value.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_data_reference.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_derived_key_token.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_method.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_value.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_ds_reference.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_embedded.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_data.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_header.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_key.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encryption_method.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_generation.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_identifier.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_info.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_name.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_label.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_length.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_nonce.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_offset.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_properties.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference_list.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_security_token_reference.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_confirmation.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_method.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_value.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signed_info.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transform.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transforms.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_certificate.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_data.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_name.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_serial.c
webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_serial_number.c
webservices/rampart/trunk/c/src/omxmlsec/transforms_factory.c
webservices/rampart/trunk/c/src/omxmlsec/xml_encryption.c
webservices/rampart/trunk/c/src/omxmlsec/xml_key_processor.c
webservices/rampart/trunk/c/src/omxmlsec/xml_signature.c
webservices/rampart/trunk/c/src/secconv/security_context_token.c
webservices/rampart/trunk/c/src/util/rampart_token_builder.c
webservices/rampart/trunk/c/src/util/rampart_token_processor.c
Modified: webservices/rampart/trunk/c/include/oxs_error.h
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/oxs_error.h?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/oxs_error.h (original)
+++ webservices/rampart/trunk/c/include/oxs_error.h Tue Apr 29 22:15:53 2008
@@ -45,7 +45,7 @@
#define LINE_NUMBER __LINE__
#define FILE_NAME __FILE__
-#define ERROR_LOCATION FILE_NAME,LINE_NUMBER,FUNCTION_NAME
+#define OXS_ERROR_LOCATION FILE_NAME,LINE_NUMBER,FUNCTION_NAME
/*Error codes*/
#define OXS_ERROR_DEFAULT 0
Modified: webservices/rampart/trunk/c/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/axiom.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/axiom.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/axiom.c Tue Apr 29 22:15:53 2008
@@ -75,7 +75,7 @@
parent_ele = axiom_node_get_data_element(parent, env);
if (!parent_ele)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Cannot find %s element", local_name);
return -1;
}
@@ -285,7 +285,7 @@
parent_ele = axiom_node_get_data_element(parent, env);
if (!parent_ele)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Cannot find %s element", local_name);
return NULL;
}
@@ -298,7 +298,7 @@
if (!node)
{
parent_name = axiom_node_to_string(parent, env);
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Cannot find child %s of %s", local_name, parent_name);
AXIS2_FREE(env->allocator, parent_name);
return NULL;
@@ -332,7 +332,7 @@
if (!buffer)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"buffer is NULL");
return NULL;
}
@@ -341,7 +341,7 @@
if (!reader)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"axiom_xml_reader is NULL");
return NULL;
}
@@ -349,7 +349,7 @@
builder = axiom_stax_builder_create(env, reader);
if (!builder)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"axiom_stax_builder is NULL");
return NULL;
}
@@ -357,14 +357,14 @@
doc = axiom_document_create(env, NULL, builder);
if (!doc)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"axiom_document is NULL");
return NULL;
}
node = axiom_document_build_all(doc, env);
if (!node)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Building node failed");
axiom_document_free(doc, env);
return NULL;
Modified: webservices/rampart/trunk/c/src/omxmlsec/buffer.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/buffer.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/buffer.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/buffer.c Tue Apr 29 22:15:53 2008
@@ -59,7 +59,7 @@
status = oxs_buffer_set_max_size(buffer, env, OXS_BUFFER_INITIAL_SIZE);
if (status == AXIS2_FAILURE)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"oxs_buffer_set_max_size");
AXIS2_FREE(env->allocator, buffer);
return NULL;
@@ -115,7 +115,7 @@
{
if (!buffer->data)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"oxs_buffer_remove_head failed. data is NULL");
return AXIS2_FAILURE;
}
@@ -132,7 +132,7 @@
{
if (!buffer->data)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"oxs_buffer_remove_head failed");
return AXIS2_FAILURE;
}
@@ -163,7 +163,7 @@
{
if (buffer->data)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"");
return AXIS2_FAILURE;
}
@@ -189,7 +189,7 @@
oxs_buffer_set_max_size(buffer, env, size);
if (!data)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"data is NULL");
return AXIS2_FAILURE;
}
@@ -216,7 +216,7 @@
oxs_buffer_set_max_size(buffer, env, buffer->size + size);
if (!data)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"data is NULL");
return AXIS2_FAILURE;
}
@@ -242,7 +242,7 @@
{
if (!data)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Passed data is NULL");
return AXIS2_FAILURE;
}
@@ -274,7 +274,7 @@
f = fopen(filename, "rb");
if (f == NULL)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"");
return AXIS2_FAILURE;
}
@@ -295,7 +295,7 @@
if (status == AXIS2_FAILURE)
{
fclose(f);
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"");
return AXIS2_FAILURE;
}
@@ -323,7 +323,7 @@
status = oxs_buffer_set_max_size(buffer, env, size);
if (status == AXIS2_FAILURE)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"oxs_buffer_set_max_size failed");
return AXIS2_FAILURE;
}
@@ -389,7 +389,7 @@
if (new_data == NULL)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"");
return AXIS2_FAILURE;
}
@@ -401,7 +401,7 @@
{
if (buffer->data == NULL)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"");
return AXIS2_FAILURE;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/cipher.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/cipher.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/cipher.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/cipher.c Tue Apr 29 22:15:53 2008
@@ -36,7 +36,7 @@
cipher_name = oxs_get_cipher_name_for_url(env, url);
if((!cipher_name) || (0 == axutil_strcmp(cipher_name, ""))){
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_INVALID_DATA, "Cannot populate cipher property");
openssl_cipher_property_free(cprop, env);
cprop = NULL;
@@ -47,7 +47,7 @@
ret = openssl_populate_cipher_property(env, cprop);
if (ret == AXIS2_FAILURE)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_INVALID_DATA, "Cannot populate cipher property");
openssl_cipher_property_free(cprop, env);
cprop = NULL;
@@ -85,7 +85,7 @@
}
else
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_UNSUPPORTED_ALGO, "Algorithm not supported");
return NULL;
}
@@ -122,7 +122,7 @@
}
else
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_INVALID_DATA, "Name not supported");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/derivation.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/derivation.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/derivation.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/derivation.c Tue Apr 29 22:15:53 2008
@@ -50,7 +50,7 @@
/*Search for an element with the val(@Id)=@URI*/
refed_node = oxs_axiom_get_node_by_id(env, root_node, OXS_ATTR_ID, id, NULL);
if(!refed_node){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA, "Cannot find the referenced key for the derived key");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA, "Cannot find the referenced key for the derived key");
return NULL;
}
@@ -111,7 +111,7 @@
/*Now derive the key using the base_key and other parematers*/
status = oxs_derivation_derive_key(env, base_key, derived_key, AXIS2_FALSE);
if(AXIS2_FAILURE == status){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA, "Cannot derive the key from given element");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA, "Cannot derive the key from given element");
oxs_key_free(derived_key, env);
derived_key = NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/encryption.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/encryption.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/encryption.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/encryption.c Tue Apr 29 22:15:53 2008
@@ -49,7 +49,7 @@
oxs_ctx_get_enc_mtd_algorithm(enc_ctx, env));
if (!cprop)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Cipher property is NULL");
return AXIS2_FAILURE;
}
@@ -64,7 +64,7 @@
oc_ctx = openssl_cipher_ctx_create(env);
if (!oc_ctx)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"openssl_cipher_ctx_create failed");
return AXIS2_FAILURE;
}
@@ -80,7 +80,7 @@
cipher_name = (axis2_char_t*)openssl_cipher_property_get_name(cprop, env);
if (!cipher_name)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"oxs_get_cipher failed");
return AXIS2_FAILURE;
@@ -107,7 +107,7 @@
/*Encrypt*/
enclen = openssl_bc_crypt(env, oc_ctx, input, output, OPENSSL_ENCRYPT);
if (enclen < 0){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
"openssl_block_cipher_crypt FAILED");
return AXIS2_FAILURE;
}
@@ -119,7 +119,7 @@
enclen);
if (ret < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"axutil_base64_encode_binary failed");
return AXIS2_FAILURE;
}
@@ -154,7 +154,7 @@
(char*)oxs_buffer_get_data(input, env));
if (decoded_len < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DECRYPT_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DECRYPT_FAILED,
"axutil_base64_decode_binary failed");
return AXIS2_FAILURE;
}
@@ -167,7 +167,7 @@
if (enclen < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DECRYPT_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DECRYPT_FAILED,
"openssl_block_cipher_crypt FAILED");
return AXIS2_FAILURE;
}
@@ -181,7 +181,7 @@
}
else
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Invalid operation type %d",
oxs_ctx_get_operation(enc_ctx, env));
@@ -237,7 +237,7 @@
status = oxs_key_mgr_load_key(env, asym_ctx, password);
if (status == AXIS2_FAILURE)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Key loading failed for Key encryption");
return AXIS2_FAILURE;
Modified: webservices/rampart/trunk/c/src/omxmlsec/iv.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/iv.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/iv.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/iv.c Tue Apr 29 22:15:53 2008
@@ -34,7 +34,7 @@
cprop = oxs_get_cipher_property_for_url(env, key_algo);
if (!cprop)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"openssl_get_cipher_property failed");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/key.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/key.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/key.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/key.c Tue Apr 29 22:15:53 2008
@@ -415,7 +415,7 @@
cprop = (openssl_cipher_property_t *)oxs_get_cipher_property_for_url(env, key_algo);
if (!cprop)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"openssl_get_cipher_property failed");
return AXIS2_FAILURE;
}
@@ -435,7 +435,7 @@
ret = openssl_generate_random_data(env, key_buf, size);
if (ret == AXIS2_FAILURE)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"generate_random_data failed");
return AXIS2_FAILURE;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/key_mgr.c Tue Apr 29 22:15:53 2008
@@ -104,7 +104,7 @@
/* Here we load both key and the certificate*/
status = openssl_x509_load_from_pkcs12(env, filename, password, &cert, &prvkey, &ca);
if(AXIS2_FAILURE == status){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"Error reading the certificate");
return AXIS2_FAILURE;
}
@@ -188,7 +188,7 @@
/*If this fails to get anything return failure*/
if((!cert) && (!pubkey) && (!prvkey)){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"Error reading the key");
return AXIS2_FAILURE;
}
@@ -350,7 +350,7 @@
status = openssl_x509_load_from_pkcs12(env, filename, password, &c, &pkey, &ca);
if(AXIS2_FAILURE == status){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"Error reading the PKCS12 Key Store");
return AXIS2_FAILURE;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c Tue Apr 29 22:15:53 2008
@@ -37,17 +37,17 @@
unsigned int hashed_len;
if(!secret){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"[oxs][openssl] No key to sign ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"[oxs][openssl] No key to sign ");
return AXIS2_FAILURE;
}
if(!input){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"[oxs][openssl] Nothing to sign ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"[oxs][openssl] Nothing to sign ");
return AXIS2_FAILURE;
}
if(!output){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"[oxs][openssl] The buffer to place signature is NULL ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"[oxs][openssl] The buffer to place signature is NULL ");
return AXIS2_FAILURE;
}
@@ -93,19 +93,19 @@
if(!secret)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] No key to derive ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] No key to derive ");
return AXIS2_FAILURE;
}
if(!seed)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] lable+seed is empty ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] lable+seed is empty ");
return AXIS2_FAILURE;
}
if(!output)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] The buffer to place hash is NULL ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] The buffer to place hash is NULL ");
return AXIS2_FAILURE;
}
@@ -167,13 +167,13 @@
if(!derived_key)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] derived key is null ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] derived key is null ");
return status;
}
if (!secret)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] secret is not valid ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] secret is not valid ");
return status;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c Tue Apr 29 22:15:53 2008
@@ -56,7 +56,7 @@
ret += len;
if ((bio = BIO_new_mem_buf(buff, ilen)) == NULL)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"BIO memeory allocation failure");
return AXIS2_FAILURE;
}
@@ -74,7 +74,7 @@
buff = NULL;
if(!*pkey){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"private key is NULL");
return AXIS2_FAILURE;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c Tue Apr 29 22:15:53 2008
@@ -43,7 +43,7 @@
keystore = (pkcs12_keystore_t*)AXIS2_MALLOC(env->allocator, sizeof(pkcs12_keystore_t));
if(!keystore)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_CREATION_FAILED, "Memory allocation error!");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_CREATION_FAILED, "Memory allocation error!");
return NULL;
}
@@ -56,7 +56,7 @@
if(!openssl_pkcs12_load(env, keystore->keystore_file, &keystore->keystore))
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"Error loading pkcs12 keystore from file");
return NULL;
}
@@ -69,7 +69,7 @@
&own_cert,
&other_certs))
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_CREATION_FAILED, "PKCS12 Key Store Parsing failed.");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_CREATION_FAILED, "PKCS12 Key Store Parsing failed.");
AXIS2_FREE(env->allocator, keystore);
return NULL;
}
@@ -188,7 +188,7 @@
if(!issuer || !(serial_number > 0))
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Invalid arguments to get_certificate_for_issuer_serial.");
return NULL;
}
@@ -219,7 +219,7 @@
if(!thumbprint)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Invalid arguments to get_certificate_for_issuer_serial.");
return NULL;
}
@@ -248,7 +248,7 @@
if(!ski)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Invalid arguments to get_certificate_for_issuer_serial.");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c Tue Apr 29 22:15:53 2008
@@ -187,7 +187,7 @@
if (!pk)
{
/*If there is no key by now its an error*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
"Cannot load key from %s", filename);
return AXIS2_FAILURE;
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c Tue Apr 29 22:15:53 2008
@@ -66,7 +66,7 @@
if (ret < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
"RSA encryption failed");
return (-1);
}
@@ -109,7 +109,7 @@
if (ret < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
"PUBKEY decrypt (signature verification) failed");
return (-1);
}
@@ -153,7 +153,7 @@
if (ret < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
"RSA decryption failed");
return (-1);
}
@@ -200,7 +200,7 @@
if (ret < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
"RSA private encryption(Signing) failed. Error code %d: %s",ERR_get_error(), ERR_reason_error_string(ERR_get_error()));
return (-1);
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c Tue Apr 29 22:15:53 2008
@@ -48,7 +48,7 @@
/*open_pkey = oxs_sign_ctx_get_private_key(sign_ctx, env);*/
pkey = openssl_pkey_get_key(prvkey, env);
if(!pkey){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"Cannot load the private key" );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"Cannot load the private key" );
}
/*TODO: Set the digest according to the signature method*/
@@ -92,7 +92,7 @@
/*Get the publickey*/
pkey = openssl_pkey_get_key(pubkey, env);
if(!pkey){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot load the public key" );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot load the public key" );
}
/*TODO Set the digest according to the signature method*/
digest = EVP_sha1();
@@ -104,7 +104,7 @@
ret = EVP_VerifyInit(&md_ctx, digest);
if(ret != 1) {
/*Error*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"EVP_VerifyInit failed" );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"EVP_VerifyInit failed" );
return AXIS2_FAILURE;
}
ret = EVP_VerifyUpdate(&md_ctx,
@@ -112,7 +112,7 @@
oxs_buffer_get_size(input_buf, env));
if(ret != 1) {
/*Error*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"EVP_VerifyUpdate failed" );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"EVP_VerifyUpdate failed" );
return AXIS2_FAILURE;
}
@@ -122,11 +122,11 @@
pkey);
if(ret == 0){
/*Error. Signature verification FAILED */
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Signature verification FAILED." );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Signature verification FAILED." );
status = AXIS2_FAILURE;
}else if(ret < 0){
/*Erorr. Some other error*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Error occured while verifying the signature." );
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"Error occured while verifying the signature." );
status = AXIS2_FAILURE;
}else{
/*SUCCESS. */
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c Tue Apr 29 22:15:53 2008
@@ -36,7 +36,7 @@
ret = RAND_bytes(temp_buffer, size);
if (ret < 0)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_DEFAULT, "RAND_bytes failed %d", size);
return AXIS2_FAILURE;
}
@@ -69,7 +69,7 @@
if (!cprop)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"openssl_cipher_property is NULL");
return AXIS2_FAILURE;
@@ -79,7 +79,7 @@
cipher_name = openssl_cipher_property_get_name(cprop, env);
if (!cipher_name)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"openssl_cipher_property name is NULL");
return AXIS2_FAILURE;
@@ -89,7 +89,7 @@
cipher = (EVP_CIPHER*)openssl_get_evp_cipher_by_name(env, cipher_name);
if (!cipher)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"openssl_get_evp_cipher_by_name failed");
return AXIS2_FAILURE;
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c Tue Apr 29 22:15:53 2008
@@ -54,7 +54,7 @@
}
else
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT, "New line removed buffer creation failed.");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT, "New line removed buffer creation failed.");
return AXIS2_FAILURE;
}
@@ -68,13 +68,13 @@
if (decoded_len < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT, "axutil_base64_decode_binary failed");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT, "axutil_base64_decode_binary failed");
return AXIS2_FAILURE;
}
if ((mem = BIO_new_mem_buf(buff, ilen)) == NULL)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT, "Cannot create a new memory buffer");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT, "Cannot create a new memory buffer");
return AXIS2_FAILURE;
}
@@ -281,21 +281,21 @@
/*Get ext by ID*/
index = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1);
if (index < 0) {
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"The extenension index of NID_subject_key_identifier is not valid");
return NULL;
}
/*Get the extension*/
ext = X509_get_ext(cert, index);
if (ext == NULL) {
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"The extension for NID_subject_key_identifier is NULL");
return NULL;
}
/*Subject Key Identifier*/
key_id = (ASN1_OCTET_STRING *)X509V3_EXT_d2i(ext);
if (key_id == NULL) {
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_DEFAULT,
"The SubjectKeyIdentifier is NULL");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/signature.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/signature.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/signature.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/signature.c Tue Apr 29 22:15:53 2008
@@ -48,13 +48,13 @@
/*Get the shared secret form the sig_ctx*/
secret = oxs_sign_ctx_get_secret(sign_ctx, env);
if(!secret){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"Signature failed. using HMAC-SHA1. No secret key is set");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"Signature failed. using HMAC-SHA1. No secret key is set");
return AXIS2_FAILURE;
}
/*Sign using HMAC-SHA1*/
status = openssl_hmac_sha1(env, secret, input, signed_result_buf);
if(AXIS2_FAILURE == status){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"Signature failed. using HMAC-SHA1 ");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"Signature failed. using HMAC-SHA1 ");
return AXIS2_FAILURE;
}
@@ -102,7 +102,7 @@
if (signedlen < 0)
{
/*Error*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,
"Signature failed. The length of signature is %d", signedlen);
}
@@ -149,7 +149,7 @@
}
else
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"Cannot support cipher %s", sign_algo);
return AXIS2_FAILURE;
}
@@ -183,7 +183,7 @@
oxs_buffer_free(output_buf, env);
return AXIS2_SUCCESS;
}else{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED, "Signature verification failed using HMAC-SHA1");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED, "Signature verification failed using HMAC-SHA1");
oxs_buffer_free(output_buf, env);
return AXIS2_FAILURE;
}
@@ -212,7 +212,7 @@
}
else
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA, "Cannot support cipher %s for verification", sign_algo);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA, "Cannot support cipher %s for verification", sign_algo);
status = AXIS2_FAILURE;
}
@@ -240,7 +240,7 @@
decoded_len = axutil_base64_decode_binary(decoded_data, signature);
if (decoded_len < 0)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,
"axutil_base64_decode_binary failed");
return AXIS2_FAILURE;
}
@@ -263,7 +263,7 @@
pubkey = oxs_sign_ctx_get_public_key(sign_ctx, env);
if (!pubkey)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,
"Cannot obtain the public key.");
return AXIS2_FAILURE;
}
@@ -273,7 +273,7 @@
if (status != AXIS2_SUCCESS)
{
/*Error in signature processing*/
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,
"Signature verification FAILED.");
oxs_buffer_free(sig_buf, env);
sig_buf = NULL;
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_binary_security_token.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_binary_security_token.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_binary_security_token.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_binary_security_token.c Tue Apr 29 22:15:53 2008
@@ -49,7 +49,7 @@
binary_security_token_ele = axiom_element_create(env, parent, OXS_NODE_BINARY_SECURITY_TOKEN, ns_obj, &binary_security_token_node);
if (!binary_security_token_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating Binary Security Token element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_c14n_method.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_c14n_method.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_c14n_method.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_c14n_method.c Tue Apr 29 22:15:53 2008
@@ -41,7 +41,7 @@
c14n_method_ele = axiom_element_create(env, parent, OXS_NODE_CANONICALIZATION_METHOD, ns_obj, &c14n_method_node);
if (!c14n_method_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating c14n method element");
return NULL;
}
@@ -74,7 +74,7 @@
c14n_mtd_ele = axiom_node_get_data_element(c14n_mtd_node, env);
if (!c14n_mtd_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving c14n method element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_data.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_data.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_data.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_data.c Tue Apr 29 22:15:53 2008
@@ -38,7 +38,7 @@
cipher_data_ele = axiom_element_create(env, parent, OXS_NODE_CIPHER_DATA, ns_obj, &cipher_data_node);
if (!cipher_data_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating cipher data element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_value.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_value.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_value.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_cipher_value.c Tue Apr 29 22:15:53 2008
@@ -51,7 +51,7 @@
cipher_value_ele = axiom_element_create(env, parent, OXS_NODE_CIPHER_VALUE, ns_obj, &cipher_value_node);
if (!cipher_value_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating cipher value element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_data_reference.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_data_reference.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_data_reference.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_data_reference.c Tue Apr 29 22:15:53 2008
@@ -40,7 +40,7 @@
data_reference_ele = axiom_element_create(env, parent, OXS_NODE_DATA_REFERENCE, ns_obj, &data_reference_node);
if (!data_reference_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating data reference element");
return NULL;
}
@@ -66,7 +66,7 @@
data_reference_ele = axiom_node_get_data_element(data_ref_node, env);
if (!data_reference_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving data reference element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_derived_key_token.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_derived_key_token.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_derived_key_token.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_derived_key_token.c Tue Apr 29 22:15:53 2008
@@ -45,7 +45,7 @@
derived_key_token_ele = axiom_element_create(env, parent, OXS_NODE_DERIVED_KEY_TOKEN, ns_obj, &derived_key_token_node);
if (!derived_key_token_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating %s Token element", OXS_NODE_DERIVED_KEY_TOKEN);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_method.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_method.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_method.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_method.c Tue Apr 29 22:15:53 2008
@@ -41,7 +41,7 @@
digest_method_ele = axiom_element_create(env, parent, OXS_NODE_DIGEST_METHOD, ns_obj, &digest_method_node);
if (!digest_method_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating digest method element");
return NULL;
}
@@ -74,7 +74,7 @@
digest_mtd_ele = axiom_node_get_data_element(digest_mtd_node, env);
if (!digest_mtd_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving digest method element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_value.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_value.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_value.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_digest_value.c Tue Apr 29 22:15:53 2008
@@ -51,7 +51,7 @@
digest_value_ele = axiom_element_create(env, parent, OXS_NODE_DIGEST_VALUE, ns_obj, &digest_value_node);
if (!digest_value_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating digest value element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_ds_reference.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_ds_reference.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_ds_reference.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_ds_reference.c Tue Apr 29 22:15:53 2008
@@ -41,7 +41,7 @@
ds_reference_ele = axiom_element_create(env, parent, OXS_NODE_REFERENCE, ns_obj, &ds_reference_node);
if (!ds_reference_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating ds:Reference element");
return NULL;
}
@@ -76,7 +76,7 @@
reference_ele = axiom_node_get_data_element(ref_node, env);
if (!reference_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving data reference element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_embedded.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_embedded.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_embedded.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_embedded.c Tue Apr 29 22:15:53 2008
@@ -43,7 +43,7 @@
embedded_ele = axiom_element_create(env, parent, OXS_NODE_EMBEDDED, ns_obj, &embedded_node);
if (!embedded_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating embedded element");
return NULL;
}
@@ -71,7 +71,7 @@
embedded_ele = axiom_node_get_data_element(embedded_node, env);
if (!embedded_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving embedded element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_data.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_data.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_data.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_data.c Tue Apr 29 22:15:53 2008
@@ -44,7 +44,7 @@
encrypted_data_ele = axiom_element_create(env, parent, OXS_NODE_ENCRYPTED_DATA, ns_obj, &encrypted_data_node);
if (!encrypted_data_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating encrypted data element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_header.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_header.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_header.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_header.c Tue Apr 29 22:15:53 2008
@@ -41,7 +41,7 @@
enc_header_ele = axiom_element_create(env, parent, OXS_NODE_SIGNATURE, ns_obj, &enc_header_node);
if (!enc_header_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating wss11:EncryptedHeader element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_key.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_key.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_key.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encrypted_key.c Tue Apr 29 22:15:53 2008
@@ -38,7 +38,7 @@
encrypted_key_ele = axiom_element_create(env, parent, OXS_NODE_ENCRYPTED_KEY, ns_obj, &encrypted_key_node);
if (!encrypted_key_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating encrypted key element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encryption_method.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encryption_method.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encryption_method.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_encryption_method.c Tue Apr 29 22:15:53 2008
@@ -41,7 +41,7 @@
encryption_method_ele = axiom_element_create(env, parent, OXS_NODE_ENCRYPTION_METHOD, ns_obj, &encryption_method_node);
if (!encryption_method_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating encryption method element");
return NULL;
}
@@ -74,7 +74,7 @@
enc_mtd_ele = axiom_node_get_data_element(enc_mtd_node, env);
if (!enc_mtd_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving encryption method element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_generation.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_generation.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_generation.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_generation.c Tue Apr 29 22:15:53 2008
@@ -50,7 +50,7 @@
generation_ele = axiom_element_create(env, parent, OXS_NODE_OFFSET, ns_obj, &generation_node);
if (!generation_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating %s element", OXS_NODE_OFFSET);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_identifier.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_identifier.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_identifier.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_identifier.c Tue Apr 29 22:15:53 2008
@@ -43,7 +43,7 @@
ki_ele = axiom_element_create(env, parent, OXS_NODE_KEY_IDENTIFIER, ns_obj, &ki_node);
if (!ki_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating KeyIdentifier element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_info.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_info.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_info.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_info.c Tue Apr 29 22:15:53 2008
@@ -38,7 +38,7 @@
key_info_ele = axiom_element_create(env, parent, OXS_NODE_KEY_INFO, ns_obj, &key_info_node);
if (!key_info_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating KeyInfo element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_name.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_name.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_name.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_key_name.c Tue Apr 29 22:15:53 2008
@@ -40,7 +40,7 @@
key_name_ele = axiom_element_create(env, parent, OXS_NODE_KEY_NAME, ns_obj, &key_name_node);
if (!key_name_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating KeyName element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_label.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_label.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_label.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_label.c Tue Apr 29 22:15:53 2008
@@ -50,7 +50,7 @@
label_ele = axiom_element_create(env, parent, OXS_NODE_LABEL, ns_obj, &label_node);
if (!label_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating %s element", OXS_NODE_LABEL);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_length.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_length.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_length.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_length.c Tue Apr 29 22:15:53 2008
@@ -50,7 +50,7 @@
length_ele = axiom_element_create(env, parent, OXS_NODE_LENGTH, ns_obj, &length_node);
if (!length_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating %s element", OXS_NODE_LENGTH);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_nonce.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_nonce.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_nonce.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_nonce.c Tue Apr 29 22:15:53 2008
@@ -50,7 +50,7 @@
nonce_ele = axiom_element_create(env, parent, OXS_NODE_NONCE, ns_obj, &nonce_node);
if (!nonce_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating %s element", OXS_NODE_NONCE);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_offset.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_offset.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_offset.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_offset.c Tue Apr 29 22:15:53 2008
@@ -55,7 +55,7 @@
offset_ele = axiom_element_create(env, parent, OXS_NODE_OFFSET, ns_obj, &offset_node);
if (!offset_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating %s element", OXS_NODE_OFFSET);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_properties.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_properties.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_properties.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_properties.c Tue Apr 29 22:15:53 2008
@@ -50,7 +50,7 @@
properties_ele = axiom_element_create(env, parent, OXS_NODE_OFFSET, ns_obj, &properties_node);
if (!properties_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating %s element", OXS_NODE_OFFSET);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference.c Tue Apr 29 22:15:53 2008
@@ -42,7 +42,7 @@
reference_ele = axiom_element_create(env, parent, OXS_NODE_REFERENCE, ns_obj, &reference_node);
if (!reference_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating Reference element");
return NULL;
}
@@ -71,7 +71,7 @@
reference_ele = axiom_node_get_data_element(ref_node, env);
if (!reference_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving data reference element");
return NULL;
}
@@ -90,7 +90,7 @@
reference_ele = axiom_node_get_data_element(ref_node, env);
if (!reference_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving data reference element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference_list.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference_list.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference_list.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_reference_list.c Tue Apr 29 22:15:53 2008
@@ -39,7 +39,7 @@
axiom_node_add_child(parent, env, reference_list_node);
if (!reference_list_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating ReferenceList element");
return NULL;
}
@@ -87,7 +87,7 @@
if (!ref_list_node)
{
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"reference list node is NULL");
return NULL;
}
@@ -100,7 +100,7 @@
qname = NULL;
if(!iter){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"There are no children for %s", OXS_NODE_DATA_REFERENCE);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_security_token_reference.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_security_token_reference.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_security_token_reference.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_security_token_reference.c Tue Apr 29 22:15:53 2008
@@ -40,7 +40,7 @@
security_token_reference_ele = axiom_element_create(env, NULL, OXS_NODE_SECURITY_TOKEN_REFRENCE, ns_obj, &security_token_reference_node);
if(!security_token_reference_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating SecurityTokenReference element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature.c Tue Apr 29 22:15:53 2008
@@ -41,7 +41,7 @@
signature_ele = axiom_element_create(env, parent, OXS_NODE_SIGNATURE, ns_obj, &signature_node);
if (!signature_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating ds:Signature element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_confirmation.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_confirmation.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_confirmation.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_confirmation.c Tue Apr 29 22:15:53 2008
@@ -35,7 +35,7 @@
signature_confirmation_ele = axiom_node_get_data_element(signature_confirmation_node, env);
if (!signature_confirmation_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving SignatureConfirmation method element");
return NULL;
}
@@ -61,7 +61,7 @@
signature_confirmation_ele = axiom_node_get_data_element(signature_confirmation_node, env);
if (!signature_confirmation_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving SignatureConfirmation method element");
return NULL;
}
@@ -94,7 +94,7 @@
signature_confirmation_ele = axiom_element_create(env, parent, OXS_NODE_SIGNATURE_CONFIRMATION, ns_obj, &signature_confirmation_node);
if (!signature_confirmation_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error %s element", OXS_NODE_SIGNATURE_CONFIRMATION);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_method.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_method.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_method.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_method.c Tue Apr 29 22:15:53 2008
@@ -41,7 +41,7 @@
signature_method_ele = axiom_element_create(env, parent, OXS_NODE_SIGNATURE_METHOD, ns_obj, &signature_method_node);
if (!signature_method_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating signature method element");
return NULL;
}
@@ -74,7 +74,7 @@
enc_mtd_ele = axiom_node_get_data_element(enc_mtd_node, env);
if (!enc_mtd_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving signature method element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_value.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_value.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_value.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signature_value.c Tue Apr 29 22:15:53 2008
@@ -51,7 +51,7 @@
signature_value_ele = axiom_element_create(env, parent, OXS_NODE_SIGNATURE_VALUE, ns_obj, &signature_value_node);
if (!signature_value_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating signature value element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signed_info.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signed_info.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signed_info.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_signed_info.c Tue Apr 29 22:15:53 2008
@@ -38,7 +38,7 @@
signed_info_ele = axiom_element_create(env, parent, OXS_NODE_SIGNEDINFO, ns_obj, &signed_info_node);
if (!signed_info_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating SignedInfo element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transform.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transform.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transform.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transform.c Tue Apr 29 22:15:53 2008
@@ -40,7 +40,7 @@
transform_ele = axiom_element_create(env, parent, OXS_NODE_TRANSFORM, ns_obj, &transform_node);
if (!transform_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating transform element");
return NULL;
}
@@ -93,7 +93,7 @@
transform_ele = axiom_node_get_data_element(transform_node, env);
if (!transform_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error retrieving digest method element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transforms.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transforms.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transforms.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_transforms.c Tue Apr 29 22:15:53 2008
@@ -37,7 +37,7 @@
transforms_ele = axiom_element_create(env, parent, OXS_NODE_TRANSFORMS, ns_obj, &transforms_node);
if (!transforms_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating Transforms element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_certificate.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_certificate.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_certificate.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_certificate.c Tue Apr 29 22:15:53 2008
@@ -50,7 +50,7 @@
x509_certificate_ele = axiom_element_create(env, parent, OXS_NODE_X509_CERTIFICATE, ns_obj, &x509_certificate_node);
if (!x509_certificate_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating %s element", OXS_NODE_X509_CERTIFICATE);
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_data.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_data.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_data.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_data.c Tue Apr 29 22:15:53 2008
@@ -37,7 +37,7 @@
x509_data_ele = axiom_element_create(env, parent, OXS_NODE_X509_DATA, ns_obj, &x509_data_node);
if (!x509_data_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating X509Data element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_name.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_name.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_name.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_name.c Tue Apr 29 22:15:53 2008
@@ -51,7 +51,7 @@
issuer_name_ele = axiom_element_create(env, parent, OXS_NODE_X509_ISSUER_NAME, ns_obj, &issuer_name_node);
if (!issuer_name_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_serial.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_serial.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_serial.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_issuer_serial.c Tue Apr 29 22:15:53 2008
@@ -58,7 +58,7 @@
x509_issuer_serial_ele = axiom_element_create(env, parent, OXS_NODE_X509_ISSUER_SERIAL, ns_obj, &x509_issuer_serial_node);
if (!x509_issuer_serial_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating X509IssuerSerial element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_serial_number.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_serial_number.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_serial_number.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/token_x509_serial_number.c Tue Apr 29 22:15:53 2008
@@ -51,7 +51,7 @@
serial_number_ele = axiom_element_create(env, parent, OXS_NODE_X509_SERIAL_NUMBER, ns_obj, &serial_number_node);
if (!serial_number_ele)
{
- oxs_error(env, ERROR_LOCATION,
+ oxs_error(env, OXS_ERROR_LOCATION,
OXS_ERROR_ELEMENT_FAILED, "Error creating element");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/transforms_factory.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/transforms_factory.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/transforms_factory.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/transforms_factory.c Tue Apr 29 22:15:53 2008
@@ -39,7 +39,7 @@
oxs_tr_dtype_t output_dtype = OXS_TRANSFORM_TYPE_UNKNOWN;
if(input_dtype != OXS_TRANSFORM_TYPE_NODE){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Transform expects a NODE.");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED,"Transform expects a NODE.");
return OXS_TRANSFORM_TYPE_UNKNOWN;
}
@@ -61,7 +61,7 @@
axiom_node_t *sig_node = NULL, *child_node = NULL;
if(input_dtype != OXS_TRANSFORM_TYPE_NODE){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED, "Transform expects a NODE.");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED, "Transform expects a NODE.");
return OXS_TRANSFORM_TYPE_UNKNOWN;
}
child_node = axiom_node_get_first_element(input, env);
@@ -148,7 +148,7 @@
{
axutil_qname_free(embeded_qname, env);
axutil_qname_free(key_qname, env);
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED, "Unrecognized reference type NODE.");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED, "Unrecognized reference type NODE.");
return OXS_TRANSFORM_TYPE_UNKNOWN;
}
}
@@ -167,7 +167,7 @@
return output_dtype;
}
*output = NULL;
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED, "Referenced node couln't be found in the specifed scope.");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_TRANSFORM_FAILED, "Referenced node couln't be found in the specifed scope.");
return OXS_TRANSFORM_TYPE_UNKNOWN;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/xml_encryption.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/xml_encryption.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/xml_encryption.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/xml_encryption.c Tue Apr 29 22:15:53 2008
@@ -355,14 +355,14 @@
/*Decrypt*/
status = oxs_xml_enc_decrypt_data(env, enc_ctx, enc_type_node, result_buf);
if(AXIS2_FAILURE == status){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED, "Data encryption failed");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED, "Data encryption failed");
return AXIS2_FAILURE;
}
decrypted_data = axutil_strmemdup(oxs_buffer_get_data(result_buf, env), oxs_buffer_get_size(result_buf, env), env);
/*De-serialize the decrypted content to build the node*/
deserialized_node = (axiom_node_t*)oxs_axiom_deserialize_node(env, decrypted_data);
if(!deserialized_node){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,"Cannot deserialize a node from the content.\n%s", decrypted_data);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,"Cannot deserialize a node from the content.\n%s", decrypted_data);
return AXIS2_FAILURE;
}
/*Assign deserialized_node to the reference passed*/
@@ -490,7 +490,7 @@
input = NULL;
if(AXIS2_FAILURE == status){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
"Assymmetric key encryption failed");
return AXIS2_FAILURE;
}
@@ -573,14 +573,14 @@
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){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED, "Cannot find the Encryption method");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED, "Cannot find the Encryption method");
return AXIS2_FAILURE;
}
/*Get cipher data*/
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){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED, "Cannot find the cipher value for key decryption");
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED, "Cannot find the cipher value for key decryption");
return AXIS2_FAILURE;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/xml_key_processor.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/xml_key_processor.c?rev=652262&r1=652261&r2=652262&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/xml_key_processor.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/xml_key_processor.c Tue Apr 29 22:15:53 2008
@@ -43,7 +43,7 @@
node_name = axiom_util_get_localname(X509SKI_node, env);
if(0 != axutil_strcmp(node_name, OXS_NODE_X509_SKI)){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_SKI, node_name);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_SKI, node_name);
return AXIS2_FAILURE;
}
@@ -65,7 +65,7 @@
node_name = axiom_util_get_localname(X509_subj_name_node, env);
if(0 != axutil_strcmp(node_name, OXS_NODE_X509_SUBJECT_NAME)){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_SUBJECT_NAME, node_name);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_SUBJECT_NAME, node_name);
return AXIS2_FAILURE;
}
@@ -89,7 +89,7 @@
node_name = axiom_util_get_localname(X509_issuer_serial_node, env);
if(0 != axutil_strcmp(node_name, OXS_NODE_X509_ISSUER_SERIAL)){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_ISSUER_SERIAL, node_name);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_ISSUER_SERIAL, node_name);
return AXIS2_FAILURE;
}
@@ -121,7 +121,7 @@
oxs_x509_cert_t *_cert = NULL;
node_name = axiom_util_get_localname(X509_cert_node, env);
if(0 != axutil_strcmp(node_name, OXS_NODE_X509_CERTIFICATE)){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_CERTIFICATE, node_name);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_CERTIFICATE, node_name);
return AXIS2_FAILURE;
}
/*Get contents*/
@@ -148,7 +148,7 @@
node_name = axiom_util_get_localname(X509_data_node, env);
if(0 != axutil_strcmp(node_name, OXS_NODE_X509_DATA)){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_DATA, node_name);
+ oxs_error(env, OXS_ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_DATA, node_name);
return AXIS2_FAILURE;
}
child_node = axiom_node_get_first_element( X509_data_node, env);