Some random change

Author: mxamin

src/main.c

@@ -22,6 +22,7 @@
 #define _PYXMLSEC_FREE_XMLSEC 1
 #define _PYXMLSEC_FREE_CRYPTOLIB 2
 #define _PYXMLSEC_FREE_ALL 3
+#define _PYXMLSEC_FREE_ALL_BUT_CRYPTOLIB 4
 
 static int free_mode = _PYXMLSEC_FREE_NONE;
 
@@ -52,6 +53,12 @@ static void PyXmlSec_Free(int what) {
 #endif
     case _PYXMLSEC_FREE_XMLSEC:
         xmlSecShutdown();
+        break;
+    case _PYXMLSEC_FREE_ALL_BUT_CRYPTOLIB:
+        xmlSecCryptoShutdown();
+        xmlSecCryptoAppShutdown();
+        xmlSecShutdown();
+        break;
     }
     free_mode = _PYXMLSEC_FREE_NONE;
 }
@@ -95,7 +102,10 @@ static int PyXmlSec_Init(void) {
     // We thus reinstall our callback now.
     PyXmlSec_InstallErrorCallback();
 
-    free_mode = _PYXMLSEC_FREE_ALL;
+    // Keep the dynamically loaded crypto backend resident for the lifetime of
+    // the process. Python-level constants cache xmlsec transform/keydata ids,
+    // and unloading the backend invalidates those pointers after shutdown/init.
+    free_mode = _PYXMLSEC_FREE_ALL_BUT_CRYPTOLIB;
     return 0;
 }
 

tests/test_xmlsec.py

@@ -1,5 +1,7 @@
+from pathlib import Path
 import subprocess
 import sys
+import unittest
 
 import xmlsec
 from tests import base
@@ -15,14 +17,32 @@ def test_reinitialize_module(self):
         xmlsec.shutdown()
         xmlsec.init()
 
+
+class TestInterpreterShutdown(unittest.TestCase):
     def test_interpreter_exit_with_live_xmlsec_objects(self):
-        key_path = self.path('rsakey.pem')
+        key_path = Path(__file__).with_name('data') / 'rsakey.pem'
         script = f"""
 import xmlsec
 
-key = xmlsec.Key.from_file({key_path!r}, format=xmlsec.constants.KeyDataFormatPem)
+key = xmlsec.Key.from_file({str(key_path)!r}, format=xmlsec.constants.KeyDataFormatPem)
 ctx = xmlsec.SignatureContext()
 ctx.key = key
+"""
+        proc = subprocess.run([sys.executable, '-c', script], capture_output=True, text=True)
+        self.assertEqual(proc.returncode, 0, proc.stderr)
+
+    def test_reinitialize_module_preserves_constants(self):
+        script = """
+import xmlsec
+
+transform = xmlsec.constants.TransformExclC14N
+keydata = xmlsec.constants.KeyDataAes
+
+xmlsec.shutdown()
+xmlsec.init()
+
+assert transform.name == "exc-c14n"
+assert keydata.name == "aes"
 """
         proc = subprocess.run([sys.executable, '-c', script], capture_output=True, text=True)
         self.assertEqual(proc.returncode, 0, proc.stderr)