From def217ea256c96de6b6baf086c7873b0802903cc Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Tue, 13 Dec 2011 06:54:05 -0800 Subject: [PATCH] - Resolves: Bug 754771 - [PEM] an unregistered callback causes a SIGSEGV --- nss.spec | 10 ++++++++-- nsspem-bz754771.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 nsspem-bz754771.patch diff --git a/nss.spec b/nss.spec index d6b9646..7d8ee33 100644 --- a/nss.spec +++ b/nss.spec @@ -7,7 +7,7 @@ Summary: Network Security Services Name: nss Version: 3.13.1 -Release: 7%{?dist} +Release: 8%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -68,8 +68,10 @@ Patch23: nss-ckbi-1.88.rtm.patch Patch25: nsspem-use-system-freebl.patch # don't compile the fipstest application 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 +# include this patch in the upstream pem review +Patch28: nsspem-bz754771.patch %description @@ -158,6 +160,7 @@ low level services. %patch25 -p0 -b .systemfreebl %patch26 -p0 -b .nofipstest %patch27 -p0 -b .nosha224 +%patch28 -p0 -b .754771 %build @@ -574,6 +577,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h %changelog +* Tue Dec 13 2011 Elio Maldonado - 3.13.1-8 +- Resolves: Bug 754771 - [PEM] an unregistered callback causes a SIGSEGV + * Mon Dec 12 2011 Elio Maldonado - 3.13.1-7 - 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 diff --git a/nsspem-bz754771.patch b/nsspem-bz754771.patch new file mode 100644 index 0000000..1e64a42 --- /dev/null +++ b/nsspem-bz754771.patch @@ -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 */