From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 22 Aug 2018 15:03:33 +0000 (-0400)
Subject: Log error strings in crypto_nss_log_errors().
X-Git-Tag: tor-0.3.5.1-alpha~92^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c5339677fd4d524a95bc8c18af223f710ca94e2;p=thirdparty%2Ftor.git

Log error strings in crypto_nss_log_errors().

I'll need this for debugging.
---

diff --git a/src/lib/crypt_ops/crypto_nss_mgt.c b/src/lib/crypt_ops/crypto_nss_mgt.c
index 89ef019218..85b18e00cd 100644
--- a/src/lib/crypt_ops/crypto_nss_mgt.c
+++ b/src/lib/crypt_ops/crypto_nss_mgt.c
@@ -14,6 +14,7 @@
 
 #include "lib/log/log.h"
 #include "lib/log/util_bug.h"
+#include "lib/string/printf.h"
 
 DISABLE_GCC_WARNING(strict-prototypes)
 #include <nss.h>
@@ -74,11 +75,20 @@ void
 crypto_nss_log_errors(int severity, const char *doing)
 {
   PRErrorCode code = PR_GetError();
-  /* XXXX how do I convert errors to strings? */
+  const char *string = PORT_ErrorToString(code);
+  const char *name = PORT_ErrorToName(code);
+  char buf[16];
+  if (!string)
+    string = "<unrecognized>";
+  if (!name) {
+    tor_snprintf(buf, sizeof(buf), "%d", code);
+    name = buf;
+  }
   if (doing) {
-    tor_log(severity, LD_CRYPTO, "NSS error %u while %s", code, doing);
+    tor_log(severity, LD_CRYPTO, "NSS error %s while %s: %s",
+            name, doing, string);
   } else {
-    tor_log(severity, LD_CRYPTO, "NSS error %u", code);
+    tor_log(severity, LD_CRYPTO, "NSS error %s: %s", name, string);
   }
 }