Skip to content

Reinstall custom error callback after xmlSecCryptoInit() #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2021
Merged

Reinstall custom error callback after xmlSecCryptoInit() #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ static int PyXmlSec_Init(void) {
PyXmlSec_Free(_PYXMLSEC_FREE_ALL);
return -1;
}
// xmlsec will install default callback in xmlSecCryptoInit,
// overwriting any custom callbacks.
// We thus reinstall our callback now.
PyXmlSec_InstallErrorCallback();

free_mode = _PYXMLSEC_FREE_ALL;
return 0;
}
Expand Down Expand Up @@ -239,11 +244,6 @@ PYENTRY_FUNC_NAME(void)

if (PyXmlSec_Init() < 0) goto ON_FAIL;

// xmlsec will install default callback in PyXmlSec_Init,
// overwriting any custom callbacks.
// We thus install our callback again now.
PyXmlSec_InstallErrorCallback();

if (PyModule_AddStringConstant(module, "__version__", STRINGIFY(MODULE_VERSION)) < 0) goto ON_FAIL;

if (PyXmlSec_InitLxmlModule() < 0) goto ON_FAIL;
Expand Down
4 changes: 2 additions & 2 deletions tests/test_xmlsec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ def test_reinitialize_module(self):
tests don't fail, we know that the ``init()``/``shutdown()``
function pair doesn't break anything.
"""
# xmlsec.shutdown()
# xmlsec.init()
xmlsec.shutdown()
xmlsec.init()