summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorrelyea%netscape.com <devnull@localhost>2002-09-06 00:18:24 +0000
committerrelyea%netscape.com <devnull@localhost>2002-09-06 00:18:24 +0000
commita72f84c5a2246006d1bb9571ba2e6912d946f3ba (patch)
tree573d4af4a0abf7286a77a90d4bb84b274a984b50 /security
parentf8c65efe0f5b0e63a4df24c37265dbc18c026bb8 (diff)
downloadnss-hg-a72f84c5a2246006d1bb9571ba2e6912d946f3ba.tar.gz
Remove key.db from the using the blob db code. The blob db code uses the cert7.db record format to
record blobs in the database, which is incompatible with the key3.db format. (key3 does not have any record types).
Diffstat (limited to 'security')
-rw-r--r--security/nss/lib/softoken/keydb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/nss/lib/softoken/keydb.c b/security/nss/lib/softoken/keydb.c
index 2a3863250..f6b1a19a9 100644
--- a/security/nss/lib/softoken/keydb.c
+++ b/security/nss/lib/softoken/keydb.c
@@ -844,7 +844,7 @@ openNewDB(const char *appName, const char *prefix, const char *dbname,
if (appName) {
handle->db = rdbopen( appName, prefix, "key", NO_CREATE);
} else {
- handle->db = dbsopen( dbname, NO_CREATE, 0600, DB_HASH, 0 );
+ handle->db = dbopen( dbname, NO_CREATE, 0600, DB_HASH, 0 );
}
/* if create fails then we lose */
if ( handle->db == NULL ) {
@@ -963,7 +963,7 @@ nsslowkey_OpenKeyDB(PRBool readOnly, const char *appName, const char *prefix,
if (appName) {
handle->db = rdbopen( appName, prefix, "key", openflags);
} else {
- handle->db = dbsopen( dbname, openflags, 0600, DB_HASH, 0 );
+ handle->db = dbopen( dbname, openflags, 0600, DB_HASH, 0 );
}
/* check for correct version number */
@@ -2430,7 +2430,7 @@ nsslowkey_ResetKeyDB(NSSLOWKEYDBHandle *handle)
if (handle->appname) {
handle->db=rdbopen(handle->appname, handle->dbname, "key", NO_CREATE);
} else {
- handle->db = dbsopen( handle->dbname, NO_CREATE, 0600, DB_HASH, 0 );
+ handle->db = dbopen( handle->dbname, NO_CREATE, 0600, DB_HASH, 0 );
}
if (handle->db == NULL) {
/* set an error code */