- Resolves: Bug 754771 - [PEM] an unregistered callback causes a SIGSEGV

This commit is contained in:
Elio Maldonado 2011-12-13 06:54:05 -08:00
parent aecd53f653
commit def217ea25
2 changed files with 21 additions and 2 deletions

View File

@ -7,7 +7,7 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.13.1 Version: 3.13.1
Release: 7%{?dist} Release: 8%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -68,8 +68,10 @@ Patch23: nss-ckbi-1.88.rtm.patch
Patch25: nsspem-use-system-freebl.patch Patch25: nsspem-use-system-freebl.patch
# don't compile the fipstest application # don't compile the fipstest application
Patch26: nofipstest.patch Patch26: nofipstest.patch
# sha224 isn't available we use 3.12 softokn # sha224 isn't available when we use 3.12 softokn
Patch27: nosha224.patch Patch27: nosha224.patch
# include this patch in the upstream pem review
Patch28: nsspem-bz754771.patch
%description %description
@ -158,6 +160,7 @@ low level services.
%patch25 -p0 -b .systemfreebl %patch25 -p0 -b .systemfreebl
%patch26 -p0 -b .nofipstest %patch26 -p0 -b .nofipstest
%patch27 -p0 -b .nosha224 %patch27 -p0 -b .nosha224
%patch28 -p0 -b .754771
%build %build
@ -574,6 +577,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%changelog %changelog
* Tue Dec 13 2011 Elio Maldonado <emaldona@redhat.com> - 3.13.1-8
- Resolves: Bug 754771 - [PEM] an unregistered callback causes a SIGSEGV
* Mon Dec 12 2011 Elio Maldonado <emaldona@redhat.com> - 3.13.1-7 * Mon Dec 12 2011 Elio Maldonado <emaldona@redhat.com> - 3.13.1-7
- Resolves: Bug 750376 - nss 3.13 breaks sssd TLS - Resolves: Bug 750376 - nss 3.13 breaks sssd TLS
- Fix how pem is built so that nss-3.13.x works with nss-softokn-3.12.y - Fix how pem is built so that nss-3.13.x works with nss-softokn-3.12.y

13
nsspem-bz754771.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up ./mozilla/security/nss/lib/ckfw/pem/pinst.c.754771 ./mozilla/security/nss/lib/ckfw/pem/pinst.c
--- ./mozilla/security/nss/lib/ckfw/pem/pinst.c.754771 2011-12-12 09:38:51.839104295 -0800
+++ ./mozilla/security/nss/lib/ckfw/pem/pinst.c 2011-12-12 09:44:40.437096761 -0800
@@ -350,6 +350,9 @@ AddObjectIfNeeded(CK_OBJECT_CLASS objCla
if (io == NULL)
return NULL;
+ /* initialize pointers to functions */
+ pem_CreateMDObject(NULL, io, NULL);
+
io->gobjIndex = count;
/* add object to global array */