Syncing to jag's string changes to fix build bustage. r=jag.

security/manager/ssl/src/nsNSSCertificate.cpp

@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: nsNSSCertificate.cpp,v 1.7 2001/03/13 16:20:54 mcgreer%netscape.com Exp $
+ * $Id: nsNSSCertificate.cpp,v 1.8 2001/03/20 07:46:37 bryner%uiuc.edu Exp $
  */
 
 #include "prmem.h"
@@ -600,7 +600,7 @@ nsNSSCertificateDB::GetCertByNickname(nsIPK11Token *aToken,
 {
   CERTCertificate *cert = NULL;
   char *asciiname = NULL;
-  asciiname = NS_ConvertUCS2toUTF8(nickname); 
+  asciiname = NS_CONST_CAST(char*, NS_ConvertUCS2toUTF8(nickname).get());
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting \"%s\"\n", asciiname));
 #if 0
   // what it should be, but for now...
@@ -702,7 +702,7 @@ nsNSSCertificateDB::ImportCertificate(nsIX509Cert *cert,
                                     NULL, PR_FALSE, PR_TRUE);
   if (!tmpCert) goto done;
   if (nickname) {
-    nick = NS_ConvertUCS2toUTF8(nickname); 
+    nick = NS_CONST_CAST(char*, NS_ConvertUCS2toUTF8(nickname).get());
   } else {
     nick = CERT_MakeCANickname(tmpCert);
   }

security/manager/ssl/src/nsPK11TokenDB.cpp

@@ -120,7 +120,7 @@ NS_IMETHODIMP nsPK11Token::InitPassword(const PRUnichar *initialPassword)
     nsresult rv = NS_OK;
     SECStatus status;
 
-    status = PK11_InitPin(mSlot, "", NS_ConvertUCS2toUTF8(initialPassword));
+    status = PK11_InitPin(mSlot, "", NS_CONST_CAST(char*, NS_ConvertUCS2toUTF8(initialPassword).get()));
     if (status == SECFailure) { rv = NS_ERROR_FAILURE; goto done; }
 
 done:
@@ -204,7 +204,7 @@ FindTokenByName(const PRUnichar* tokenName, nsIPK11Token **_retval)
 {
   nsresult rv = NS_OK;
   PK11SlotInfo *slot = 0;
-  slot = PK11_FindSlotByName(NS_ConvertUCS2toUTF8(tokenName));
+  slot = PK11_FindSlotByName(NS_CONST_CAST(char*, NS_ConvertUCS2toUTF8(tokenName).get()));
   if (!slot) { rv = NS_ERROR_FAILURE; goto done; }
 
   *_retval = new nsPK11Token(slot);