From 470e9c1705c974db16243cb2c510269e8efaaa24 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Thu, 19 Jun 2008 13:03:10 -0700
Subject: [PATCH] Minor tweaks for compile errors on Linux.

---
 services/crypto/WeaveCrypto.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/services/crypto/WeaveCrypto.cpp b/services/crypto/WeaveCrypto.cpp
index f49a69f84ff0..af96980eaf00 100644
--- a/services/crypto/WeaveCrypto.cpp
+++ b/services/crypto/WeaveCrypto.cpp
@@ -228,6 +228,7 @@ WeaveCrypto::CommonCrypt(const char *input, PRUint32 inputSize,
   PK11Context  *ctx     = nsnull;
   PK11SlotInfo *slot    = nsnull;
   SECItem      *ivParam = nsnull;
+  PRUint32 maxOutputSize;
 
   char keyData[aSymmetricKey.Length()];
   PRUint32 keyDataSize = sizeof(keyData);
@@ -281,7 +282,7 @@ WeaveCrypto::CommonCrypt(const char *input, PRUint32 inputSize,
   }
 
   int tmpOutSize; // XXX retarded. why is an signed int suddenly needed?
-  PRUint32  maxOutputSize = *outputSize;
+  maxOutputSize = *outputSize;
   rv = PK11_CipherOp(ctx,
                      (unsigned char *)output, &tmpOutSize, maxOutputSize,
                      (unsigned char *)input, inputSize);
@@ -611,6 +612,7 @@ WeaveCrypto::GenerateRandomKey(nsACString& aEncodedKey)
   nsresult rv = NS_OK;
   PRUint32 keySize;
   CK_MECHANISM_TYPE keygenMech;
+  SECItem *keydata = nsnull;
 
   // XXX doesn't NSS have a lookup function to do this?
   switch (mAlgorithm) {
@@ -651,7 +653,7 @@ WeaveCrypto::GenerateRandomKey(nsACString& aEncodedKey)
     goto keygen_done;
   }
 
-  SECItem *keydata = PK11_GetKeyData(randKey);
+  keydata = PK11_GetKeyData(randKey);
   if (!keydata) {
     NS_WARNING("PK11_GetKeyData failed");
     rv = NS_ERROR_FAILURE;
@@ -685,6 +687,7 @@ WeaveCrypto::WrapSymmetricKey(const nsACString& aSymmetricKey,
   PK11SymKey *symKey = nsnull;
   SECKEYPublicKey *pubKey = nsnull;
   CERTSubjectPublicKeyInfo *pubKeyInfo = nsnull;
+  CK_MECHANISM_TYPE keyMech, wrapMech;
 
   // Step 1. Get rid of the base64 encoding on the inputs.
 
@@ -714,7 +717,7 @@ WeaveCrypto::WrapSymmetricKey(const nsACString& aSymmetricKey,
   }
 
   // ImportSymKey wants a mechanism, from which it derives the key type.
-  CK_MECHANISM_TYPE keyMech = PK11_AlgtagToMechanism(mAlgorithm);
+  keyMech = PK11_AlgtagToMechanism(mAlgorithm);
   if (keyMech == CKM_INVALID_MECHANISM) {
     NS_WARNING("Unknown key mechanism");
     rv = NS_ERROR_FAILURE;
@@ -757,7 +760,7 @@ WeaveCrypto::WrapSymmetricKey(const nsACString& aSymmetricKey,
 
   // Step 4. Wrap the symmetric key with the public key.
 
-  CK_MECHANISM_TYPE wrapMech = PK11_AlgtagToMechanism(SEC_OID_PKCS1_RSA_ENCRYPTION);
+  wrapMech = PK11_AlgtagToMechanism(SEC_OID_PKCS1_RSA_ENCRYPTION);
 
   s = PK11_PubWrapSymKey(wrapMech, pubKey, symKey, &wrappedKey);
   if (s != SECSuccess) {
@@ -802,6 +805,8 @@ WeaveCrypto::UnwrapSymmetricKey(const nsACString& aWrappedSymmetricKey,
   PK11SymKey *symKey = nsnull;
   SECKEYPrivateKey *privKey = nsnull;
   SECItem *ivParam = nsnull;
+  SECItem *symKeyData = nsnull;
+  SECItem *keyID = nsnull;
 
   CK_ATTRIBUTE_TYPE privKeyUsage[] = { CKA_UNWRAP };
   PRUint32 privKeyUsageLength = sizeof(privKeyUsage) / sizeof(CK_ATTRIBUTE_TYPE);
@@ -866,7 +871,7 @@ WeaveCrypto::UnwrapSymmetricKey(const nsACString& aWrappedSymmetricKey,
   // We don't really care about this, because our unwrapped private key will
   // just live long enough to unwrap the bulk data key. So, we'll just jam in
   // a random value... We have an IV handy, so that will suffice.
-  SECItem *keyID = &ivItem;
+  keyID = &ivItem;
 
   privKey = PK11_UnwrapPrivKey(slot,
                                pbeKey, wrapMech, ivParam, &wrappedPrivKey,
@@ -904,7 +909,7 @@ WeaveCrypto::UnwrapSymmetricKey(const nsACString& aWrappedSymmetricKey,
   }
 
   // XXX need to free this?
-  SECItem *symKeyData = PK11_GetKeyData(symKey);
+  symKeyData = PK11_GetKeyData(symKey);
   if (!symKeyData) {
     NS_WARNING("PK11_GetKeyData failed");
     rv = NS_ERROR_FAILURE;