diff --git a/mozilla/caps/include/nsPrincipal.h b/mozilla/caps/include/nsPrincipal.h
index 82290ab97ef..7121743a851 100755
--- a/mozilla/caps/include/nsPrincipal.h
+++ b/mozilla/caps/include/nsPrincipal.h
@@ -35,10 +35,10 @@ public:
 	/* Public Field Accessors */
 	/* Public Methods */
 
-	nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len);
-	nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len, char *stringRep);
+	nsPrincipal(nsPrincipalType type, const void * key, PRUint32 key_len);
+	nsPrincipal(nsPrincipalType type, const void * key, PRUint32 key_len, char *stringRep);
 	virtual ~nsPrincipal();
-	nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len, void *zigObject);
+	nsPrincipal(nsPrincipalType type, const void * key, PRUint32 key_len, void *zigObject);
 
 	nsPrincipal(nsPrincipalType type, const unsigned char **certChain, 
                 PRUint32 *certChainLengths, 
@@ -121,9 +121,9 @@ private:
 	char* itsString;
 
 	/* Private Methods */
-	void init(nsPrincipalType type, void * key, PRUint32 key_len);
+	void init(nsPrincipalType type, const void * key, PRUint32 key_len);
 
-	PRInt32 computeHashCode(void * key, PRUint32 key_len);
+	PRInt32 computeHashCode(const void * key, PRUint32 key_len);
 
 	PRInt32 computeHashCode(void);
 
diff --git a/mozilla/caps/src/nsPrincipal.cpp b/mozilla/caps/src/nsPrincipal.cpp
index 9c4128e3691..b22bf882111 100755
--- a/mozilla/caps/src/nsPrincipal.cpp
+++ b/mozilla/caps/src/nsPrincipal.cpp
@@ -228,18 +228,18 @@ static nsVector* getTempCertificates(const unsigned char **certChain,
 // 			PUBLIC METHODS 
 //
 
-nsPrincipal::nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len)
+nsPrincipal::nsPrincipal(nsPrincipalType type, const void * key, PRUint32 key_len)
 {
   init(type, key, key_len);
 }
 
-nsPrincipal::nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len, void *zigObject)
+nsPrincipal::nsPrincipal(nsPrincipalType type, const void * key, PRUint32 key_len, void *zigObject)
 {
   init(type, key, key_len);
   itsZig = zigObject;
 }
 
-nsPrincipal::nsPrincipal(nsPrincipalType type, void * key, PRUint32 key_len, char *stringRep)
+nsPrincipal::nsPrincipal(nsPrincipalType type, const void * key, PRUint32 key_len, char *stringRep)
 {
   init(type, key, key_len);
   itsString = stringRep;
@@ -664,7 +664,7 @@ nsPrincipalArray* nsPrincipal::getSigners(void* zigPtr, char* pathname)
 // 			PRIVATE METHODS 
 //
 
-void nsPrincipal::init(nsPrincipalType type, void * key, PRUint32 key_len)
+void nsPrincipal::init(nsPrincipalType type, const void * key, PRUint32 key_len)
 {
   switch(type) {
   case nsPrincipalType_Cert:
@@ -698,9 +698,9 @@ void nsPrincipal::init(nsPrincipalType type, void * key, PRUint32 key_len)
   itsNickname = NULL;
 }
 
-PRInt32 nsPrincipal::computeHashCode(void * key, PRUint32 keyLen)
+PRInt32 nsPrincipal::computeHashCode(const void * key, PRUint32 keyLen)
 {
-  char *cptr = (char *)key;
+  const char *cptr = (char *)key;
   //
   // Same basic hash algorithm as used in java.lang.String --
   // no security relevance, only a performance optimization.
diff --git a/mozilla/caps/src/nsTarget.cpp b/mozilla/caps/src/nsTarget.cpp
index ac29985b447..e204e07094a 100755
--- a/mozilla/caps/src/nsTarget.cpp
+++ b/mozilla/caps/src/nsTarget.cpp
@@ -1078,7 +1078,7 @@ char * nsTarget::toString(void)
 {
   if (itsString != NULL)
     return itsString;
-  char * prinStr = (itsPrincipal != NULL)? itsPrincipal->toString() : "<none>";
+  const char * prinStr = (itsPrincipal != NULL)? itsPrincipal->toString() : "<none>";
   char * itsString = new char [strlen(TARGET_STR) + strlen(itsName) + 
                                strlen(PRIN_STR) + strlen(prinStr) + 1];
   XP_STRCPY(itsString, TARGET_STR);