diff options
| author | ian.mcgreer%sun.com <devnull@localhost> | 2002-04-19 19:30:12 +0000 |
|---|---|---|
| committer | ian.mcgreer%sun.com <devnull@localhost> | 2002-04-19 19:30:12 +0000 |
| commit | 144b72ff47abd7e305b0c13b3ff4592a4c701f64 (patch) | |
| tree | 802e2d4bcc136db3a833af92ef238303cc2c0d87 | |
| parent | e56245586b8af18a3180e31f6084c848c6dc7e88 (diff) | |
| download | nss-hg-144b72ff47abd7e305b0c13b3ff4592a4c701f64.tar.gz | |
* make sure the token cache returns failure in overflow case
* change internal module trust order again, builtins uses 100, and internal module must come first
| -rw-r--r-- | security/nss/lib/dev/devutil.c | 7 | ||||
| -rw-r--r-- | security/nss/lib/softoken/pk11db.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/security/nss/lib/dev/devutil.c b/security/nss/lib/dev/devutil.c index 49e2a7165..7c516e144 100644 --- a/security/nss/lib/dev/devutil.c +++ b/security/nss/lib/dev/devutil.c @@ -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 ** diff --git a/security/nss/lib/softoken/pk11db.c b/security/nss/lib/softoken/pk11db.c index f5289df59..69376db1e 100644 --- a/security/nss/lib/softoken/pk11db.c +++ b/security/nss/lib/softoken/pk11db.c @@ -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 */ |