From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 15 Jan 2013 11:58:08 +0000 (+0100)
Subject: nss: fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE
X-Git-Tag: curl-7_29_0~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26613d781725e39b0f601301a65c64e146977d8f;p=curl

nss: fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE

Do not use the error messages from NSS for errors not occurring in NSS.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c809d35fd..2b7676f79 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -28,6 +28,7 @@ This release includes the following bugfixes:
  o build: fix AIX compilation and usage of events/revents
  o VC Makefiles: add missing hostcheck
  o nss: clear session cache if a client certificate from file is used
+ o nss: fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE
 
 This release includes the following known bugs:
 
diff --git a/lib/nss.c b/lib/nss.c
index 5c9c11c5f..8a2cb09e6 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1093,10 +1093,8 @@ static bool is_nss_error(CURLcode err)
   switch(err) {
   case CURLE_PEER_FAILED_VERIFICATION:
   case CURLE_SSL_CACERT:
-  case CURLE_SSL_CACERT_BADFILE:
   case CURLE_SSL_CERTPROBLEM:
   case CURLE_SSL_CONNECT_ERROR:
-  case CURLE_SSL_CRL_BADFILE:
   case CURLE_SSL_ISSUER_ERROR:
     return true;