Change all functions that create contexts for encryption to treat their

input buffers as const.  Warning reduction.

11 files changed, 48 insertions, 40 deletions

diff --git a/security/nss/lib/freebl/alg2268.c b/security/nss/lib/freebl/alg2268.c
index af720f733..2a5ec5695 100644
--- a/security/nss/lib/freebl/alg2268.c
+++ b/security/nss/lib/freebl/alg2268.c
@@ -140,8 +140,8 @@ static const PRUint8 S[256] = {
 ** chaining" mode.
 */
 RC2Context *
-RC2_CreateContext(unsigned char *key, unsigned int len,
-		  unsigned char *input, int mode, unsigned efLen8)
+RC2_CreateContext(const unsigned char *key, unsigned int len,
+		  const unsigned char *input, int mode, unsigned efLen8)
 {
     RC2Context *cx;
     PRUint8    *L,*L2;
diff --git a/security/nss/lib/freebl/arcfive.c b/security/nss/lib/freebl/arcfive.c
index 2ee3f5447..64e120361 100644
--- a/security/nss/lib/freebl/arcfive.c
+++ b/security/nss/lib/freebl/arcfive.c
@@ -54,8 +54,8 @@
 ** chaining" mode.
 */
 RC5Context *
-RC5_CreateContext(SECItem *key, unsigned int rounds,
-                  unsigned int wordSize, unsigned char *iv, int mode)
+RC5_CreateContext(const SECItem *key, unsigned int rounds,
+                  unsigned int wordSize, const unsigned char *iv, int mode)
 {
     PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
     return NULL;
diff --git a/security/nss/lib/freebl/arcfour.c b/security/nss/lib/freebl/arcfour.c
index 23205ba73..4eb7db330 100644
--- a/security/nss/lib/freebl/arcfour.c
+++ b/security/nss/lib/freebl/arcfour.c
@@ -128,7 +128,7 @@ static const Stype Kinit[256] = {
  * Initialize a new generator.
  */
 RC4Context *
-RC4_CreateContext(unsigned char *key, int len)
+RC4_CreateContext(const unsigned char *key, int len)
 {
 	int i;
 	PRUint8 j, tmp;
diff --git a/security/nss/lib/freebl/blapi.h b/security/nss/lib/freebl/blapi.h
index a1edb6869..121eff791 100644
--- a/security/nss/lib/freebl/blapi.h
+++ b/security/nss/lib/freebl/blapi.h
@@ -197,7 +197,7 @@ extern PRBool KEA_Verify(SECItem *Y, SECItem *prime, SECItem *subPrime);
 **	"key" raw key data
 **	"len" the number of bytes of key data
 */
-extern RC4Context *RC4_CreateContext(unsigned char *key, int len);
+extern RC4Context *RC4_CreateContext(const unsigned char *key, int len);
 
 /*
 ** Destroy an RC4 encryption/decryption context.
@@ -253,8 +253,9 @@ extern SECStatus RC4_Decrypt(RC4Context *cx, unsigned char *output,
 ** When mode is set to NSS_RC2_CBC the RC2 cipher is run in "cipher block
 ** chaining" mode.
 */
-extern RC2Context *RC2_CreateContext(unsigned char *key, unsigned int len,
-		     unsigned char *iv, int mode, unsigned effectiveKeyLen);
+extern RC2Context *RC2_CreateContext(const unsigned char *key, unsigned int len,
+				     const unsigned char *iv, int mode, 
+				     unsigned effectiveKeyLen);
 
 /*
 ** Destroy an RC2 encryption/decryption context.
@@ -308,8 +309,8 @@ extern SECStatus RC2_Decrypt(RC2Context *cx, unsigned char *output,
 ** When mode is set to NSS_RC5_CBC the RC5 cipher is run in "cipher block
 ** chaining" mode.
 */
-extern RC5Context *RC5_CreateContext(SECItem *key, unsigned int rounds,
-                     unsigned int wordSize, unsigned char *iv, int mode);
+extern RC5Context *RC5_CreateContext(const SECItem *key, unsigned int rounds,
+                     unsigned int wordSize, const unsigned char *iv, int mode);
 
 /*
 ** Destroy an RC5 encryption/decryption context.
@@ -368,7 +369,8 @@ extern SECStatus RC5_Decrypt(RC5Context *cx, unsigned char *output,
 ** When mode is set to NSS_DES_CBC or NSS_DES_EDE3_CBC then the DES
 ** cipher is run in "cipher block chaining" mode.
 */
-extern DESContext *DES_CreateContext(unsigned char *key, unsigned char *iv,
+extern DESContext *DES_CreateContext(const unsigned char *key, 
+                                     const unsigned char *iv,
 				     int mode, PRBool encrypt);
 
 /*
@@ -425,7 +427,8 @@ extern SECStatus DES_Decrypt(DESContext *cx, unsigned char *output,
 **                        XXX currently only blocksize==16 has been tested!
 */
 extern AESContext *
-AES_CreateContext(unsigned char *key, unsigned char *iv, int mode, int encrypt,
+AES_CreateContext(const unsigned char *key, const unsigned char *iv, 
+                  int mode, int encrypt,
                   unsigned int keylen, unsigned int blocklen);
 
 /*
diff --git a/security/nss/lib/freebl/blapi_bsf.c b/security/nss/lib/freebl/blapi_bsf.c
index 1204306d9..93823d271 100644
--- a/security/nss/lib/freebl/blapi_bsf.c
+++ b/security/nss/lib/freebl/blapi_bsf.c
@@ -173,7 +173,7 @@ struct DESContextStr {
 };
 
 DESContext *
-DES_CreateContext(unsigned char *key, unsigned char *iv,
+DES_CreateContext(const unsigned char *key, const unsigned char *iv,
                   int mode, PRBool encrypt)
 {
     /* BLAPI */
@@ -475,8 +475,8 @@ struct RC2ContextStr
 };
 
 RC2Context *
-RC2_CreateContext(unsigned char *key, unsigned int len,
-                  unsigned char *iv, int mode, unsigned effectiveKeyLen)
+RC2_CreateContext(const unsigned char *key, unsigned int len,
+                  const unsigned char *iv, int mode, unsigned effectiveKeyLen)
 {
 	/* BLAPI */
 	RC2Context *cx;
@@ -726,7 +726,7 @@ struct RC4ContextStr
 };
 
 RC4Context *
-RC4_CreateContext(unsigned char *key, int len)
+RC4_CreateContext(const unsigned char *key, int len)
 {
 	/* BLAPI */
 	RC4Context *cx;
@@ -902,8 +902,8 @@ struct RC5ContextStr
 };
 
 RC5Context *
-RC5_CreateContext(SECItem *key, unsigned int rounds,
-                  unsigned int wordSize, unsigned char *iv, int mode)
+RC5_CreateContext(const SECItem *key, unsigned int rounds,
+                  unsigned int wordSize, const unsigned char *iv, int mode)
 {
 	/* BLAPI */
 	RC5Context *cx;
diff --git a/security/nss/lib/freebl/des.c b/security/nss/lib/freebl/des.c
index 9b44f8c35..6f40050cf 100644
--- a/security/nss/lib/freebl/des.c
+++ b/security/nss/lib/freebl/des.c
@@ -416,7 +416,7 @@ static const HALF PC2[8][64] = {
  */
 
 void 
-DES_MakeSchedule( HALF * ks, BYTE * key,   DESDirection direction)
+DES_MakeSchedule( HALF * ks, const BYTE * key,   DESDirection direction)
 {
     register HALF left, right;
     register HALF c0, d0;
diff --git a/security/nss/lib/freebl/des.h b/security/nss/lib/freebl/des.h
index 472896ef1..10887132e 100644
--- a/security/nss/lib/freebl/des.h
+++ b/security/nss/lib/freebl/des.h
@@ -63,7 +63,7 @@ struct DESContextStr {
     DESFunc  *worker;
 };
 
-void DES_MakeSchedule( HALF * ks, BYTE * key,   DESDirection direction);
+void DES_MakeSchedule( HALF * ks, const BYTE * key,   DESDirection direction);
 void DES_Do1Block(     HALF * ks, const BYTE * inbuf, BYTE * outbuf);
 
 #endif
diff --git a/security/nss/lib/freebl/desblapi.c b/security/nss/lib/freebl/desblapi.c
index af7e9ca2d..7f8d8ac14 100644
--- a/security/nss/lib/freebl/desblapi.c
+++ b/security/nss/lib/freebl/desblapi.c
@@ -173,7 +173,7 @@ DES_EDE3CBCDe(DESContext *cx, BYTE *out, const BYTE *in, unsigned int len)
 }
 
 DESContext *
-DES_CreateContext(BYTE * key, BYTE *iv, int mode, PRBool encrypt)
+DES_CreateContext(const BYTE * key, const BYTE *iv, int mode, PRBool encrypt)
 {
     DESContext *cx = PORT_ZNew(DESContext);
     DESDirection opposite;
diff --git a/security/nss/lib/freebl/loader.c b/security/nss/lib/freebl/loader.c
index 40c88285e..489b66f1a 100644
--- a/security/nss/lib/freebl/loader.c
+++ b/security/nss/lib/freebl/loader.c
@@ -428,7 +428,7 @@ KEA_Verify(SECItem *Y, SECItem *prime, SECItem *subPrime)
 }
 
 RC4Context *
-RC4_CreateContext(unsigned char *key, int len)
+RC4_CreateContext(const unsigned char *key, int len)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return NULL;
@@ -466,8 +466,8 @@ RC4_Decrypt(RC4Context *cx, unsigned char *output, unsigned int *outputLen,
 }
 
 RC2Context *
-RC2_CreateContext(unsigned char *key, unsigned int len,
-		  unsigned char *iv, int mode, unsigned effectiveKeyLen)
+RC2_CreateContext(const unsigned char *key, unsigned int len,
+		  const unsigned char *iv, int mode, unsigned effectiveKeyLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return NULL;
@@ -505,8 +505,8 @@ RC2_Decrypt(RC2Context *cx, unsigned char *output, unsigned int *outputLen,
 }
 
 RC5Context *
-RC5_CreateContext(SECItem *key, unsigned int rounds,
-                     unsigned int wordSize, unsigned char *iv, int mode)
+RC5_CreateContext(const SECItem *key, unsigned int rounds,
+		  unsigned int wordSize, const unsigned char *iv, int mode)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return NULL;
@@ -544,8 +544,8 @@ RC5_Decrypt(RC5Context *cx, unsigned char *output, unsigned int *outputLen,
 }
 
 DESContext *
-DES_CreateContext(unsigned char *key, unsigned char *iv,
-				     int mode, PRBool encrypt)
+DES_CreateContext(const unsigned char *key, const unsigned char *iv,
+		  int mode, PRBool encrypt)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return NULL;
@@ -583,7 +583,8 @@ DES_Decrypt(DESContext *cx, unsigned char *output, unsigned int *outputLen,
 }
 
 AESContext *
-AES_CreateContext(unsigned char *key, unsigned char *iv, int mode, int encrypt,
+AES_CreateContext(const unsigned char *key, const unsigned char *iv, 
+                  int mode, int encrypt,
                   unsigned int keylen, unsigned int blocklen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
diff --git a/security/nss/lib/freebl/loader.h b/security/nss/lib/freebl/loader.h
index 38757ab83..634fb7865 100644
--- a/security/nss/lib/freebl/loader.h
+++ b/security/nss/lib/freebl/loader.h
@@ -98,7 +98,7 @@ struct FREEBLVectorStr {
 
  PRBool (* p_KEA_Verify)(SECItem *Y, SECItem *prime, SECItem *subPrime);
 
- RC4Context * (* p_RC4_CreateContext)(unsigned char *key, int len);
+ RC4Context * (* p_RC4_CreateContext)(const unsigned char *key, int len);
 
  void (* p_RC4_DestroyContext)(RC4Context *cx, PRBool freeit);
 
@@ -110,8 +110,9 @@ struct FREEBLVectorStr {
 			    unsigned int *outputLen, unsigned int maxOutputLen,
 			    const unsigned char *input, unsigned int inputLen);
 
- RC2Context * (* p_RC2_CreateContext)(unsigned char *key, unsigned int len,
-		     unsigned char *iv, int mode, unsigned effectiveKeyLen);
+ RC2Context * (* p_RC2_CreateContext)(const unsigned char *key, 
+                     unsigned int len, const unsigned char *iv, 
+		     int mode, unsigned effectiveKeyLen);
 
  void (* p_RC2_DestroyContext)(RC2Context *cx, PRBool freeit);
 
@@ -123,8 +124,8 @@ struct FREEBLVectorStr {
 			    unsigned int *outputLen, unsigned int maxOutputLen,
 			    const unsigned char *input, unsigned int inputLen);
 
- RC5Context *(* p_RC5_CreateContext)(SECItem *key, unsigned int rounds,
-                     unsigned int wordSize, unsigned char *iv, int mode);
+ RC5Context *(* p_RC5_CreateContext)(const SECItem *key, unsigned int rounds,
+                     unsigned int wordSize, const unsigned char *iv, int mode);
 
  void (* p_RC5_DestroyContext)(RC5Context *cx, PRBool freeit);
 
@@ -136,7 +137,8 @@ struct FREEBLVectorStr {
                             unsigned int *outputLen, unsigned int maxOutputLen,
                             const unsigned char *input, unsigned int inputLen);
 
- DESContext *(* p_DES_CreateContext)(unsigned char *key, unsigned char *iv,
+ DESContext *(* p_DES_CreateContext)(const unsigned char *key, 
+                                     const unsigned char *iv,
 				     int mode, PRBool encrypt);
 
  void (* p_DES_DestroyContext)(DESContext *cx, PRBool freeit);
@@ -149,7 +151,8 @@ struct FREEBLVectorStr {
 			    unsigned int *outputLen, unsigned int maxOutputLen,
 			    const unsigned char *input, unsigned int inputLen);
 
- AESContext * (* p_AES_CreateContext)(unsigned char *key, unsigned char *iv, 
+ AESContext * (* p_AES_CreateContext)(const unsigned char *key, 
+                            const unsigned char *iv, 
 			    int mode, int encrypt, unsigned int keylen, 
 			    unsigned int blocklen);
 
diff --git a/security/nss/lib/freebl/rijndael.c b/security/nss/lib/freebl/rijndael.c
index b2af2c5d7..261a91a48 100644
--- a/security/nss/lib/freebl/rijndael.c
+++ b/security/nss/lib/freebl/rijndael.c
@@ -372,7 +372,7 @@ init_rijndael_tables(void)
  * For now, I'm implementing this case "dumbly", w/o any unrolling.
  */
 static SECStatus
-rijndael_key_expansion7(AESContext *cx, unsigned char *key, unsigned int Nk)
+rijndael_key_expansion7(AESContext *cx, const unsigned char *key, unsigned int Nk)
 {
     unsigned int i;
     PRUint32 *W;
@@ -400,7 +400,7 @@ rijndael_key_expansion7(AESContext *cx, unsigned char *key, unsigned int Nk)
  * Generate the expanded key from the key input by the user.
  */
 static SECStatus
-rijndael_key_expansion(AESContext *cx, unsigned char *key, unsigned int Nk)
+rijndael_key_expansion(AESContext *cx, const unsigned char *key, unsigned int Nk)
 {
     unsigned int i;
     PRUint32 *W;
@@ -464,7 +464,7 @@ rijndael_key_expansion(AESContext *cx, unsigned char *key, unsigned int Nk)
  * the user.
  */
 static SECStatus
-rijndael_invkey_expansion(AESContext *cx, unsigned char *key, unsigned int Nk)
+rijndael_invkey_expansion(AESContext *cx, const unsigned char *key, unsigned int Nk)
 {
     unsigned int r;
     PRUint32 *roundkeyw;
@@ -972,7 +972,8 @@ rijndael_decryptCBC(AESContext *cx, unsigned char *output,
  * create a new context for Rijndael operations
  */
 AESContext *
-AES_CreateContext(unsigned char *key, unsigned char *iv, int mode, int encrypt,
+AES_CreateContext(const unsigned char *key, const unsigned char *iv, 
+                  int mode, int encrypt,
                   unsigned int keysize, unsigned int blocksize)
 {
     AESContext *cx;