Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/softoken/sftkhmac.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "seccomon.h"
 #include "secerr.h"
 #include "blapi.h"
 #include "pkcs11i.h"
 #include "softoken.h"
 #include "hmacct.h"
@@ skipping 125 matching lines @@
     memcpy(&ctx->header[j], params->pHeader, params->ulHeaderLen);
 
     return ctx;
 
 loser:
     PORT_Free(ctx);
     return NULL;
 }
 
 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
 sftk_MACConstantTime_EndHash(void *pctx, void *out, unsigned int *outLength,
                              unsigned int maxLength)
 {
     const sftk_MACConstantTimeCtx *ctx = (sftk_MACConstantTimeCtx *) pctx;
     unsigned int toCopy = ctx->hash->length;
     if (toCopy > maxLength) {
         toCopy = maxLength;
     }
     memcpy(out, ctx->mac, toCopy);
     if (outLength) {
         *outLength = toCopy;
     }
 }
 
 void
 sftk_MACConstantTime_DestroyContext(void *pctx, PRBool free)
 {
     PORT_Free(pctx);
 }