[nss-softokn] Fix the patch to be based on what we had on 3.13.6 that worked

Elio Maldonado emaldonado at fedoraproject.org
Mon Nov 19 20:08:22 UTC 2012


commit 9c324186fd338c570e46d68da06fc02a2455ac91
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Nov 19 12:59:15 2012 -0800

    Fix the patch to be based on what we had on 3.13.6 that worked

 Bug-829088-nss-3.13.4-fips-sha224-selftest.patch |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/Bug-829088-nss-3.13.4-fips-sha224-selftest.patch b/Bug-829088-nss-3.13.4-fips-sha224-selftest.patch
index 884347d..ac5ab9c 100644
--- a/Bug-829088-nss-3.13.4-fips-sha224-selftest.patch
+++ b/Bug-829088-nss-3.13.4-fips-sha224-selftest.patch
@@ -1,10 +1,6 @@
-Index: ./mozilla/security/nss/lib/freebl/nsslowhash.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/freebl/nsslowhash.c,v
-retrieving revision 1.9
-diff -u -p -r1.9 nsslowhash.c
---- ./mozilla/security/nss/lib/freebl/nsslowhash.c	26 Jun 2012 22:27:29 -0000	1.9
-+++ ./mozilla/security/nss/lib/freebl/nsslowhash.c	19 Nov 2012 16:12:22 -0000
+diff -up ./mozilla/security/nss/lib/freebl/nsslowhash.c.829088 ./mozilla/security/nss/lib/freebl/nsslowhash.c
+--- ./mozilla/security/nss/lib/freebl/nsslowhash.c.829088	2012-11-19 12:52:04.263366017 -0800
++++ ./mozilla/security/nss/lib/freebl/nsslowhash.c	2012-11-19 12:52:40.439383179 -0800
 @@ -102,10 +102,10 @@ freebl_fips_SHA_PowerUpSelfTest( void )
  
      /* SHA-224 Known Digest Message (224-bits). */
@@ -20,12 +16,3 @@ diff -u -p -r1.9 nsslowhash.c
  
      /* SHA-256 Known Digest Message (256-bits). */
      static const PRUint8 sha256_known_digest[] = {
-@@ -216,7 +216,7 @@ freebl_fipsSoftwareIntegrityTest(void)
- 
- CK_RV
- freebl_fipsPowerUpSelfTest( void )
--{
-+{static const PRUint8 sha224_known_digest[] = {
-     CK_RV rv;
- 
-     /* MD2 Power-Up SelfTest(s). */


More information about the scm-commits mailing list