Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/softoken/pkcs11i.h

Index: nss/lib/softoken/pkcs11i.h
diff --git a/nss/lib/softoken/pkcs11i.h b/nss/lib/softoken/pkcs11i.h
index 175bb78f087f408f2a7df5e29db345fb1d1e4d93..4e8601b5a14877395ffac6919eb15dfca5517949 100644
--- a/nss/lib/softoken/pkcs11i.h
+++ b/nss/lib/softoken/pkcs11i.h
@@ -114,7 +114,7 @@ typedef void (*SFTKBegin)(void *);
 typedef SECStatus (*SFTKCipher)(void *,void *,unsigned int *,unsigned int,
 					void *, unsigned int);
 typedef SECStatus (*SFTKVerify)(void *,void *,unsigned int,void *,unsigned int);
-typedef void (*SFTKHash)(void *,void *,unsigned int);
+typedef void (*SFTKHash)(void *,const void *,unsigned int);
 typedef void (*SFTKEnd)(void *,void *,unsigned int *,unsigned int);
 typedef void (*SFTKFree)(void *);
 
@@ -736,8 +736,8 @@ sftk_MACConstantTimeCtx* sftk_HMACConstantTime_New(
 	CK_MECHANISM_PTR mech, SFTKObject *key);
 sftk_MACConstantTimeCtx* sftk_SSLv3MACConstantTime_New(
 	CK_MECHANISM_PTR mech, SFTKObject *key);
-void sftk_HMACConstantTime_Update(void *pctx, void *data, unsigned int len);
-void sftk_SSLv3MACConstantTime_Update(void *pctx, void *data, unsigned int len);
+void sftk_HMACConstantTime_Update(void *pctx, const void *data, unsigned int len);
+void sftk_SSLv3MACConstantTime_Update(void *pctx, const void *data, unsigned int len);
 void sftk_MACConstantTime_EndHash(
 	void *pctx, void *out, unsigned int *outLength, unsigned int maxLength);
 void sftk_MACConstantTime_DestroyContext(void *pctx, PRBool);
@@ -750,7 +750,8 @@ extern CK_RV
 sftk_TLSPRFInit(SFTKSessionContext *context, 
 		  SFTKObject *        key, 
 		  CK_KEY_TYPE         key_type,
-		  HASH_HashType       hash_alg);
+		  HASH_HashType       hash_alg,
+		  unsigned int        out_len);
 
 SEC_END_PROTOS