Fixed memory corruption in _KeyData

Author: bgaifullin

src/xmlsec.h

@@ -1,7 +1,9 @@
-#include <xmlsec/xmltree.h>
+#include <xmlsec/xmlsec.h>
+#include <xmlsec/errors.h>
+#include <xmlsec/templates.h>
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/xmlenc.h>
-#include <xmlsec/templates.h>
-#include <xmlsec/errors.h>
+#include <xmlsec/xmltree.h>
 #include <xmlsec/openssl/app.h>
 #include <xmlsec/openssl/crypto.h>
+#include <xmlsec/openssl/x509.h>

src/xmlsec/key.pyx

@@ -239,29 +239,17 @@ cdef class KeysManager(object):
         handle = xmlSecKeysMngrCreate()
         if handle == NULL:
             raise InternalError("failed to create keys manager", -1)
+        rv = xmlSecOpenSSLAppDefaultKeysMngrInit(handle)
+        if rv < 0:
+            xmlSecKeysMngrDestroy(handle)
+            raise InternalError("failed to init manager", rv)
+
         self._handle = handle
 
     def __dealloc__(self):
         if self._handle != NULL:
             xmlSecKeysMngrDestroy(self._handle)
 
-
-    def __ensure_init(self, expected_mode):
-        if self._mode == expected_mode:
-            return
-
-        if self._mode != 0:
-           raise InternalError("Cannot use one manager for verify and sign", -1)
-
-        if expected_mode == 1:
-           rv = xmlSecOpenSSLAppDefaultKeysMngrInit(self._handle)
-        else:
-           rv = xmlSecOpenSSLKeysMngrInit(self._handle)
-
-        if rv < 0:
-            raise InternalError("failed to initialize keys manager", rv)
-
-
     def add_key(self, Key key):
         """add (a copy of) *key*."""
 
@@ -273,7 +261,6 @@ cdef class KeysManager(object):
         if key_handle == NULL:
             raise InternalError("failed to copy key", -1)
 
-        self.__ensure_init(1)
         rv = xmlSecOpenSSLAppDefaultKeysMngrAdoptKey(self._handle, key_handle)
         if rv < 0:
             xmlSecKeyDestroy(key_handle)
@@ -287,7 +274,6 @@ cdef class KeysManager(object):
         cdef int rv
         cdef const_char* c_filename = <const_char*>_b(filename)
 
-        self.__ensure_init(2)
         with nogil:
             rv = xmlSecOpenSSLAppKeysMngrCertLoad(self._handle, c_filename, format, type)
 
@@ -308,7 +294,6 @@ cdef class KeysManager(object):
         c_size = len(data)
         c_data = <const_unsigned_char*><char*>data
 
-        self.__ensure_init(2)
         with nogil:
             rv = xmlSecOpenSSLAppKeysMngrCertLoadMemory(self._handle, c_data, c_size, format, type)
 

src/xmlsec/utils.pyx

@@ -16,16 +16,16 @@ def init():
     This is called upon library import and does not need to be called
     again (unless @ref _shutdown is called explicitly).
     """
-    r = xmlSecInit()
-    if r != 0:
+    if xmlSecInit() < 0:
         return False
 
-    r = xmlSecOpenSSLInit()
-    if r != 0:
+    if xmlSecOpenSSLAppInit(NULL) < 0:
+        xmlSecShutdown()
         return False
 
-    r = xmlSecOpenSSLAppInit(NULL)
-    if r != 0:
+    if xmlSecOpenSSLInit() < 0:
+        xmlSecOpenSSLAppShutdown()
+        xmlSecShutdown()
         return False
 
     return True
@@ -37,16 +37,16 @@ def shutdown():
     This is called automatically upon interpreter termination and
     should not need to be called explicitly.
     """
-    r = xmlSecOpenSSLAppShutdown()
-    if r != 0:
+    if xmlSecOpenSSLShutdown() < 0:
         return False
 
-    r = xmlSecOpenSSLShutdown()
-    if r != 0:
+    if xmlSecOpenSSLAppShutdown() < 0:
         return False
 
-    r = xmlSecShutdown()
-    return r == 0
+    if xmlSecShutdown() < 0:
+        return False
+
+    return True
 
 
 def enable_debug_trace(flag):