aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Dudka <kdudka@redhat.com>2013-01-15 12:58:08 +0100
committerKamil Dudka <kdudka@redhat.com>2013-01-15 13:20:56 +0100
commit26613d781725e39b0f601301a65c64e146977d8f (patch)
tree793e518dc251c898880f948d0a58348f04a32bb1
parent18e7c14f307c7a19af3db0762a250ad51844ebf0 (diff)
nss: fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE
Do not use the error messages from NSS for errors not occurring in NSS.
-rw-r--r--RELEASE-NOTES1
-rw-r--r--lib/nss.c2
2 files changed, 1 insertions, 2 deletions
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;