Bug 166933: fixed build breakage on the Mac.

Modified files: certdb/crl.c certhigh/certhigh.c softoken/dbmshim.c

security/nss/lib/certdb/crl.c

@@ -34,7 +34,7 @@
 /*
  * Moved from secpkcs7.c
  *
- * $Id: crl.c,v 1.20 2002/09/06 06:53:03 jpierre%netscape.com Exp $
+ * $Id: crl.c,v 1.21 2002/09/06 20:17:35 wtc%netscape.com Exp $
  */
  
 #include "cert.h"
@@ -48,8 +48,8 @@
 #include "secerr.h"
 #include "pk11func.h"
 #include "dev.h"
-#include "../pk11wrap/secmodti.h"
-#include "../base/nssbase.h"
+#include "dev3hack.h"
+#include "nssbase.h"
 #ifdef USE_RWLOCK
 #include "nssrwlk.h"
 #endif
@@ -1084,7 +1084,7 @@ PRBool CRLStillExists(CERTSignedCrl* crl)
     if (!instance.handle) {
         return PR_FALSE;
     }
-    instance.token = slot->nssToken;
+    instance.token = PK11Slot_GetNSSToken(slot);
     PORT_Assert(instance.token);
     if (!instance.token) {
         return PR_FALSE;

security/nss/lib/certhigh/certhigh.c

@@ -381,7 +381,7 @@ typedef struct stringNode {
     char *string;
 } stringNode;
     
-static SECStatus
+static PRStatus
 CollectNicknames( NSSCertificate *c, void *data)
 {
     CERTCertNicknames *names;
@@ -407,7 +407,7 @@ CollectNicknames( NSSCertificate *c, void *data)
 	  else {
 	    td = NSSCertificate_GetTrustDomain(c);
 	    if (!td) {
-		return SECSuccess;
+		return PR_SUCCESS;
 	    }
 	    trust = nssTrustDomain_FindTrustForCertificate(td,c);
 	
@@ -448,7 +448,7 @@ CollectNicknames( NSSCertificate *c, void *data)
 	/* nickname can only be NULL here if we are having memory 
 	 * alloc problems */
 	if (nickname == NULL) {
-	    return SECFailure;
+	    return PR_FAILURE;
 	}
 	node = (stringNode *)names->head;
 	while ( node != NULL ) {
@@ -466,7 +466,7 @@ CollectNicknames( NSSCertificate *c, void *data)
 	/* allocate the node */
 	node = (stringNode*)PORT_ArenaAlloc(names->arena, sizeof(stringNode));
 	if ( node == NULL ) {
-	    return(SECFailure);
+	    return(PR_FAILURE);
 	}
 
 	/* copy the string */
@@ -474,7 +474,7 @@ CollectNicknames( NSSCertificate *c, void *data)
 	node->string = (char*)PORT_ArenaAlloc(names->arena, len);
 	if ( node->string == NULL ) {
 	    if (nickname) PORT_Free(nickname);
-	    return(SECFailure);
+	    return(PR_FAILURE);
 	}
 	PORT_Memcpy(node->string, nickname, len);
 
@@ -487,7 +487,7 @@ CollectNicknames( NSSCertificate *c, void *data)
     }
     
     if (nickname) PORT_Free(nickname);
-    return(SECSuccess);
+    return(PR_SUCCESS);
 }
 
 CERTCertNicknames *

security/nss/lib/softoken/dbmshim.c

@@ -34,7 +34,7 @@
 /*
  * Berkeley DB 1.85 Shim code to handle blobs.
  *
- * $Id: dbmshim.c,v 1.3 2002/09/06 00:27:49 wtc%netscape.com Exp $
+ * $Id: dbmshim.c,v 1.4 2002/09/06 20:17:42 wtc%netscape.com Exp $
  */
 #include "mcom_db.h"
 #include "secitem.h"
@@ -121,7 +121,7 @@ dbs_getBlobSize(DBT *blobData)
  */
 
 static void
-dbs_replaceSlash(unsigned char *cp, int len)
+dbs_replaceSlash(char *cp, int len)
 {
    while (len--) {
 	if (*cp == '/') *cp = '-';
@@ -137,12 +137,12 @@ static void
 dbs_mkBlob(const DBT *key, const DBT *data, DBT *blobData)
 {
    unsigned char sha1_data[SHA1_LENGTH];
-   static unsigned char b[BLOB_NAME_BUF_LEN];
+   static char b[BLOB_NAME_BUF_LEN];
    PRUint32 length = data->size;
    SECItem sha1Item;
 
    b[0] = CERT_DB_FILE_VERSION; /* certdb version number */
-   b[1] = (unsigned char) certDBEntryTypeBlob; /* type */
+   b[1] = (char) certDBEntryTypeBlob; /* type */
    b[2] = 0; /* flags */
    b[3] = 0; /* reserved */
    b[BLOB_NAME_LENGTH_START] = length & 0xff;