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/08/22 07:53:53 UTC

svn commit: r568429 - in /webservices/rampart/trunk/c/src/omxmlsec: iv.c key.c openssl/pkey.c openssl/x509.c

Author: kaushalye
Date: Tue Aug 21 22:53:53 2007
New Revision: 568429

URL: http://svn.apache.org/viewvc?rev=568429&view=rev
Log:
Memory leak fixes and more specific error codes

Modified:
    webservices/rampart/trunk/c/src/omxmlsec/iv.c
    webservices/rampart/trunk/c/src/omxmlsec/key.c
    webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c
    webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c

Modified: webservices/rampart/trunk/c/src/omxmlsec/iv.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/iv.c?rev=568429&r1=568428&r2=568429&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/iv.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/iv.c Tue Aug 21 22:53:53 2007
@@ -34,7 +34,7 @@
     cprop =  oxs_get_cipher_property_for_url(env, key_algo);
     if (!cprop)
     {
-        oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
+        oxs_error(env, 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=568429&r1=568428&r2=568429&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/key.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/key.c Tue Aug 21 22:53:53 2007
@@ -259,7 +259,7 @@
     cprop = (openssl_cipher_property_t *)oxs_get_cipher_property_for_url(env, key_algo);
     if (!cprop)
     {
-        oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
+        oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
                   "openssl_get_cipher_property failed");
         return AXIS2_FAILURE;
     }
@@ -271,7 +271,7 @@
     ret = generate_random_data(env, key_buf, size);
     if (ret == AXIS2_FAILURE)
     {
-        oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
+        oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
                   "generate_random_data failed");
         return AXIS2_FAILURE;
     }

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=568429&r1=568428&r2=568429&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c Tue Aug 21 22:53:53 2007
@@ -185,7 +185,7 @@
         if (!pk)
         {
             /*If there is no key by now its an error*/
-            oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
+            oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
                       "Cannot load key from %s", filename);
 
             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=568429&r1=568428&r2=568429&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c Tue Aug 21 22:53:53 2007
@@ -380,8 +380,8 @@
     
     BIO_free(out);
     if(data){
-    /*    AXIS2_FREE(env->allocator, data);
-        data = NULL;*/
+        AXIS2_FREE(env->allocator, data);
+        data = NULL;
     }
     out = NULL;