Bug 713936, Part 4: Remove security/patches/bug-717906-lowhash, r=kaie, a=akeybl
authorBrian Smith <bsmith@mozilla.com>
Fri, 17 Feb 2012 14:51:47 -0800
changeset 87213 2c9869ab7175fee267c6d2a508ae04d0520a5b58
parent 87212 f234a7c7cbd0874c6e68722f54b96f6d7a2a4974
child 87214 57a4882d9b7885a0113e54d4e2fbf1dd8d2a1d26
push id874
push userbsmith@mozilla.com
push dateFri, 17 Feb 2012 23:10:09 +0000
treeherdermozilla-aurora@57a4882d9b78 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskaie, akeybl
bugs713936, 717906
milestone12.0a2
Bug 713936, Part 4: Remove security/patches/bug-717906-lowhash, r=kaie, a=akeybl
security/patches/bug-717906-lowhash
deleted file mode 100644
--- a/security/patches/bug-717906-lowhash
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk
---- a/security/coreconf/Linux.mk
-+++ b/security/coreconf/Linux.mk
-@@ -171,16 +171,17 @@ CPU_TAG = _$(CPU_ARCH)
- #
- # On Linux 2.6 or later, build libfreebl3.so with no NSPR and libnssutil3.so
- # dependencies by default.  Set FREEBL_NO_DEPEND to 0 in the environment to
- # override this.
- #
- ifeq (2.6,$(firstword $(sort 2.6 $(OS_RELEASE))))
- ifndef FREEBL_NO_DEPEND
- FREEBL_NO_DEPEND = 1
-+FREEBL_LOWHASH = 1
- endif
- endif
- 
- USE_SYSTEM_ZLIB = 1
- ZLIB_LIBS = -lz
- 
- # The -rpath '$$ORIGIN' linker option instructs this library to search for its
- # dependencies in the same directory where it resides.
-diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
---- a/security/nss/lib/freebl/Makefile
-+++ b/security/nss/lib/freebl/Makefile
-@@ -71,17 +71,21 @@ ifdef USE_64
- endif
- 
- ifdef USE_ABI32_FPU
- 	DEFINES += -DNSS_USE_ABI32_FPU
- endif
- 
- ifeq ($(FREEBL_NO_DEPEND),1)
- 	DEFINES += -DFREEBL_NO_DEPEND
--	LOWHASH_SRCS = stubs.c nsslowhash.c
-+	STUBS_SRCS = stubs.c
-+endif
-+
-+ifeq ($(FREEBL_LOWHASH),1)
-+	LOWHASH_SRCS = nsslowhash.c
- 	LOWHASH_EXPORTS = nsslowhash.h
- 	MAPFILE_SOURCE = freebl_hash.def
- else
- 	MAPFILE_SOURCE = freebl.def
- endif
- 
- # FREEBL_USE_PRELINK
- #
-diff --git a/security/nss/lib/freebl/manifest.mn b/security/nss/lib/freebl/manifest.mn
---- a/security/nss/lib/freebl/manifest.mn
-+++ b/security/nss/lib/freebl/manifest.mn
-@@ -145,16 +145,17 @@ CSRCS = \
- 	rsa.c \
- 	shvfy.c \
- 	tlsprfalg.c \
- 	seed.c \
- 	jpake.c \
- 	$(MPI_SRCS) \
- 	$(MPCPU_SRCS) \
- 	$(ECL_SRCS) \
-+	$(STUBS_SRCS) \
- 	$(LOWHASH_SRCS) \
- 	$(NULL)
- 
- ALL_CSRCS := $(CSRCS)
- 
- ALL_HDRS =  \
- 	alghmac.h \
- 	blapi.h \
-diff --git a/security/nss/lib/freebl/nsslowhash.c b/security/nss/lib/freebl/nsslowhash.c
---- a/security/nss/lib/freebl/nsslowhash.c
-+++ b/security/nss/lib/freebl/nsslowhash.c
-@@ -30,17 +30,19 @@
-  * decision by deleting the provisions above and replace them with the notice
-  * and other provisions required by the GPL or the LGPL. If you do not delete
-  * the provisions above, a recipient may use your version of this file under
-  * the terms of any one of the MPL, the GPL or the LGPL.
-  *
-  * ***** END LICENSE BLOCK ***** */
- /* $Id: nsslowhash.c,v 1.6 2010/09/10 00:42:36 emaldona%redhat.com Exp $ */
- 
-+#ifdef FREEBL_NO_DEPEND
- #include "stubs.h"
-+#endif
- #include "prtypes.h"
- #include "secerr.h"
- #include "pkcs11t.h"
- #include "blapi.h"
- #include "sechash.h"
- #include "nsslowhash.h"
- 
- /* FIPS preprocessor directives for message digests             */
-@@ -312,21 +314,23 @@ static int post_failed = 0;
- 
- static NSSLOWInitContext dummyContext = { 0 };
- 
- NSSLOWInitContext *
- NSSLOW_Init(void)
- {
-     SECStatus rv;
-     CK_RV crv;
-+#ifdef FREEBL_NO_DEPEND
-     PRBool nsprAvailable = PR_FALSE;
- 
- 
-     rv = FREEBL_InitStubs();
-     nsprAvailable = (rv ==  SECSuccess ) ? PR_TRUE : PR_FALSE;
-+#endif
- 
-     if (post_failed) {
- 	return NULL;
-     }
- 	
- 
-     if (!post && nsslow_GetFIPSEnabled()) {
- 	crv = freebl_fipsPowerUpSelfTest();