Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: patches/nss-static.patch

Issue 11359091: Update NSS to NSS 3.14 pre-release snapshot 2012-06-26 01:00:00 PDT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Remove the RCS Id from nss-shvfy-const.patch Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« mozilla/security/nss/lib/cryptohi/secvfy.c ('K') | « patches/nss-shvfy-const.patch ('k') | patches/nss-static2.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/nss-static.patch
===================================================================
--- patches/nss-static.patch (revision 164196)
+++ patches/nss-static.patch (working copy)
@@ -1,11 +1,11 @@
Index: mozilla/security/nss/lib/certhigh/certvfy.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/certhigh/certvfy.c,v
-retrieving revision 1.75
-diff -p -u -8 -r1.75 certvfy.c
---- mozilla/security/nss/lib/certhigh/certvfy.c 14 Sep 2011 00:28:47 -0000 1.75
-+++ mozilla/security/nss/lib/certhigh/certvfy.c 25 Oct 2011 22:35:58 -0000
-@@ -40,27 +40,70 @@
+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 7 Nov 2012 01:10:06 -0000
+@@ -8,27 +8,70 @@
#include "secoid.h"
#include "sslerr.h"
#include "genname.h"
@@ -79,11 +79,11 @@
Index: mozilla/security/nss/lib/ckfw/nssck.api
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/nssck.api,v
-retrieving revision 1.7
-diff -p -u -8 -r1.7 nssck.api
---- mozilla/security/nss/lib/ckfw/nssck.api 2 Feb 2005 22:28:11 -0000 1.7
-+++ mozilla/security/nss/lib/ckfw/nssck.api 25 Oct 2011 22:35:58 -0000
-@@ -1783,17 +1783,17 @@ C_WaitForSlotEvent
+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 7 Nov 2012 01:10:06 -0000
+@@ -1751,17 +1751,17 @@ C_WaitForSlotEvent
CK_SLOT_ID_PTR pSlot,
CK_VOID_PTR pRserved
)
@@ -102,7 +102,7 @@
static CK_FUNCTION_LIST FunctionList = {
{ 2, 1 },
__ADJOIN(MODULE_NAME,C_Initialize),
-@@ -1861,30 +1861,32 @@ __ADJOIN(MODULE_NAME,C_UnwrapKey),
+@@ -1829,30 +1829,32 @@ __ADJOIN(MODULE_NAME,C_UnwrapKey),
__ADJOIN(MODULE_NAME,C_DeriveKey),
__ADJOIN(MODULE_NAME,C_SeedRandom),
__ADJOIN(MODULE_NAME,C_GenerateRandom),
@@ -139,11 +139,11 @@
Index: mozilla/security/nss/lib/freebl/rsa.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/freebl/rsa.c,v
-retrieving revision 1.43
-diff -p -u -8 -r1.43 rsa.c
---- mozilla/security/nss/lib/freebl/rsa.c 21 Sep 2011 01:09:48 -0000 1.43
-+++ mozilla/security/nss/lib/freebl/rsa.c 25 Oct 2011 22:35:58 -0000
-@@ -1588,16 +1588,23 @@ void RSA_Cleanup(void)
+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 7 Nov 2012 01:10:06 -0000
+@@ -1556,16 +1556,23 @@ void RSA_Cleanup(void)
* free_bl may have allocated along the way. Currently only RSA does this,
* so I've put it here for now.
*/
@@ -170,11 +170,11 @@
Index: mozilla/security/nss/lib/freebl/shvfy.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/freebl/shvfy.c,v
-retrieving revision 1.15
-diff -p -u -8 -r1.15 shvfy.c
---- mozilla/security/nss/lib/freebl/shvfy.c 6 Dec 2010 17:22:49 -0000 1.15
-+++ mozilla/security/nss/lib/freebl/shvfy.c 25 Oct 2011 22:35:58 -0000
-@@ -299,39 +299,55 @@ readItem(PRFileDesc *fd, SECItem *item)
+retrieving revision 1.17
+diff -p -u -8 -r1.17 shvfy.c
+--- mozilla/security/nss/lib/freebl/shvfy.c 12 Jun 2012 16:39:00 -0000 1.17
++++ mozilla/security/nss/lib/freebl/shvfy.c 7 Nov 2012 01:10:07 -0000
+@@ -269,39 +269,55 @@ readItem(PRFileDesc *fd, SECItem *item)
PORT_Free(item->data);
item->data = NULL;
item->len = 0;
@@ -225,12 +225,12 @@
char *checkName = NULL;
PRFileDesc *checkFD = NULL;
PRFileDesc *shFD = NULL;
- SHA1Context *hashcx = NULL;
+ void *hashcx = NULL;
+ SECHashObject *hashObj = NULL;
SECItem signature = { 0, NULL, 0 };
SECItem hash;
int bytesRead, offset;
- SECStatus rv;
-@@ -510,16 +526,17 @@ loser:
+@@ -488,16 +504,17 @@ loser:
if (key.params.base.data != NULL) {
PORT_Free(key.params.base.data);
}
@@ -251,11 +251,11 @@
Index: mozilla/security/nss/lib/nss/nssinit.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/nss/nssinit.c,v
-retrieving revision 1.114
-diff -p -u -8 -r1.114 nssinit.c
---- mozilla/security/nss/lib/nss/nssinit.c 18 Oct 2011 19:03:31 -0000 1.114
-+++ mozilla/security/nss/lib/nss/nssinit.c 25 Oct 2011 22:35:58 -0000
-@@ -50,19 +50,21 @@
+retrieving revision 1.116
+diff -p -u -8 -r1.116 nssinit.c
+--- mozilla/security/nss/lib/nss/nssinit.c 25 Apr 2012 14:50:04 -0000 1.116
++++ mozilla/security/nss/lib/nss/nssinit.c 7 Nov 2012 01:10:07 -0000
+@@ -18,19 +18,21 @@
#include "key.h"
#include "secmod.h"
#include "secoid.h"
@@ -277,7 +277,7 @@
#include "ocspi.h"
/*
-@@ -559,18 +561,20 @@ nss_Init(const char *configdir, const ch
+@@ -527,18 +529,20 @@ nss_Init(const char *configdir, const ch
NSSInitParameters *initParams,
PRBool readOnly, PRBool noCertDB,
PRBool noModDB, PRBool forceOpen, PRBool noRootInit,
@@ -298,7 +298,7 @@
/* if we are trying to init with a traditional NSS_Init call, maintain
* the traditional idempotent behavior. */
if (!initContextPtr && nssIsInitted) {
-@@ -711,28 +715,30 @@ nss_Init(const char *configdir, const ch
+@@ -679,28 +683,30 @@ nss_Init(const char *configdir, const ch
nss_FindExternalRoot(dbpath, secmodName);
}
}
@@ -329,7 +329,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
-@@ -1092,17 +1098,19 @@ nss_Shutdown(void)
+@@ -1064,17 +1070,19 @@ nss_Shutdown(void)
rv = nss_ShutdownShutdownList();
if (rv != SECSuccess) {
@@ -352,11 +352,11 @@
Index: mozilla/security/nss/lib/pk11wrap/pk11load.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11load.c,v
-retrieving revision 1.33
-diff -p -u -8 -r1.33 pk11load.c
---- mozilla/security/nss/lib/pk11wrap/pk11load.c 15 Jul 2011 15:03:43 -0000 1.33
-+++ mozilla/security/nss/lib/pk11wrap/pk11load.c 25 Oct 2011 22:35:58 -0000
-@@ -344,46 +344,55 @@ SECMOD_SetRootCerts(PK11SlotInfo *slot,
+retrieving revision 1.35
+diff -p -u -8 -r1.35 pk11load.c
+--- mozilla/security/nss/lib/pk11wrap/pk11load.c 25 Apr 2012 14:50:05 -0000 1.35
++++ mozilla/security/nss/lib/pk11wrap/pk11load.c 7 Nov 2012 01:10:07 -0000
+@@ -312,46 +312,55 @@ SECMOD_SetRootCerts(PK11SlotInfo *slot,
mod->slotInfo = psi_list;
mod->slotInfoCount++;
@@ -412,7 +412,7 @@
secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) {
PRLibrary *library = NULL;
CK_C_GetFunctionList entry = NULL;
-@@ -392,16 +401,26 @@ secmod_LoadPKCS11Module(SECMODModule *mo
+@@ -360,16 +369,26 @@ secmod_LoadPKCS11Module(SECMODModule *mo
SECStatus rv;
PRBool alreadyLoaded = PR_FALSE;
char *disableUnload = NULL;
@@ -439,7 +439,7 @@
PR_SUCCESS != PR_CallOnce(&loadSoftokenOnce, &softoken_LoadDSO))
return SECFailure;
-@@ -417,26 +436,36 @@ secmod_LoadPKCS11Module(SECMODModule *mo
+@@ -385,26 +404,36 @@ secmod_LoadPKCS11Module(SECMODModule *mo
if (!entry)
return SECFailure;
@@ -476,7 +476,7 @@
mod->library = (void *)library;
if (library == NULL) {
-@@ -449,16 +478,17 @@ secmod_LoadPKCS11Module(SECMODModule *mo
+@@ -417,16 +446,19 @@ secmod_LoadPKCS11Module(SECMODModule *mo
if (!mod->moduleDBOnly) {
entry = (CK_C_GetFunctionList)
PR_FindSymbol(library, "C_GetFunctionList");
@@ -485,7 +485,9 @@
mod->moduleDBFunc = (void *)
PR_FindSymbol(library, "NSS_ReturnModuleSpecData");
}
++#if defined(NSS_STATIC) && !defined(NSS_DISABLE_ROOT_CERTS)
+library_loaded:
++#endif
if (mod->moduleDBFunc == NULL) mod->isModuleDB = PR_FALSE;
if (entry == NULL) {
if (mod->isModuleDB) {
@@ -494,7 +496,7 @@
return SECSuccess;
}
PR_UnloadLibrary(library);
-@@ -588,33 +618,40 @@ SECMOD_UnloadModule(SECMODModule *mod) {
+@@ -556,33 +588,40 @@ SECMOD_UnloadModule(SECMODModule *mod) {
}
mod->moduleID = 0;
mod->loaded = PR_FALSE;
@@ -538,11 +540,11 @@
Index: mozilla/security/nss/lib/softoken/lgglue.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/softoken/lgglue.c,v
-retrieving revision 1.13
-diff -p -u -8 -r1.13 lgglue.c
---- mozilla/security/nss/lib/softoken/lgglue.c 16 Apr 2009 18:19:26 -0000 1.13
-+++ mozilla/security/nss/lib/softoken/lgglue.c 25 Oct 2011 22:35:58 -0000
-@@ -50,16 +50,17 @@
+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 7 Nov 2012 01:10:07 -0000
+@@ -18,16 +18,17 @@
static LGOpenFunc legacy_glue_open = NULL;
static LGReadSecmodFunc legacy_glue_readSecmod = NULL;
@@ -560,7 +562,7 @@
#ifdef XP_UNIX
#include <unistd.h>
#define LG_MAX_LINKS 20
-@@ -187,16 +188,17 @@ done:
+@@ -155,16 +156,17 @@ done:
PRLibSpec libSpec;
libSpec.type = PR_LibSpec_Pathname;
libSpec.value.pathname = libname;
@@ -578,7 +580,7 @@
static SECStatus
sftkdb_encrypt_stub(PRArenaPool *arena, SDB *sdb, SECItem *plainText,
SECItem **cipherText)
-@@ -299,16 +301,31 @@ sftkdbLoad_Legacy(PRBool isFIPS)
+@@ -267,16 +269,31 @@ sftkdbLoad_Legacy(PRBool isFIPS)
* get cleared in shutdown */
return SECFailure;
}
@@ -610,7 +612,7 @@
legacy_glue_open = (LGOpenFunc)PR_FindFunctionSymbol(lib, "legacy_Open");
legacy_glue_readSecmod = (LGReadSecmodFunc) PR_FindFunctionSymbol(lib,
"legacy_ReadSecmodDB");
-@@ -324,21 +341,24 @@ sftkdbLoad_Legacy(PRBool isFIPS)
+@@ -292,21 +309,24 @@ sftkdbLoad_Legacy(PRBool isFIPS)
"legacy_SetCryptFunctions");
if (!legacy_glue_open || !legacy_glue_readSecmod ||
@@ -635,7 +637,7 @@
setCryptFunction(sftkdb_encrypt_stub,sftkdb_decrypt_stub);
legacy_glue_lib = lib;
return SECSuccess;
-@@ -445,20 +465,22 @@ sftkdbCall_Shutdown(void)
+@@ -413,20 +433,22 @@ sftkdbCall_Shutdown(void)
return CKR_OK;
}
if (legacy_glue_shutdown) {
@@ -661,11 +663,11 @@
Index: mozilla/security/nss/lib/softoken/lgglue.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/softoken/lgglue.h,v
-retrieving revision 1.4
-diff -p -u -8 -r1.4 lgglue.h
---- mozilla/security/nss/lib/softoken/lgglue.h 16 Apr 2009 18:19:26 -0000 1.4
-+++ mozilla/security/nss/lib/softoken/lgglue.h 25 Oct 2011 22:35:58 -0000
-@@ -65,16 +65,35 @@ typedef SECStatus (*LGDeleteSecmodFunc)(
+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 7 Nov 2012 01:10:07 -0000
+@@ -33,16 +33,35 @@ typedef SECStatus (*LGDeleteSecmodFunc)(
const char *dbname, char *params, PRBool rw);
typedef SECStatus (*LGAddSecmodFunc)(const char *appName,
const char *filename,
@@ -704,11 +706,11 @@
Index: mozilla/security/nss/lib/util/secport.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/util/secport.h,v
-retrieving revision 1.27
-diff -p -u -8 -r1.27 secport.h
---- mozilla/security/nss/lib/util/secport.h 4 Oct 2011 18:46:04 -0000 1.27
-+++ mozilla/security/nss/lib/util/secport.h 25 Oct 2011 22:35:58 -0000
-@@ -248,16 +248,17 @@ sec_port_iso88591_utf8_conversion_functi
+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 7 Nov 2012 01:10:07 -0000
+@@ -216,16 +216,17 @@ sec_port_iso88591_utf8_conversion_functi
unsigned int maxOutBufLen,
unsigned int *outBufLen
);
@@ -726,7 +728,7 @@
*
* existingShLibName:
* The file name of the shared library that shall be used as the
-@@ -282,12 +283,13 @@ extern int NSS_SecureMemcmp(const void *
+@@ -250,12 +251,13 @@ extern int NSS_SecureMemcmp(const void *
*
* 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.
« mozilla/security/nss/lib/cryptohi/secvfy.c ('K') | « patches/nss-shvfy-const.patch ('k') | patches/nss-static2.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698