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 ka...@apache.org on 2007/09/05 11:21:05 UTC

svn commit: r572917 - in /webservices/rampart/trunk/c/src: omxmlsec/x509_cert.c util/rampart_encryption.c util/rampart_token_processor.c

Author: kaushalye
Date: Wed Sep  5 02:21:04 2007
New Revision: 572917

URL: http://svn.apache.org/viewvc?rev=572917&view=rev
Log:
Adding more error messages.
Memory leak fixing

Modified:
    webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c
    webservices/rampart/trunk/c/src/util/rampart_encryption.c
    webservices/rampart/trunk/c/src/util/rampart_token_processor.c

Modified: webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c?rev=572917&r1=572916&r2=572917&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/x509_cert.c Wed Sep  5 02:21:04 2007
@@ -292,7 +292,7 @@
 {
     if(x509_cert->public_key)
     {
-        AXIS2_FREE(env->allocator, x509_cert->public_key);
+        openssl_pkey_free(x509_cert->public_key, env);
         x509_cert->public_key = NULL;
     }
     x509_cert->public_key = public_key;

Modified: webservices/rampart/trunk/c/src/util/rampart_encryption.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_encryption.c?rev=572917&r1=572916&r2=572917&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_encryption.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_encryption.c Wed Sep  5 02:21:04 2007
@@ -499,8 +499,8 @@
 
     if(!session_key)
     {
-        AXIS2_LOG_INFO(env->log, 
-            "[rampart][rampart_encryption]Encrypting Signature.Session key not found");
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                "[rampart][rampart_encryption]Encrypting Signature.Session key not found");
         return AXIS2_FAILURE;
     }
 
@@ -509,7 +509,7 @@
 
     if(!node_to_enc)
     {
-        AXIS2_LOG_INFO(env->log, 
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
             "[rampart][rampart_encryption]Encrypting Signature. Signature node not found");
         return AXIS2_FAILURE;
     }   
@@ -518,7 +518,7 @@
             env, sec_node,  OXS_NODE_ENCRYPTED_KEY);
     if(!encrypted_key_node)
     {
-        AXIS2_LOG_INFO(env->log, 
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
             "[rampart][rampart_encryption]Encrypting signature, EncryptedKey Not found");
         return AXIS2_FAILURE;
     }
@@ -543,6 +543,8 @@
    
     if(enc_status != AXIS2_SUCCESS)
     {
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
+            "[rampart][rampart_encryption] Encrypting node failed");
         return AXIS2_FAILURE;
     }
 
@@ -558,7 +560,7 @@
                     enc_data_node, env, temp_node);
             if(enc_status != AXIS2_SUCCESS)
             {
-                AXIS2_LOG_INFO(env->log, 
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
                     "[rampart][rampart_encryption]Encrypting signature, Node moving failed.");    
                 return AXIS2_FAILURE;
             }    
@@ -573,7 +575,7 @@
             env, encrypted_key_node, id_list);    
     if(enc_status != AXIS2_SUCCESS)
     {
-        AXIS2_LOG_INFO(env->log, 
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
             "[rampart][rampart_encryption]Encrypting signature,Building reference list failed");
         return AXIS2_FAILURE;
     }

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=572917&r1=572916&r2=572917&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_token_processor.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_token_processor.c Wed Sep  5 02:21:04 2007
@@ -93,10 +93,12 @@
     if(_cert){
         status =  AXIS2_SUCCESS;
     }else{
+        oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT, "Cannot load certificate from string =%s", data);
         status =  AXIS2_FAILURE;
     }
 
     oxs_x509_cert_copy_to(_cert, env, cert);
+
     return status;
 }