Bug 567134: Update msvc-aslr.patch for NSS (already applied).
authorWan-Teh Chang <wtc@google.com>
Thu, 12 Aug 2010 14:13:12 -0700
changeset 50348 15a2bbb890260bd8e1cc28306eddc47337663da8
parent 50347 1117034e276230c81b711bed86ca587465357f34
child 50349 abf7063bba5170fef5ce788ad63ba7da1ce3d09b
push idunknown
push userunknown
push dateunknown
bugs567134
milestone2.0b4pre
Bug 567134: Update msvc-aslr.patch for NSS (already applied). Update NSS to NSS_3_12_8_BETA2 officially. blocking2.0+
security/nss/TAG-INFO
security/nss/lib/ssl/sslauth.c
security/nss/lib/ssl/sslreveal.c
security/patches/msvc-aslr.patch
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1,1 +1,1 @@
-NSS_3_12_8_BETA1
+NSS_3_12_8_BETA2
--- a/security/nss/lib/ssl/sslauth.c
+++ b/security/nss/lib/ssl/sslauth.c
@@ -28,17 +28,17 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * 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: sslauth.c,v 1.16 2006/04/20 00:20:45 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslauth.c,v 1.16.66.1 2010/08/03 18:52:13 wtc%google.com Exp $ */
 #include "cert.h"
 #include "secitem.h"
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
 #include "pk11func.h"
 
 /* NEED LOCKS IN HERE.  */
--- a/security/nss/lib/ssl/sslreveal.c
+++ b/security/nss/lib/ssl/sslreveal.c
@@ -31,17 +31,17 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * 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: sslreveal.c,v 1.7 2010/02/04 03:21:11 wtc%google.com Exp $ */
+/* $Id: sslreveal.c,v 1.7.2.1 2010/08/03 18:52:13 wtc%google.com Exp $ */
 
 #include "cert.h"
 #include "ssl.h"
 #include "certt.h"
 #include "sslimpl.h"
 
 /* given PRFileDesc, returns a copy of certificate associated with the socket
  * the caller should delete the cert when done with SSL_DestroyCertificate
--- a/security/patches/msvc-aslr.patch
+++ b/security/patches/msvc-aslr.patch
@@ -1,22 +1,26 @@
-diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk
---- a/security/coreconf/WIN32.mk
-+++ b/security/coreconf/WIN32.mk
+Index: mozilla/security/coreconf/WIN32.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/WIN32.mk,v
+retrieving revision 1.39.2.1
+diff -u -p -8 -r1.39.2.1 WIN32.mk
+--- mozilla/security/coreconf/WIN32.mk	31 Jul 2010 04:23:37 -0000	1.39.2.1
++++ mozilla/security/coreconf/WIN32.mk	10 Aug 2010 20:46:44 -0000
 @@ -126,17 +126,17 @@ else # !NS_USE_GCC
      ifdef BUILD_OPT
  	OS_CFLAGS  += -MD
  	ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
  		OPTIMIZER += -O1
  	else
  		OPTIMIZER += -O2
  	endif
  	DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
 -	DLLFLAGS   += -OUT:"$@"
 +	DLLFLAGS   += -DYNAMICBASE -OUT:"$@"
  	ifdef MOZ_DEBUG_SYMBOLS
- 		OPTIMIZER += -Zi -Fd$(OBJDIR)/
+ 		ifdef MOZ_DEBUG_FLAGS
+ 			OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/
+ 		else
+ 			OPTIMIZER += -Zi -Fd$(OBJDIR)/
+ 		endif
  		DLLFLAGS += -DEBUG -OPT:REF
  		LDFLAGS += -DEBUG -OPT:REF
- 	endif
-     else
- 	#
- 	# Define USE_DEBUG_RTL if you want to use the debug runtime library