diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2011-12-02 18:31:06 +0100 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2011-12-05 12:03:13 +0100 |
| commit | 2a63167627137136fdd7bc64e53a500820a2096f (patch) | |
| tree | c8892cf3d7ccfe88f6f6d9f853e2d425337f92e8 | |
| parent | 0c45b252dc9f3e6c7aff8dd24e39b3f5596d35b0 (diff) | |
| download | lasso-2a63167627137136fdd7bc64e53a500820a2096f.tar.gz lasso-2a63167627137136fdd7bc64e53a500820a2096f.tar.xz lasso-2a63167627137136fdd7bc64e53a500820a2096f.zip | |
[core] set the xmlSec log handler globally
The log handler is not set in lasso_init().
| -rw-r--r-- | lasso/lasso.c | 11 | ||||
| -rw-r--r-- | lasso/xml/tools.c | 14 |
2 files changed, 11 insertions, 14 deletions
diff --git a/lasso/lasso.c b/lasso/lasso.c index 28e60fb6..b00893da 100644 --- a/lasso/lasso.c +++ b/lasso/lasso.c @@ -127,6 +127,16 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) #include "types.c" +static void +lasso_xml_generic_error_func(G_GNUC_UNUSED void *ctx, const char *msg, ...) +{ + va_list args; + + va_start(args, msg); + g_logv(LASSO_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, msg, args); + va_end(args); +} + /** * lasso_init: * @@ -183,6 +193,7 @@ int lasso_init() return LASSO_ERROR_UNDEFINED; } lasso_flag_parse_environment_variable(); + xmlSetGenericErrorFunc(NULL, lasso_xml_generic_error_func); return 0; } diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c index 8c27cffd..726af48a 100644 --- a/lasso/xml/tools.c +++ b/lasso/xml/tools.c @@ -1230,16 +1230,6 @@ lasso_saml_constrain_dsigctxt(xmlSecDSigCtxPtr dsigCtx) { return TRUE; } -static void -lasso_xml_generic_error_func(G_GNUC_UNUSED void *ctx, const char *msg, ...) -{ - va_list args; - - va_start(args, msg); - g_logv(LASSO_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, msg, args); - va_end(args); -} - /** * lasso_verify_signature: * @signed_node: an #xmlNode containing an enveloped xmlDSig signature @@ -1324,8 +1314,6 @@ lasso_verify_signature(xmlNode *signed_node, xmlDoc *doc, const char *id_attr_na dsigCtx->signKey = xmlSecKeyDuplicate(public_key); } - xmlSetGenericErrorFunc(NULL, lasso_xml_generic_error_func); - /* Verify signature */ goto_cleanup_if_fail_with_rc(xmlSecDSigCtxVerify(dsigCtx, signature) >= 0, LASSO_DS_ERROR_SIGNATURE_VERIFICATION_FAILED); @@ -1546,8 +1534,6 @@ lasso_node_decrypt_xmlnode(xmlNode* encrypted_element, goto cleanup; } - xmlSetGenericErrorFunc(NULL, lasso_xml_generic_error_func); - /* Need to duplicate it because xmlSecEncCtxDestroy(encCtx); will destroy it */ encryption_private_key = xmlSecKeyDuplicate(encryption_private_key); |