From 44b41e1e4a1a7132448e094de47248c298711383 Mon Sep 17 00:00:00 2001
From: "tony%ponderer.org" <tony%ponderer.org>
Date: Sat, 12 Aug 2006 07:08:36 +0000
Subject: [PATCH] fix bustage

---
 security/manager/ssl/src/nsStreamCipher.cpp | 5 +++--
 security/manager/ssl/src/nsStreamCipher.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/security/manager/ssl/src/nsStreamCipher.cpp b/security/manager/ssl/src/nsStreamCipher.cpp
index 55b30c69a18..8a3ee4c5304 100644
--- a/security/manager/ssl/src/nsStreamCipher.cpp
+++ b/security/manager/ssl/src/nsStreamCipher.cpp
@@ -51,7 +51,7 @@ nsStreamCipher::~nsStreamCipher()
 }
 
 nsresult
-nsStreamCipher::InitWithIV_(nsIKeyObject *aKey, const SECItem* aIV)
+nsStreamCipher::InitWithIV_(nsIKeyObject *aKey, SECItem* aIV)
 {
   NS_ENSURE_ARG_POINTER(aKey);
 
@@ -75,6 +75,7 @@ nsStreamCipher::InitWithIV_(nsIKeyObject *aKey, const SECItem* aIV)
     return NS_ERROR_FAILURE;
 
   CK_MECHANISM_TYPE cipherMech = PK11_GetMechanism(symkey);
+
   SECItem *param = nsnull;
   // aIV may be null
   param = PK11_ParamFromIV(cipherMech, aIV);
@@ -107,7 +108,7 @@ NS_IMETHODIMP nsStreamCipher::InitWithIV(nsIKeyObject *aKey,
                                          const PRUint8 *aIV, PRUint32 aIVLen)
 {
   SECItem IV;
-  IV.data = aIV;
+  IV.data = (unsigned char*)aIV;
   IV.len = aIVLen;
   return InitWithIV_(aKey, &IV);
 }
diff --git a/security/manager/ssl/src/nsStreamCipher.h b/security/manager/ssl/src/nsStreamCipher.h
index 869934da065..12c457a5e75 100644
--- a/security/manager/ssl/src/nsStreamCipher.h
+++ b/security/manager/ssl/src/nsStreamCipher.h
@@ -58,7 +58,7 @@ private:
 
   // Helper method for initializing this object.
   // aIV may be null.
-  nsresult InitWithIV_(nsIKeyObject *aKey, const SECItem* aIV);
+  nsresult InitWithIV_(nsIKeyObject *aKey, SECItem* aIV);
   
   // Disallow copy constructor
   nsStreamCipher(nsStreamCipher&);