[rs-commit] r72 - /redwax-tool/trunk/redwax_p11kit.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Wed Nov 24 20:05:15 2021
New Revision: 72

Log:
Give more detail of tokens that cannot be opened.

Modified:
    redwax-tool/trunk/redwax_p11kit.c

Modified: redwax-tool/trunk/redwax_p11kit.c
==============================================================================
--- redwax-tool/trunk/redwax_p11kit.c	(original)
+++ redwax-tool/trunk/redwax_p11kit.c	Wed Nov 24 20:05:15 2021
@@ -973,10 +973,14 @@
             CKF_SERIAL_SESSION | CKF_RW_SESSION, NULL, NULL, &session);
     if (ret != CKR_OK) {
 
-        redwax_print_error(r,
-                "pkcs11-out: could not open session to '%s': %s\n",
+        redwax_print_error(r, "pkcs11-out: could not open session to tpken '%s' "
+                "(model '%s', manufacturer '%s'), skipping: %s\n",
                 redwax_pstrntrim(pool, (const char*) tokenInfo->label,
-                        sizeof(tokenInfo->label)), pkcs11_errstr(ret));
+                        sizeof(tokenInfo->label)),
+                redwax_pstrntrim(pool, (const char*) tokenInfo->model,
+                        sizeof(tokenInfo->model)),
+                redwax_pstrntrim(pool, (const char*) tokenInfo->manufacturerID,
+                        sizeof(tokenInfo->manufacturerID)), pkcs11_errstr(ret));
 
         apr_pool_destroy(pool);
 
@@ -1193,10 +1197,14 @@
             CKF_SERIAL_SESSION, NULL, NULL, &session);
     if (ret != CKR_OK) {
 
-        redwax_print_error(r,
-                "pkcs11-in: could not open session to '%s', skipping: %s\n",
+        redwax_print_error(r, "pkcs11-in: could not open session to tpken '%s' "
+                "(model '%s', manufacturer '%s'), skipping: %s\n",
                 redwax_pstrntrim(pool, (const char*) tokenInfo->label,
-                        sizeof(tokenInfo->label)), pkcs11_errstr(ret));
+                        sizeof(tokenInfo->label)),
+                redwax_pstrntrim(pool, (const char*) tokenInfo->model,
+                        sizeof(tokenInfo->model)),
+                redwax_pstrntrim(pool, (const char*) tokenInfo->manufacturerID,
+                        sizeof(tokenInfo->manufacturerID)), pkcs11_errstr(ret));
 
         apr_pool_destroy(pool);