Add context dump in debug

bgaifullin · bgaifullin · commit 55f670b56535 · 2017-07-21T16:59:04.000+01:00
diff --git a/src/debug.h b/src/debug.h
@@ -15,9 +15,11 @@
 #include <stdio.h>
 #define PYXMLSEC_DEBUG(fmt) fprintf(stderr, "[%s:%d %s] " fmt "\n", __FILE__, __LINE__, __FUNCTION__)
 #define PYXMLSEC_DEBUGF(fmt, ...) fprintf(stderr, "[%s:%d %s] " fmt "\n", __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#define PYXMLSEC_DUMP(method, obj) method(obj, stderr)
 #else
 #define PYXMLSEC_DEBUG(...)
 #define PYXMLSEC_DEBUGF(...)
+#define PYXMLSEC_DUMP(method, obj)
 #endif // PYXMLSEC_ENABLE_DEBUG
 
 #endif // __PYXMLSEC_DEBUG_H__
diff --git a/src/ds.c b/src/ds.c
@@ -172,9 +172,11 @@ static PyObject* PyXmlSec_SignatureContextSign(PyObject* self, PyObject* args, P
         goto ON_FAIL;
     }
 
+    xmlSecDSigCtxPtr ctx = ((PyXmlSec_SignatureContext*)self)->handle;
     int rv;
     Py_BEGIN_ALLOW_THREADS;
-    rv = xmlSecDSigCtxSign(((PyXmlSec_SignatureContext*)self)->handle, node->_c_node);
+    rv = xmlSecDSigCtxSign(ctx, node->_c_node);
+    PYXMLSEC_DUMP(xmlSecDSigCtxDebugDump, ctx);
     Py_END_ALLOW_THREADS;
     if (rv < 0) {
         PyXmlSec_SetLastError("failed to sign");
@@ -202,17 +204,18 @@ static PyObject* PyXmlSec_SignatureContextVerify(PyObject* self, PyObject* args,
         goto ON_FAIL;
     }
 
-    xmlSecDSigCtxPtr handle = ((PyXmlSec_SignatureContext*)self)->handle;
+    xmlSecDSigCtxPtr ctx = ((PyXmlSec_SignatureContext*)self)->handle;
     int rv;
     Py_BEGIN_ALLOW_THREADS;
-    rv = xmlSecDSigCtxVerify(handle, node->_c_node);
+    rv = xmlSecDSigCtxVerify(ctx, node->_c_node);
+    PYXMLSEC_DUMP(xmlSecDSigCtxDebugDump, ctx);
     Py_END_ALLOW_THREADS;
 
     if (rv < 0) {
         PyXmlSec_SetLastError("failed to verify");
         goto ON_FAIL;
     }
-    if (handle->status != xmlSecDSigStatusSucceeded) {
+    if (ctx->status != xmlSecDSigStatusSucceeded) {
         PyErr_SetString(PyXmlSec_VerificationError, "Signature is invalid.");
         goto ON_FAIL;
     }
diff --git a/src/enc.c b/src/enc.c
@@ -113,6 +113,7 @@ static PyObject* PyXmlSec_EncryptionContextReset(PyObject* self, PyObject* args,
     xmlSecEncCtxPtr ctx = ((PyXmlSec_EncryptionContext*)self)->handle;
     Py_BEGIN_ALLOW_THREADS;
     xmlSecEncCtxReset(ctx);
+    PYXMLSEC_DUMP(xmlSecEncCtxDebugDump, ctx);
     Py_END_ALLOW_THREADS;
     PYXMLSEC_DEBUGF("%p: reset context - ok", self);
     Py_RETURN_NONE;
@@ -141,6 +142,7 @@ static PyObject* PyXmlSec_EncryptionContextEncryptBinary(PyObject* self, PyObjec
     int rv;
     Py_BEGIN_ALLOW_THREADS;
     rv = xmlSecEncCtxBinaryEncrypt(ctx, template->_c_node, (const xmlSecByte*)data, (xmlSecSize)data_size);
+    PYXMLSEC_DUMP(xmlSecEncCtxDebugDump, ctx);
     Py_END_ALLOW_THREADS;
 
     if (rv < 0) {
@@ -226,6 +228,7 @@ static PyObject* PyXmlSec_EncryptionContextEncryptXml(PyObject* self, PyObject*
             xnew_node = NULL;
         }
     }
+    PYXMLSEC_DUMP(xmlSecEncCtxDebugDump, ctx);
     Py_END_ALLOW_THREADS;
 
     PyXmlSec_ClearReplacedNodes(ctx, node->_doc);
@@ -268,6 +271,7 @@ static PyObject* PyXmlSec_EncryptionContextEncryptUri(PyObject* self, PyObject*
     int rv;
     Py_BEGIN_ALLOW_THREADS;
     rv = xmlSecEncCtxUriEncrypt(ctx, template->_c_node, (const xmlSecByte*)uri);
+    PYXMLSEC_DUMP(xmlSecEncCtxDebugDump, ctx);
     Py_END_ALLOW_THREADS;
 
     if (rv < 0) {
@@ -329,6 +333,7 @@ static PyObject* PyXmlSec_EncryptionContextDecrypt(PyObject* self, PyObject* arg
     ctx->mode = xmlSecCheckNodeName(node->_c_node, xmlSecNodeEncryptedKey, xmlSecEncNs) ? xmlEncCtxModeEncryptedKey : xmlEncCtxModeEncryptedData;
     PYXMLSEC_DEBUGF("mode: %d", ctx->mode);
     rv = xmlSecEncCtxDecrypt(ctx, node->_c_node);
+    PYXMLSEC_DUMP(xmlSecEncCtxDebugDump, ctx);
     Py_END_ALLOW_THREADS;
 
     PyXmlSec_ClearReplacedNodes(ctx, node->_doc);
