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

merge from tip

Browse Source 
git-svn-id: svn://10.0.0.236/branches/STAN_WORK_BRANCH@128472 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ian.mcgreer%sun.com
2002-08-29 15:36:50 +00:00
parent 2b10cc89a3
commit 808a312d71
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/security/nss/lib/softoken/cdbhdl.h
View File

@@ -34,7 +34,7 @@
* cdbhdl.h - certificate database handle
* private to the certdb module
*
* $Id: cdbhdl.h,v 1.5 2002-05-16 20:39:00 relyea%netscape.com Exp $
* $Id: cdbhdl.h,v 1.5.2.1 2002-08-29 15:36:45 ian.mcgreer%sun.com Exp $
*/
#ifndef _CDBHDL_H_
#define _CDBHDL_H_
@@ -67,7 +67,11 @@ typedef DB * (*rdbfunc)(const char *appName, const char *prefix,
DB * rdbopen(const char *appName, const char *prefix,
const char *type, int flags);
DB *dbsopen (const char *dbname , int flags, int mode, DBTYPE type,
const void * appData);
SECStatus db_Copy(DB *dest,DB *src);
int db_BeginTransaction(DB *db);
int db_FinishTransaction(DB *db, PRBool abort);
#endif

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

@@ -34,7 +34,7 @@
/*
* Berkeley DB 1.85 Shim code to handle blobs.
*
* $Id: dbmshim.c,v 1.1 2002-08-28 21:51:08 relyea%netscape.com Exp $
* $Id: dbmshim.c,v 1.1.2.1 2002-08-29 15:36:46 ian.mcgreer%sun.com Exp $
*/
#include "mcom_db.h"
#include "secitem.h"

8
mozilla/security/nss/lib/softoken/keydb.c
View File

@@ -32,7 +32,7 @@
*
* Private Key Database code
*
* $Id: keydb.c,v 1.26 2002-08-08 18:02:34 relyea%netscape.com Exp $
* $Id: keydb.c,v 1.26.2.1 2002-08-29 15:36:47 ian.mcgreer%sun.com Exp $
*/
#include "lowkeyi.h"
@@ -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 = dbopen( dbname, NO_CREATE, 0600, DB_HASH, 0 );
handle->db = dbsopen( 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 = dbopen( dbname, openflags, 0600, DB_HASH, 0 );
handle->db = dbsopen( 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 = dbopen( handle->dbname, NO_CREATE, 0600, DB_HASH, 0 );
handle->db = dbsopen( handle->dbname, NO_CREATE, 0600, DB_HASH, 0 );
}
if (handle->db == NULL) {
/* set an error code */

1
mozilla/security/nss/lib/softoken/manifest.mn
View File

@@ -61,6 +61,7 @@ PRIVATE_EXPORTS = \
CSRCS = \
alghmac.c \
dbinit.c \
dbmshim.c \
fipstest.c \
fipstokn.c \
keydb.c \

6
mozilla/security/nss/lib/softoken/pcertdb.c
View File

@@ -34,7 +34,7 @@
/*
* Permanent Certificate database handling code
*
* $Id: pcertdb.c,v 1.29 2002-08-21 00:09:22 relyea%netscape.com Exp $
* $Id: pcertdb.c,v 1.29.2.1 2002-08-29 15:36:48 ian.mcgreer%sun.com Exp $
*/
#include "prtime.h"
@@ -3755,7 +3755,7 @@ openNewCertDB(const char *appName, const char *prefix, const char *certdbname,
if (appName) {
handle->permCertDB=rdbopen( appName, prefix, "cert", NO_CREATE);
} else {
handle->permCertDB=dbopen(certdbname, NO_CREATE, 0600, DB_HASH, 0);
handle->permCertDB=dbsopen(certdbname, NO_CREATE, 0600, DB_HASH, 0);
}
/* if create fails then we lose */
@@ -3862,7 +3862,7 @@ nsslowcert_OpenPermCertDB(NSSLOWCERTCertDBHandle *handle, PRBool readOnly,
if (appName) {
handle->permCertDB = rdbopen( appName, prefix, "cert", openflags);
} else {
handle->permCertDB = dbopen( certdbname, openflags, 0600, DB_HASH, 0 );
handle->permCertDB = dbsopen( certdbname, openflags, 0600, DB_HASH, 0 );
}
/* check for correct version number */

6
mozilla/security/nss/lib/softoken/pcertt.h
View File

@@ -33,7 +33,7 @@
/*
* certt.h - public data structures for the certificate library
*
* $Id: pcertt.h,v 1.8 2002-07-25 03:59:38 wtc%netscape.com Exp $
* $Id: pcertt.h,v 1.8.2.1 2002-08-29 15:36:50 ian.mcgreer%sun.com Exp $
*/
#ifndef _PCERTT_H_
#define _PCERTT_H_
@@ -48,7 +48,6 @@
#include "prio.h"
#include "prmon.h"
/* Non-opaque objects */
typedef struct NSSLOWCERTCertDBHandleStr NSSLOWCERTCertDBHandle;
typedef struct NSSLOWCERTCertKeyStr NSSLOWCERTCertKey;
@@ -213,7 +212,8 @@ typedef enum {
certDBEntryTypeRevocation = 4,
certDBEntryTypeKeyRevocation = 5,
certDBEntryTypeSMimeProfile = 6,
certDBEntryTypeContentVersion = 7
certDBEntryTypeContentVersion = 7,
certDBEntryTypeBlob = 8
} certDBEntryType;
typedef struct {