Update NSS to NSS_3_15_BETA2.

patches/nss-static.patch

Index: patches/nss-static.patch
===================================================================
--- patches/nss-static.patch	(revision 195639)
+++ patches/nss-static.patch	(working copy)
@@ -1,10 +1,6 @@
-Index: mozilla/security/nss/lib/certhigh/certvfy.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/certhigh/certvfy.c,v
-retrieving revision 1.77
-diff -p -u -8 -r1.77 certvfy.c
---- mozilla/security/nss/lib/certhigh/certvfy.c	25 Apr 2012 14:49:27 -0000	1.77
-+++ mozilla/security/nss/lib/certhigh/certvfy.c	22 Sep 2012 15:22:26 -0000
+diff -r 3f0105dfc733 lib/certhigh/certvfy.c
+--- a/lib/certhigh/certvfy.c	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/certhigh/certvfy.c	Mon Apr 22 14:33:38 2013 -0700
 @@ -8,27 +8,70 @@
  #include "secoid.h"
  #include "sslerr.h"
@@ -76,14 +72,10 @@
  {
      SECCertTimeValidity valid = CERT_CheckCertValidTimes(c, PR_Now(), PR_TRUE);
      return (valid == secCertTimeValid) ? SECSuccess : SECFailure;
-Index: mozilla/security/nss/lib/ckfw/nssck.api
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/nssck.api,v
-retrieving revision 1.8
-diff -p -u -8 -r1.8 nssck.api
---- mozilla/security/nss/lib/ckfw/nssck.api	25 Apr 2012 14:49:28 -0000	1.8
-+++ mozilla/security/nss/lib/ckfw/nssck.api	22 Sep 2012 15:22:28 -0000
-@@ -1751,17 +1751,17 @@ C_WaitForSlotEvent
+diff -r 3f0105dfc733 lib/ckfw/nssck.api
+--- a/lib/ckfw/nssck.api	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/ckfw/nssck.api	Mon Apr 22 14:33:38 2013 -0700
+@@ -1751,17 +1751,17 @@
    CK_SLOT_ID_PTR pSlot,
    CK_VOID_PTR pRserved
  )
@@ -102,7 +94,7 @@
  static CK_FUNCTION_LIST FunctionList = {
    { 2, 1 },
  __ADJOIN(MODULE_NAME,C_Initialize),
-@@ -1829,30 +1829,32 @@ __ADJOIN(MODULE_NAME,C_UnwrapKey),
+@@ -1829,30 +1829,32 @@
  __ADJOIN(MODULE_NAME,C_DeriveKey),
  __ADJOIN(MODULE_NAME,C_SeedRandom),
  __ADJOIN(MODULE_NAME,C_GenerateRandom),
@@ -136,14 +128,10 @@
  
  #undef __ADJOIN
  
-Index: mozilla/security/nss/lib/freebl/rsa.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/freebl/rsa.c,v
-retrieving revision 1.44
-diff -p -u -8 -r1.44 rsa.c
---- mozilla/security/nss/lib/freebl/rsa.c	25 Apr 2012 14:49:43 -0000	1.44
-+++ mozilla/security/nss/lib/freebl/rsa.c	22 Sep 2012 15:22:28 -0000
-@@ -1556,16 +1556,23 @@ void RSA_Cleanup(void)
+diff -r 3f0105dfc733 lib/freebl/rsa.c
+--- a/lib/freebl/rsa.c	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/freebl/rsa.c	Mon Apr 22 14:33:38 2013 -0700
+@@ -1556,16 +1556,23 @@
   * free_bl may have allocated along the way. Currently only RSA does this,
   * so I've put it here for now.
   */
@@ -167,14 +155,10 @@
  void BL_SetForkState(PRBool forked)
  {
      bl_parentForkedAfterC_Initialize = forked;
-Index: mozilla/security/nss/lib/freebl/shvfy.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/freebl/shvfy.c,v
-retrieving revision 1.18
-diff -p -u -8 -r1.18 shvfy.c
---- mozilla/security/nss/lib/freebl/shvfy.c	22 Sep 2012 15:18:19 -0000	1.18
-+++ mozilla/security/nss/lib/freebl/shvfy.c	22 Sep 2012 15:22:29 -0000
-@@ -269,39 +269,55 @@ readItem(PRFileDesc *fd, SECItem *item)
+diff -r 3f0105dfc733 lib/freebl/shvfy.c
+--- a/lib/freebl/shvfy.c	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/freebl/shvfy.c	Mon Apr 22 14:33:38 2013 -0700
+@@ -269,39 +269,55 @@
  	PORT_Free(item->data);
  	item->data = NULL;
  	item->len = 0;
@@ -230,7 +214,7 @@
      SECItem signature = { 0, NULL, 0 };
      SECItem hash;
      int bytesRead, offset;
-@@ -488,16 +504,17 @@ loser:
+@@ -488,16 +504,17 @@
      if (key.params.base.data != NULL) {
  	PORT_Free(key.params.base.data);
      }
@@ -248,14 +232,10 @@
      if (name == NULL) {
  	/*
  	 * If name is NULL, freebl is statically linked into softoken.
-Index: mozilla/security/nss/lib/nss/nssinit.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/nss/nssinit.c,v
-retrieving revision 1.118
-diff -p -u -8 -r1.118 nssinit.c
---- mozilla/security/nss/lib/nss/nssinit.c	21 Sep 2012 21:58:44 -0000	1.118
-+++ mozilla/security/nss/lib/nss/nssinit.c	22 Sep 2012 15:22:31 -0000
-@@ -18,19 +18,21 @@
+diff -r 3f0105dfc733 lib/nss/nssinit.c
+--- a/lib/nss/nssinit.c	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/nss/nssinit.c	Mon Apr 22 14:33:38 2013 -0700
+@@ -16,19 +16,21 @@
  #include "key.h"
  #include "secmod.h"
  #include "secoid.h"
@@ -277,7 +257,7 @@
  #include "ocspi.h"
  #include "utilpars.h"
  
-@@ -528,18 +530,20 @@ nss_Init(const char *configdir, const ch
+@@ -526,18 +528,20 @@
  		 NSSInitParameters *initParams,
  		 PRBool readOnly, PRBool noCertDB, 
  		 PRBool noModDB, PRBool forceOpen, PRBool noRootInit,
@@ -298,7 +278,7 @@
      /* if we are trying to init with a traditional NSS_Init call, maintain
       * the traditional idempotent behavior. */
      if (!initContextPtr && nssIsInitted) {
-@@ -680,28 +684,30 @@ nss_Init(const char *configdir, const ch
+@@ -681,28 +685,30 @@
  		    nss_FindExternalRoot(dbpath, secmodName);
  		}
  	    }
@@ -329,7 +309,7 @@
       * Now mark the appropriate init state. If initContextPtr was passed
       * in, then return the new context pointer and add it to the
       * nssInitContextList. Otherwise set the global nss_isInitted flag
-@@ -1065,17 +1071,19 @@ nss_Shutdown(void)
+@@ -1077,17 +1083,19 @@
  
      rv = nss_ShutdownShutdownList();
      if (rv != SECSuccess) {
@@ -349,14 +329,10 @@
      if (rv != SECSuccess) {
  	shutdownRV = SECFailure;
      }
-Index: mozilla/security/nss/lib/pk11wrap/pk11load.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11load.c,v
-retrieving revision 1.36
-diff -p -u -8 -r1.36 pk11load.c
---- mozilla/security/nss/lib/pk11wrap/pk11load.c	26 Jun 2012 22:27:30 -0000	1.36
-+++ mozilla/security/nss/lib/pk11wrap/pk11load.c	22 Sep 2012 15:22:31 -0000
-@@ -313,46 +313,55 @@ SECMOD_SetRootCerts(PK11SlotInfo *slot, 
+diff -r 3f0105dfc733 lib/pk11wrap/pk11load.c
+--- a/lib/pk11wrap/pk11load.c	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/pk11wrap/pk11load.c	Mon Apr 22 14:33:38 2013 -0700
+@@ -313,46 +313,55 @@
  	   mod->slotInfo = psi_list;
  	   mod->slotInfoCount++;
  	   
@@ -412,7 +388,7 @@
  secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) {
      PRLibrary *library = NULL;
      CK_C_GetFunctionList entry = NULL;
-@@ -361,16 +370,26 @@ secmod_LoadPKCS11Module(SECMODModule *mo
+@@ -361,16 +370,26 @@
      SECStatus rv;
      PRBool alreadyLoaded = PR_FALSE;
      char *disableUnload = NULL;
@@ -439,7 +415,7 @@
          PR_SUCCESS != PR_CallOnce(&loadSoftokenOnce, &softoken_LoadDSO))
          return SECFailure;
  
-@@ -386,26 +405,36 @@ secmod_LoadPKCS11Module(SECMODModule *mo
+@@ -386,26 +405,36 @@
  
      if (!entry)
          return SECFailure;
@@ -476,7 +452,7 @@
  	mod->library = (void *)library;
  
  	if (library == NULL) {
-@@ -418,16 +447,19 @@ secmod_LoadPKCS11Module(SECMODModule *mo
+@@ -418,16 +447,19 @@
  	if (!mod->moduleDBOnly) {
  	    entry = (CK_C_GetFunctionList)
  			PR_FindSymbol(library, "C_GetFunctionList");
@@ -496,7 +472,7 @@
  		return SECSuccess;
  	    }
  	    PR_UnloadLibrary(library);
-@@ -557,33 +589,40 @@ SECMOD_UnloadModule(SECMODModule *mod) {
+@@ -557,33 +589,40 @@
      }
      mod->moduleID = 0;
      mod->loaded = PR_FALSE;
@@ -537,13 +513,9 @@
          PR_UnloadLibrary(library);
      }
      return SECSuccess;
-Index: mozilla/security/nss/lib/softoken/lgglue.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/softoken/lgglue.c,v
-retrieving revision 1.14
-diff -p -u -8 -r1.14 lgglue.c
---- mozilla/security/nss/lib/softoken/lgglue.c	25 Apr 2012 14:50:10 -0000	1.14
-+++ mozilla/security/nss/lib/softoken/lgglue.c	22 Sep 2012 15:22:32 -0000
+diff -r 3f0105dfc733 lib/softoken/lgglue.c
+--- a/lib/softoken/lgglue.c	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/softoken/lgglue.c	Mon Apr 22 14:33:38 2013 -0700
 @@ -18,16 +18,17 @@
  
  static LGOpenFunc legacy_glue_open = NULL;
@@ -562,7 +534,7 @@
  #ifdef XP_UNIX
  #include <unistd.h>
  #define LG_MAX_LINKS 20
-@@ -155,16 +156,17 @@ done:
+@@ -155,16 +156,17 @@
  	PRLibSpec libSpec;
  	libSpec.type = PR_LibSpec_Pathname;
  	libSpec.value.pathname = libname;
@@ -580,7 +552,7 @@
  static SECStatus
  sftkdb_encrypt_stub(PRArenaPool *arena, SDB *sdb, SECItem *plainText,
  		    SECItem **cipherText)
-@@ -267,16 +269,31 @@ sftkdbLoad_Legacy(PRBool isFIPS)
+@@ -267,16 +269,31 @@
  		 * get cleared in shutdown */
  		return SECFailure;
  	    }
@@ -612,7 +584,7 @@
      legacy_glue_open = (LGOpenFunc)PR_FindFunctionSymbol(lib, "legacy_Open");
      legacy_glue_readSecmod = (LGReadSecmodFunc) PR_FindFunctionSymbol(lib,
  						 "legacy_ReadSecmodDB");
-@@ -292,21 +309,24 @@ sftkdbLoad_Legacy(PRBool isFIPS)
+@@ -292,21 +309,24 @@
  						"legacy_SetCryptFunctions");
  
      if (!legacy_glue_open || !legacy_glue_readSecmod || 
@@ -637,7 +609,7 @@
      setCryptFunction(sftkdb_encrypt_stub,sftkdb_decrypt_stub);
      legacy_glue_lib = lib;
      return SECSuccess;
-@@ -413,20 +433,22 @@ sftkdbCall_Shutdown(void)
+@@ -413,20 +433,22 @@
  	return CKR_OK;
      }
      if (legacy_glue_shutdown) {
@@ -660,14 +632,10 @@
      legacy_glue_addSecmod = NULL;
      legacy_glue_libCheckFailed    = PR_FALSE;
      legacy_glue_libCheckSucceeded = PR_FALSE;
-Index: mozilla/security/nss/lib/softoken/lgglue.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/softoken/lgglue.h,v
-retrieving revision 1.5
-diff -p -u -8 -r1.5 lgglue.h
---- mozilla/security/nss/lib/softoken/lgglue.h	25 Apr 2012 14:50:10 -0000	1.5
-+++ mozilla/security/nss/lib/softoken/lgglue.h	22 Sep 2012 15:22:32 -0000
-@@ -33,16 +33,35 @@ typedef SECStatus (*LGDeleteSecmodFunc)(
+diff -r 3f0105dfc733 lib/softoken/lgglue.h
+--- a/lib/softoken/lgglue.h	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/softoken/lgglue.h	Mon Apr 22 14:33:38 2013 -0700
+@@ -33,16 +33,35 @@
  			const char *dbname, char *params, PRBool rw);
  typedef SECStatus (*LGAddSecmodFunc)(const char *appName, 
  			const char *filename, 
@@ -703,14 +671,10 @@
  		int certVersion, int keyVersion, int flags, PRBool isFIPS,
  		SDB **certDB, SDB **keyDB);
  char ** sftkdbCall_ReadSecmodDB(const char *appName, const char *filename, 
-Index: mozilla/security/nss/lib/util/secport.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/util/secport.h,v
-retrieving revision 1.28
-diff -p -u -8 -r1.28 secport.h
---- mozilla/security/nss/lib/util/secport.h	25 Apr 2012 14:50:16 -0000	1.28
-+++ mozilla/security/nss/lib/util/secport.h	22 Sep 2012 15:22:32 -0000
-@@ -216,16 +216,17 @@ sec_port_iso88591_utf8_conversion_functi
+diff -r 3f0105dfc733 lib/util/secport.h
+--- a/lib/util/secport.h	Mon Apr 22 14:22:48 2013 +0200
++++ b/lib/util/secport.h	Mon Apr 22 14:33:38 2013 -0700
+@@ -207,16 +207,17 @@
    unsigned int maxOutBufLen,
    unsigned int *outBufLen
  );
@@ -728,7 +692,7 @@
   *
   * existingShLibName:
   *   The file name of the shared library that shall be used as the 
-@@ -250,12 +251,13 @@ extern int NSS_SecureMemcmp(const void *
+@@ -241,12 +242,13 @@
   *
   * If the new shared library is not found in the same location as the reference
   * library, it will then be loaded from the normal system library path.