]> granicus.if.org Git - curl/commitdiff
nss: fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE
authorKamil Dudka <kdudka@redhat.com>
Tue, 15 Jan 2013 11:58:08 +0000 (12:58 +0100)
committerKamil Dudka <kdudka@redhat.com>
Tue, 15 Jan 2013 12:20:56 +0000 (13:20 +0100)
Do not use the error messages from NSS for errors not occurring in NSS.

RELEASE-NOTES
lib/nss.c

index c809d35fd5c95eef840ff3b35c270a13938dff87..2b7676f79d9e8e46b9a08c5d5f6830e4ca4bb26c 100644 (file)
@@ -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:
 
index 5c9c11c5ffffae9bf6cc570f7848ef05551098f6..8a2cb09e664d6b2e57260b3ec8df88ca22b4147e 100644 (file)
--- 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;