Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* make sure the token cache returns failure in overflow case

Browse Source 
* change internal module trust order again, builtins uses 100, and internal module must come first


git-svn-id: svn://10.0.0.236/trunk@119415 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ian.mcgreer%sun.com
2002-04-19 19:30:12 +00:00
parent aabd47f4fc
commit 2f30d58738
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/security/nss/lib/dev/devutil.c
View File

@@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: devutil.c,v $ $Revision: 1.7 $ $Date: 2002-04-19 17:32:22 $ $Name: not supported by cvs2svn $";
static const char CVS_ID[] = "@(#) $RCSfile: devutil.c,v $ $Revision: 1.8 $ $Date: 2002-04-19 19:30:09 $ $Name: not supported by cvs2svn $";
#endif /* DEBUG */
#ifndef DEVM_H
@@ -677,6 +677,7 @@ get_object_and_attributes
*/
*doObjects = PR_FALSE;
*status = PR_FAILURE;
return (nssCryptokiObjectAndAttributes **)NULL;
} else {
if (numObjects == 0) {
/* The fact that there are no objects is cached, done */
@@ -851,7 +852,7 @@ get_token_certs_for_cache
return status;
}
cache->searchedObjectType[cachedCerts] = PR_TRUE;
return PR_SUCCESS;
return status;
}
static PRStatus
@@ -905,7 +906,7 @@ get_token_trust_for_cache
return status;
}
cache->searchedObjectType[cachedTrust] = PR_TRUE;
return PR_SUCCESS;
return status;
}
static PRStatus
@@ -955,7 +956,7 @@ get_token_crls_for_cache
return status;
}
cache->searchedObjectType[cachedCRLs] = PR_TRUE;
return PR_SUCCESS;
return status;
}
static nssCryptokiObject **

2
mozilla/security/nss/lib/softoken/pk11db.c
View File

@@ -723,7 +723,7 @@ secmod_addEscape(const char *string, char quote)
}
#define SECMOD_STEP 10
#define PK11_DEFAULT_INTERNAL_INIT "library= name=\"NSS Internal PKCS #11 Module\" parameters=\"%s\" NSS=\"Flags=internal,critical trustOrder=100 cipherOrder=100 slotParams=(1={%s askpw=any timeout=30})\""
#define PK11_DEFAULT_INTERNAL_INIT "library= name=\"NSS Internal PKCS #11 Module\" parameters=\"%s\" NSS=\"Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={%s askpw=any timeout=30})\""
/*
* Read all the existing modules in
*/