Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/softoken/sftkhmac.c

Index: nss/lib/softoken/sftkhmac.c
diff --git a/nss/lib/softoken/sftkhmac.c b/nss/lib/softoken/sftkhmac.c
index 3b55a0572c983f1928e724de09a204b71aa374bc..f4e859bc8860ce2314e3a5f68f70cb285f1e6770 100644
--- a/nss/lib/softoken/sftkhmac.c
+++ b/nss/lib/softoken/sftkhmac.c
@@ -143,31 +143,29 @@ loser:
 }
 
 void
-sftk_HMACConstantTime_Update(void *pctx, void *data, unsigned int len)
+sftk_HMACConstantTime_Update(void *pctx, const void *data, unsigned int len)
 {
     sftk_MACConstantTimeCtx *ctx = (sftk_MACConstantTimeCtx *) pctx;
-    SECStatus rv = HMAC_ConstantTime(
+    PORT_CheckSuccess(HMAC_ConstantTime(
 	ctx->mac, NULL, sizeof(ctx->mac),
 	ctx->hash,
 	ctx->secret, ctx->secretLength,
 	ctx->header, ctx->headerLength,
 	data, len,
-	ctx->totalLength);
-    PORT_Assert(rv == SECSuccess);
+	ctx->totalLength));
 }
 
 void
-sftk_SSLv3MACConstantTime_Update(void *pctx, void *data, unsigned int len)
+sftk_SSLv3MACConstantTime_Update(void *pctx, const void *data, unsigned int len)
 {
     sftk_MACConstantTimeCtx *ctx = (sftk_MACConstantTimeCtx *) pctx;
-    SECStatus rv = SSLv3_MAC_ConstantTime(
+    PORT_CheckSuccess(SSLv3_MAC_ConstantTime(
 	ctx->mac, NULL, sizeof(ctx->mac),
 	ctx->hash,
 	ctx->secret, ctx->secretLength,
 	ctx->header, ctx->headerLength,
 	data, len,
-	ctx->totalLength);
-    PORT_Assert(rv == SECSuccess);
+	ctx->totalLength));
 }
 
 void