diff --git a/security/nss/lib/freebl/loader.c b/security/nss/lib/freebl/loader.c
index f5f0fa162b7e..78f0c23e0a6a 100644
--- a/security/nss/lib/freebl/loader.c
+++ b/security/nss/lib/freebl/loader.c
@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: loader.c,v 1.2 2000/12/28 03:26:29 nelsonb%netscape.com Exp $
+ * $Id: loader.c,v 1.3 2001/01/06 17:07:07 mcgreer%netscape.com Exp $
  */
 
 #include "loader.h"
@@ -159,7 +159,7 @@ RSA_NewKey(int keySizeInBits, SECItem * publicExponent)
 SECStatus 
 RSA_PublicKeyOp(RSAPublicKey *   key,
 				 unsigned char *  output,
-				 unsigned char *  input)
+				 const unsigned char *  input)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
@@ -169,7 +169,7 @@ RSA_PublicKeyOp(RSAPublicKey *   key,
 SECStatus 
 RSA_PrivateKeyOp(RSAPrivateKey *  key,
 				  unsigned char *  output,
-				  unsigned char *  input)
+				  const unsigned char *  input)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
@@ -177,7 +177,7 @@ RSA_PrivateKeyOp(RSAPrivateKey *  key,
 }
 
 SECStatus 
-DSA_NewKey(PQGParams * params, DSAPrivateKey ** privKey)
+DSA_NewKey(const PQGParams * params, DSAPrivateKey ** privKey)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
@@ -185,7 +185,7 @@ DSA_NewKey(PQGParams * params, DSAPrivateKey ** privKey)
 }
 
 SECStatus 
-DSA_SignDigest(DSAPrivateKey * key, SECItem * signature, SECItem * digest)
+DSA_SignDigest(DSAPrivateKey * key, SECItem * signature, const SECItem * digest)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
@@ -193,7 +193,8 @@ DSA_SignDigest(DSAPrivateKey * key, SECItem * signature, SECItem * digest)
 }
 
 SECStatus 
-DSA_VerifyDigest(DSAPublicKey * key, SECItem * signature, SECItem * digest)
+DSA_VerifyDigest(DSAPublicKey * key, const SECItem * signature, 
+                 const SECItem * digest)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
@@ -201,8 +202,8 @@ DSA_VerifyDigest(DSAPublicKey * key, SECItem * signature, SECItem * digest)
 }
 
 SECStatus 
-DSA_NewKeyFromSeed(PQGParams *params, unsigned char * seed,
-                                    DSAPrivateKey **privKey)
+DSA_NewKeyFromSeed(const PQGParams *params, const unsigned char * seed,
+                   DSAPrivateKey **privKey)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
@@ -211,7 +212,7 @@ DSA_NewKeyFromSeed(PQGParams *params, unsigned char * seed,
 
 SECStatus 
 DSA_SignDigestWithSeed(DSAPrivateKey * key, SECItem * signature,
-		       SECItem * digest, unsigned char * seed)
+		       const SECItem * digest, const unsigned char * seed)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
@@ -319,7 +320,7 @@ RC2_DestroyContext(RC2Context *cx, PRBool freeit)
 
 SECStatus 
 RC2_Encrypt(RC2Context *cx, unsigned char *output, unsigned int *outputLen, 
-	    unsigned int maxOutputLen, unsigned char *input, 
+	    unsigned int maxOutputLen, const unsigned char *input, 
 	    unsigned int inputLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
@@ -330,7 +331,7 @@ RC2_Encrypt(RC2Context *cx, unsigned char *output, unsigned int *outputLen,
 
 SECStatus 
 RC2_Decrypt(RC2Context *cx, unsigned char *output, unsigned int *outputLen, 
-	    unsigned int maxOutputLen, unsigned char *input, 
+	    unsigned int maxOutputLen, const unsigned char *input, 
 	    unsigned int inputLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
@@ -358,7 +359,7 @@ RC5_DestroyContext(RC5Context *cx, PRBool freeit)
 
 SECStatus 
 RC5_Encrypt(RC5Context *cx, unsigned char *output, unsigned int *outputLen, 
-	    unsigned int maxOutputLen, unsigned char *input, 
+	    unsigned int maxOutputLen, const unsigned char *input, 
 	    unsigned int inputLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
@@ -369,7 +370,7 @@ RC5_Encrypt(RC5Context *cx, unsigned char *output, unsigned int *outputLen,
 
 SECStatus 
 RC5_Decrypt(RC5Context *cx, unsigned char *output, unsigned int *outputLen, 
-	    unsigned int maxOutputLen, unsigned char *input, 
+	    unsigned int maxOutputLen, const unsigned char *input, 
 	    unsigned int inputLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
@@ -397,7 +398,7 @@ DES_DestroyContext(DESContext *cx, PRBool freeit)
 
 SECStatus 
 DES_Encrypt(DESContext *cx, unsigned char *output, unsigned int *outputLen, 
-	    unsigned int maxOutputLen, unsigned char *input, 
+	    unsigned int maxOutputLen, const unsigned char *input, 
 	    unsigned int inputLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
@@ -408,7 +409,7 @@ DES_Encrypt(DESContext *cx, unsigned char *output, unsigned int *outputLen,
 
 SECStatus 
 DES_Decrypt(DESContext *cx, unsigned char *output, unsigned int *outputLen, 
-	    unsigned int maxOutputLen, unsigned char *input, 
+	    unsigned int maxOutputLen, const unsigned char *input, 
 	    unsigned int inputLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
@@ -438,7 +439,7 @@ AES_DestroyContext(AESContext *cx, PRBool freeit)
 SECStatus 
 AES_Encrypt(AESContext *cx, unsigned char *output,
             unsigned int *outputLen, unsigned int maxOutputLen,
-            unsigned char *input, unsigned int inputLen)
+            const unsigned char *input, unsigned int inputLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
@@ -449,7 +450,7 @@ AES_Encrypt(AESContext *cx, unsigned char *output,
 SECStatus 
 AES_Decrypt(AESContext *cx, unsigned char *output,
             unsigned int *outputLen, unsigned int maxOutputLen,
-            unsigned char *input, unsigned int inputLen)
+            const unsigned char *input, unsigned int inputLen)
 {
   if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
       return SECFailure;
diff --git a/security/nss/lib/freebl/loader.h b/security/nss/lib/freebl/loader.h
index 6f3707971e98..408a26b1c35e 100644
--- a/security/nss/lib/freebl/loader.h
+++ b/security/nss/lib/freebl/loader.h
@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: loader.h,v 1.1 2000/12/27 03:20:04 nelsonb%netscape.com Exp $
+ * $Id: loader.h,v 1.2 2001/01/06 17:07:07 mcgreer%netscape.com Exp $
  */
 
 #ifndef _LOADER_H_
@@ -52,31 +52,31 @@ struct FREEBLVectorStr {
 
   SECStatus (* p_RSA_PublicKeyOp) (RSAPublicKey *   key,
 				 unsigned char *  output,
-				 unsigned char *  input);
+				 const unsigned char *  input);
 
   SECStatus (* p_RSA_PrivateKeyOp)(RSAPrivateKey *  key,
 				  unsigned char *  output,
-				  unsigned char *  input);
+				  const unsigned char *  input);
 
-  SECStatus (* p_DSA_NewKey)(PQGParams *           params, 
+  SECStatus (* p_DSA_NewKey)(const PQGParams *    params, 
 		            DSAPrivateKey **      privKey);
 
   SECStatus (* p_DSA_SignDigest)(DSAPrivateKey *   key,
 				SECItem *         signature,
-				SECItem *         digest);
+				const SECItem *   digest);
 
   SECStatus (* p_DSA_VerifyDigest)(DSAPublicKey *  key,
-				  SECItem *       signature,
-				  SECItem *       digest);
+				  const SECItem *  signature,
+				  const SECItem *  digest);
 
-  SECStatus (* p_DSA_NewKeyFromSeed)(PQGParams *params, 
-				     unsigned char * seed,
-                                    DSAPrivateKey **privKey);
+  SECStatus (* p_DSA_NewKeyFromSeed)(const PQGParams *params, 
+				     const unsigned char * seed,
+                                     DSAPrivateKey **privKey);
 
   SECStatus (* p_DSA_SignDigestWithSeed)(DSAPrivateKey * key,
-				        SECItem *       signature,
-				        SECItem *       digest,
-				        unsigned char * seed);
+				        SECItem *             signature,
+				        const SECItem *       digest,
+				        const unsigned char * seed);
 
  SECStatus (* p_DH_GenParam)(int primeLen, DHParams ** params);
 
@@ -117,11 +117,11 @@ struct FREEBLVectorStr {
 
  SECStatus (* p_RC2_Encrypt)(RC2Context *cx, unsigned char *output,
 			    unsigned int *outputLen, unsigned int maxOutputLen,
-			    unsigned char *input, unsigned int inputLen);
+			    const unsigned char *input, unsigned int inputLen);
 
  SECStatus (* p_RC2_Decrypt)(RC2Context *cx, unsigned char *output,
 			    unsigned int *outputLen, unsigned int maxOutputLen,
-			    unsigned char *input, unsigned int inputLen);
+			    const unsigned char *input, unsigned int inputLen);
 
  RC5Context *(* p_RC5_CreateContext)(SECItem *key, unsigned int rounds,
                      unsigned int wordSize, unsigned char *iv, int mode);
@@ -130,11 +130,11 @@ struct FREEBLVectorStr {
 
  SECStatus (* p_RC5_Encrypt)(RC5Context *cx, unsigned char *output,
                             unsigned int *outputLen, unsigned int maxOutputLen,
-                            unsigned char *input, unsigned int inputLen);
+                            const unsigned char *input, unsigned int inputLen);
 
  SECStatus (* p_RC5_Decrypt)(RC5Context *cx, unsigned char *output,
                             unsigned int *outputLen, unsigned int maxOutputLen,
-                            unsigned char *input, unsigned int inputLen);
+                            const unsigned char *input, unsigned int inputLen);
 
  DESContext *(* p_DES_CreateContext)(unsigned char *key, unsigned char *iv,
 				     int mode, PRBool encrypt);
@@ -143,11 +143,11 @@ struct FREEBLVectorStr {
 
  SECStatus (* p_DES_Encrypt)(DESContext *cx, unsigned char *output,
 			    unsigned int *outputLen, unsigned int maxOutputLen,
-			    unsigned char *input, unsigned int inputLen);
+			    const unsigned char *input, unsigned int inputLen);
 
  SECStatus (* p_DES_Decrypt)(DESContext *cx, unsigned char *output,
 			    unsigned int *outputLen, unsigned int maxOutputLen,
-			    unsigned char *input, unsigned int inputLen);
+			    const unsigned char *input, unsigned int inputLen);
 
  AESContext * (* p_AES_CreateContext)(unsigned char *key, unsigned char *iv, 
 			    int mode, int encrypt, unsigned int keylen, 
@@ -157,11 +157,11 @@ struct FREEBLVectorStr {
 
  SECStatus (* p_AES_Encrypt)(AESContext *cx, unsigned char *output,
 			    unsigned int *outputLen, unsigned int maxOutputLen,
-			    unsigned char *input, unsigned int inputLen);
+			    const unsigned char *input, unsigned int inputLen);
 
  SECStatus (* p_AES_Decrypt)(AESContext *cx, unsigned char *output,
 			    unsigned int *outputLen, unsigned int maxOutputLen,
-			    unsigned char *input, unsigned int inputLen);
+			    const unsigned char *input, unsigned int inputLen);
 
  SECStatus (* p_MD5_Hash)(unsigned char *dest, const char *src);