[curl] fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE

[Kamil Dudka]

commit 3d7539f03f7aa05e05d21ded7fa00bfbfdb2d2af
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Tue Jan 15 13:51:30 2013 +0100

    fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE

 0003-curl-7.28.1-26613d78.patch |   30 ++++++++++++++++++++++++++++++
 curl.spec                       |    5 +++++
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/0003-curl-7.28.1-26613d78.patch b/0003-curl-7.28.1-26613d78.patch
new file mode 100644
index 0000000..2ebe38e
--- /dev/null
+++ b/0003-curl-7.28.1-26613d78.patch
@@ -0,0 +1,30 @@
+From afd2d98b4a9c69fb47048122629fd4be1d40f906 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at redhat.com>
+Date: Tue, 15 Jan 2013 12:58:08 +0100
+Subject: [PATCH 3/3] nss: fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE
+
+Do not use the error messages from NSS for errors not occurring in NSS.
+
+[upstream commit 26613d781725e39b0f601301a65c64e146977d8f]
+---
+ lib/nss.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/lib/nss.c b/lib/nss.c
+index f97090a..c5dcf52 100644
+--- a/lib/nss.c
++++ b/lib/nss.c
+@@ -1097,10 +1097,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;
+ 
+-- 
+1.7.1
+
diff --git a/curl.spec b/curl.spec
index 7f6b7f1..800afda 100644
--- a/curl.spec
+++ b/curl.spec
@@ -14,6 +14,9 @@ Patch1: 0001-curl-7.28.1-68d2830e.patch
 # clear session cache if a client cert from file is used
 Patch2: 0002-curl-7.28.1-b36f1d26.patch
 
+# fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE
+Patch3: 0003-curl-7.28.1-26613d78.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.27.0-multilib.patch
 
@@ -109,6 +112,7 @@ documentation of the library, too.
 # upstream patches
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -235,6 +239,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jan 15 2013 Kamil Dudka <kdudka at redhat.com> 7.28.1-2
 - prevent NSS from crashing on client auth hook failure
 - clear session cache if a client cert from file is used
+- fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE
 
 * Tue Nov 20 2012 Kamil Dudka <kdudka at redhat.com> 7.28.1-1
 - new upstream release