[rt-commit] r218 - in /redwax-tool/trunk: ChangeLog redwax_nss.c

[rt-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sun Jun 22 12:14:30 2025
New Revision: 218

Log:
Add detail to NSS error messages.

Modified:
    redwax-tool/trunk/ChangeLog
    redwax-tool/trunk/redwax_nss.c

Modified: redwax-tool/trunk/ChangeLog
==============================================================================
--- redwax-tool/trunk/ChangeLog	(original)
+++ redwax-tool/trunk/ChangeLog	Sun Jun 22 12:14:30 2025
@@ -1,5 +1,7 @@
 
 Changes with v0.9.10
+
+ *) Add detail to NSS error messages. [Graham Leggett]
 
  *) Add --tls-in to read certificates from endpoints
     pointed to by A and AAAA DNS records.

Modified: redwax-tool/trunk/redwax_nss.c
==============================================================================
--- redwax-tool/trunk/redwax_nss.c	(original)
+++ redwax-tool/trunk/redwax_nss.c	Sun Jun 22 12:14:30 2025
@@ -461,7 +461,7 @@
                 if (PORT_GetError() == SEC_ERROR_TOKEN_NOT_LOGGED_IN) {
                     rv = PK11_Authenticate(slot, PR_TRUE, &s);
                     if (rv != SECSuccess) {
-                        redwax_print_error(r, "Error: could not log in to token '%s', giving up.\n",
+                        redwax_print_error(r, "nss-out: could not log in to token '%s', giving up.\n",
                                 PK11_GetTokenName(slot));
                         apr_pool_destroy(pool);
                         return APR_EACCES;
@@ -473,7 +473,7 @@
                     }
                 }
                 if (rv != SECSuccess) {
-                    redwax_print_error(r, "Warning: could not import key to token '%s', skipping: %s\n",
+                    redwax_print_error(r, "nss-out: could not import key to token '%s', skipping: %s\n",
                             PK11_GetTokenName(slot), PR_ErrorToName(PR_GetError()));
                     continue;
                 }
@@ -491,7 +491,7 @@
 
             x = CERT_DecodeCertFromPackage((char *)cert->der, cert->len);
             if (!x) {
-                redwax_print_error(r, "Warning: could not decode certificate to be written to '%s', skipping: %s\n",
+                redwax_print_error(r, "nss-out: could not decode certificate to be written to '%s', skipping: %s\n",
                         file, PR_ErrorToName(PR_GetError()));
                 continue;
             }
@@ -553,7 +553,7 @@
                 if (PORT_GetError() == SEC_ERROR_TOKEN_NOT_LOGGED_IN) {
                     rv = PK11_Authenticate(slot, PR_TRUE, &s);
                     if (rv != SECSuccess) {
-                        redwax_print_error(r, "Error: could not log in to token '%s', giving up.\n",
+                        redwax_print_error(r, "nss-out: could not log in to token '%s', giving up.\n",
                                 PK11_GetTokenName(slot));
                         apr_pool_destroy(pool);
                         return APR_EACCES;
@@ -570,8 +570,8 @@
                     }
                 }
                 if (rv != SECSuccess) {
-                    redwax_print_error(r, "Warning: could not add certificate to token '%s', skipping.\n",
-                            PK11_GetTokenName(slot));
+                    redwax_print_error(r, "nss-out: could not add certificate '%s' to token '%s', skipping: %s\n",
+                            x->subjectName, PK11_GetTokenName(slot), PR_ErrorToName(PR_GetError()));
                     continue;
                 }
             }
@@ -594,7 +594,7 @@
 
             x = CERT_DecodeCertFromPackage((char *)cert->der, cert->len);
             if (!x) {
-                redwax_print_error(r, "Could not decode certificate to be written to '%s', skipping: %s\n",
+                redwax_print_error(r, "nss-out: could not decode certificate to be written to '%s', skipping: %s\n",
                         file, PR_ErrorToName(PR_GetError()));
                 apr_pool_destroy(pool);
                 return APR_EINVAL;
@@ -612,7 +612,7 @@
                 if (xx) {
 
                     redwax_print_error(r,
-                            "Warning: nss-out: intermediate '%s' already exists, skipping.\n",
+                            "nss-out: intermediate '%s' already exists, skipping.\n",
                             x->subjectName);
 
                     apr_pool_cleanup_register(pool, xx, cleanup_cert,
@@ -647,7 +647,7 @@
                 if (PORT_GetError() == SEC_ERROR_TOKEN_NOT_LOGGED_IN) {
                     rv = PK11_Authenticate(slot, PR_TRUE, &s);
                     if (rv != SECSuccess) {
-                        redwax_print_error(r, "Error: could not log in to token '%s', giving up.\n",
+                        redwax_print_error(r, "nss-out: could not log in to token '%s', giving up.\n",
                                 PK11_GetTokenName(slot));
                         apr_pool_destroy(pool);
                         return APR_EACCES;
@@ -658,8 +658,8 @@
                     }
                 }
                 if (rv != SECSuccess) {
-                    redwax_print_error(r, "Warning: could not add certificate to token '%s', skipping.\n",
-                            PK11_GetTokenName(slot));
+                    redwax_print_error(r, "nss-out: could not add certificate '%s' to token '%s', skipping: %s\n",
+                            x->subjectName, PK11_GetTokenName(slot), PR_ErrorToName(PR_GetError()));
                     continue;
                 }
             }