Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/ckfw/token.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/. */
 
 /*
  * token.c
  *
  * This file implements the NSSCKFWToken type and methods.
  */
 
@@ skipping 1240 matching lines @@
   error = fwToken->mdToken->GetUTCTime(fwToken->mdToken, fwToken, 
             fwToken->mdInstance, fwToken->fwInstance, utcTime);
   if( CKR_OK != error ) {
     return error;
   }
 
   /* Sanity-check the data */
   {
     /* Format is YYYYMMDDhhmmss00 */
     int i;
-    int Y, M, D, h, m, s, z;
+    int Y, M, D, h, m, s;
     static int dims[] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
     for( i = 0; i < 16; i++ ) {
       if( (utcTime[i] < '0') || (utcTime[i] > '9') ) {
         goto badtime;
       }
     }
 
     Y = ((utcTime[ 0] - '0') * 1000) + ((utcTime[1] - '0') * 100) +
         ((utcTime[ 2] - '0') * 10) + (utcTime[ 3] - '0');
     M = ((utcTime[ 4] - '0') * 10) + (utcTime[ 5] - '0');
     D = ((utcTime[ 6] - '0') * 10) + (utcTime[ 7] - '0');
     h = ((utcTime[ 8] - '0') * 10) + (utcTime[ 9] - '0');
     m = ((utcTime[10] - '0') * 10) + (utcTime[11] - '0');
     s = ((utcTime[12] - '0') * 10) + (utcTime[13] - '0');
-    z = ((utcTime[14] - '0') * 10) + (utcTime[15] - '0');
 
     if( (Y < 1990) || (Y > 3000) ) goto badtime; /* Y3K problem.  heh heh heh */
     if( (M < 1) || (M > 12) ) goto badtime;
     if( (D < 1) || (D > 31) ) goto badtime;
 
     if( D > dims[M-1] ) goto badtime; /* per-month check */
     if( (2 == M) && (((Y%4)||!(Y%100))&&(Y%400)) && (D > 28) ) goto badtime; /* leap years */
 
     if( (h < 0) || (h > 23) ) goto badtime;
     if( (m < 0) || (m > 60) ) goto badtime;
@@ skipping 595 matching lines @@
 )
 {
 #ifdef DEBUG
   if( CKR_OK != nssCKFWToken_verifyPointer(fwToken) ) {
     return CKS_RO_PUBLIC_SESSION;
   }
 #endif /* DEBUG */
 
   return nssCKFWToken_GetSessionState(fwToken);
 }