Added comodo/nss patch

This commit is contained in:
Jan Horak 2011-04-28 21:59:55 +02:00
commit bfd045db0e
2 changed files with 28 additions and 2 deletions

View file

@ -0,0 +1,24 @@
diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -3339,16 +3339,20 @@ cancel_and_failure(nsNSSSocketInfo* info
{
infoObject->SetCanceled(PR_TRUE);
return SECFailure;
}
static SECStatus
nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
{
+ // cert was revoked, don't do anything else
+ if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE)
+ return SECFailure;
+
nsNSSShutDownPreventionLock locker;
nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg;
if (!infoObject)
return SECFailure;
if (nsSSLThread::exitRequested())
return cancel_and_failure(infoObject);

View file

@ -23,7 +23,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9.2.17
Release: 1%{?pretag}%{?dist}
Release: 2%{?pretag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -48,6 +48,7 @@ Patch20: mozilla-192-pkgconfig.patch
Patch24: crashreporter-remove-static.patch
# Upstream patches
Patch30: mozilla-comodo-646460.patch
# ---------------------------------------------------
@ -142,6 +143,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
%patch20 -p1 -b .pk
%patch24 -p1 -b .static
%patch30 -p1 -b .646460
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@ -444,7 +446,7 @@ fi
#---------------------------------------------------------------------
%changelog
* Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.17-1
* Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.17-2
- Update to 1.9.2.17
* Tue Mar 22 2011 Christopher Aillon <caillon@redhat.com> - 3.6.16-1