fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE

This commit is contained in:
Kamil Dudka 2013-01-15 13:51:30 +01:00
parent 513526c871
commit 3d7539f03f
2 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,30 @@
From afd2d98b4a9c69fb47048122629fd4be1d40f906 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@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

View File

@ -14,6 +14,9 @@ Patch1: 0001-curl-7.28.1-68d2830e.patch
# clear session cache if a client cert from file is used # clear session cache if a client cert from file is used
Patch2: 0002-curl-7.28.1-b36f1d26.patch 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 # patch making libcurl multilib ready
Patch101: 0101-curl-7.27.0-multilib.patch Patch101: 0101-curl-7.27.0-multilib.patch
@ -109,6 +112,7 @@ documentation of the library, too.
# upstream patches # upstream patches
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# Fedora patches # Fedora patches
%patch101 -p1 %patch101 -p1
@ -235,6 +239,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Jan 15 2013 Kamil Dudka <kdudka@redhat.com> 7.28.1-2 * Tue Jan 15 2013 Kamil Dudka <kdudka@redhat.com> 7.28.1-2
- prevent NSS from crashing on client auth hook failure - prevent NSS from crashing on client auth hook failure
- clear session cache if a client cert from file is used - 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@redhat.com> 7.28.1-1 * Tue Nov 20 2012 Kamil Dudka <kdudka@redhat.com> 7.28.1-1
- new upstream release - new upstream release