From 6b10272caabcf69a46c4ecd194e4d695596fc1b4 Mon Sep 17 00:00:00 2001 From: andre Date: Thu, 16 Dec 2010 03:56:49 +0000 Subject: [PATCH] framework-pkcs15.c: More specific log messages. Enables better tracking of errors. git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4953 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/pkcs11/framework-pkcs15.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c index 86bea746..935a6d5e 100644 --- a/src/pkcs11/framework-pkcs15.c +++ b/src/pkcs11/framework-pkcs15.c @@ -163,10 +163,18 @@ static CK_RV pkcs15_bind(struct sc_pkcs11_card *p11card) p11card->fw_data = fw_data; rc = sc_pkcs15_bind(p11card->card, &fw_data->p15_card); - sc_debug(context, SC_LOG_DEBUG_NORMAL, "Binding to PKCS#15, rc=%d\n", rc); - if (rc < 0) + if (rc != SC_SUCCESS) { + sc_debug(context, SC_LOG_DEBUG_NORMAL, "sc_pkcs15_bind failed: %d", rc); return sc_to_cryptoki_error(rc, NULL); - return register_mechanisms(p11card); + } + + rc = register_mechanisms(p11card); + if (rc != CKR_OK) { + sc_debug(context, SC_LOG_DEBUG_NORMAL, "register_mechanisms failed: 0x%x", rc); + return rc; + } + + return CKR_OK; } static CK_RV pkcs15_unbind(struct sc_pkcs11_card *p11card)