rpms/nss-softokn/devel nss-softokn-3.12.4-fips-fix.patch, NONE, 1.1 nss-softokn.spec, 1.35, 1.36

[Elio Maldonado]

Author: emaldonado

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1677

Modified Files:
	nss-softokn.spec 
Added Files:
	nss-softokn-3.12.4-fips-fix.patch 
Log Message:
Consider the system as not fips enabled when /proc/sys/crypto/fips_enabled isn't present, patch contibuted by Filipe Contreras - rhbz#590199

nss-softokn-3.12.4-fips-fix.patch:
 nsslowhash.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nss-softokn-3.12.4-fips-fix.patch ---
--- ./mozilla/security/nss/lib/freebl/nsslowhash.c	2010-05-08 18:02:39.592248982 +0300
+++ ./mozilla/security/nss/lib/freebl/nsslowhash.c.fix	2010-05-08 18:01:45.564454513 +0300
@@ -275,7 +275,7 @@ static int nsslow_GetFIPSEnabled(void) {
 
     f = fopen("/proc/sys/crypto/fips_enabled", "r");
     if (!f)
-        return 1;
+        return 0;
 
     size = fread(&d, 1, 1, f);
     fclose(f);


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nss-softokn.spec	8 May 2010 23:13:34 -0000	1.35
+++ nss-softokn.spec	9 May 2010 05:36:38 -0000	1.36
@@ -18,7 +18,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          18%{?dist}
+Release:          19%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -53,6 +53,7 @@ Source3:          nss-softokn-config.in
 
 Patch1:           nss-nolocalsql.patch
 Patch2:           nss-softokn-3.12.4-prelink.patch
+Patch3:           nss-softokn-3.12.4-fips-fix.patch
 
 %description
 Network Security Services Softoken Cryptographic Module
@@ -98,6 +99,7 @@ Header and Library files for doing devel
 
 %patch1 -p0
 %patch2 -p0 -b .prelink
+%patch3 -p0
 
 %build
 
@@ -310,6 +312,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sat May 08 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-19
+- Consider the system as not fips enabled when /proc/sys/crypto/fips_enabled isn't present (rhbz#590199)
+
 * Sat May 08 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-18
 - Fix Conflicts line to prevent update when prelink is not yet the right version (rhbz#590199)