[nss-softokn] Bug 745224 Fix sha224 powerup self-test failure on fips mode

[Elio Maldonado]

commit f2e5f701c03d8d09ba571bfd7e186d809e69c912
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Jun 13 14:26:16 2012 -0700

    Bug 745224 Fix sha224 powerup self-test failure on fips mode
    
    - Make the expected result the same as used in the softoken tests
    - This patch is the same as the one approved upstream

 Bug-745224-nss-3.13.4-fips-sha224-selftest.patch |   22 ++++++++++++++++++++++
 nss-softokn.spec                                 |    9 ++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/Bug-745224-nss-3.13.4-fips-sha224-selftest.patch b/Bug-745224-nss-3.13.4-fips-sha224-selftest.patch
new file mode 100644
index 0000000..e8bcb05
--- /dev/null
+++ b/Bug-745224-nss-3.13.4-fips-sha224-selftest.patch
@@ -0,0 +1,22 @@
+Index: mozilla/security/nss/lib/freebl/nsslowhash.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/freebl/nsslowhash.c,v
+retrieving revision 1.8
+diff -u -p -r1.8 nsslowhash.c
+--- mozilla/security/nss/lib/freebl/nsslowhash.c	25 Apr 2012 14:49:43 -0000	1.8
++++ mozilla/security/nss/lib/freebl/nsslowhash.c	12 Jun 2012 17:02:51 -0000
+@@ -101,10 +101,10 @@ freebl_fips_SHA_PowerUpSelfTest( void )
+ 
+     /* SHA-224 Known Digest Message (224-bits). */
+     static const PRUint8 sha224_known_digest[] = {
+-        0x1c,0xc3,0x06,0x8e,0xce,0x37,0x68,0xfb, 
+-        0x1a,0x82,0x4a,0xbe,0x2b,0x00,0x51,0xf8,
+-        0x9d,0xb6,0xe0,0x90,0x0d,0x00,0xc9,0x64,
+-        0x9a,0xb8,0x98,0x4e};
++        0x89,0x5e,0x7f,0xfd,0x0e,0xd8,0x35,0x6f,
++        0x64,0x6d,0xf2,0xde,0x5e,0xed,0xa6,0x7f,
++        0x29,0xd1,0x12,0x73,0x42,0x84,0x95,0x4f,
++        0x8e,0x08,0xe5,0xcb};
+ 
+     /* SHA-256 Known Digest Message (256-bits). */
+     static const PRUint8 sha256_known_digest[] = {
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 6712a18..40b3309 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.13.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -80,6 +80,9 @@ Patch10:          nss-softokn-fix-gcc47-secmodt.patch
 # https://bugzilla.mozilla.org/show_bug.cgi?id=475578
 Patch11:          Bug-801975-Restore-use-of-NSS_NoDB_Init-or-alternate.patch
 
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=762198
+Patch12:          Bug-745224-nss-3.13.4-fips-sha224-selftest.patch
+
 %description
 Network Security Services Softoken Cryptographic Module
 
@@ -136,6 +139,7 @@ Header and library files for doing development with Network Security Services.
 #%patch9 -p0 -b .iquote
 %patch10 -p0 -b .gcc47
 %patch11 -p0 -b .801975
+%patch12 -p0 -b .745224
 
 
 %build
@@ -396,6 +400,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Wed Jun 13 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-3
+- Resolves: rhbz#745224 - nss-softokn sha224 self-test fails in fips mode
+
 * Tue Apr 10 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-2
 - Resolves: Bug 801975 Restore use of NSS_NoDB_Init or alternate to fipstest