From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 26 Apr 2019 10:20:21 +0000 (+0200)
Subject: nss: provide more specific error messages on failed init
X-Git-Tag: curl-7_65_0~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e8f28a8f1fe90c5e88c18f56f82f6c28f804839;p=curl

nss: provide more specific error messages on failed init

Closes #3808
---

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index 08ee1aaaf..8cb783ada 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -1305,6 +1305,8 @@ static void nss_unload_module(SECMODModule **pmod)
 static CURLcode nss_init_core(struct Curl_easy *data, const char *cert_dir)
 {
   NSSInitParameters initparams;
+  PRErrorCode err;
+  const char *err_name;
 
   if(nss_context != NULL)
     return CURLE_OK;
@@ -1325,7 +1327,9 @@ static CURLcode nss_init_core(struct Curl_easy *data, const char *cert_dir)
     if(nss_context != NULL)
       return CURLE_OK;
 
-    infof(data, "Unable to initialize NSS database\n");
+    err = PR_GetError();
+    err_name = nss_error_to_name(err);
+    infof(data, "Unable to initialize NSS database: %d (%s)\n", err, err_name);
   }
 
   infof(data, "Initializing NSS with certpath: none\n");
@@ -1335,7 +1339,9 @@ static CURLcode nss_init_core(struct Curl_easy *data, const char *cert_dir)
   if(nss_context != NULL)
     return CURLE_OK;
 
-  infof(data, "Unable to initialize NSS\n");
+  err = PR_GetError();
+  err_name = nss_error_to_name(err);
+  failf(data, "Unable to initialize NSS: %d (%s)", err, err_name);
   return CURLE_SSL_CACERT_BADFILE;
 }