Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/util/quickder.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/. */
 
 /*
     Optimized ASN.1 DER decoder
     
 */
 
 #include "secerr.h"
@@ skipping 128 matching lines @@
         return SECSuccess;
     }
 
     dest->data = definite_length_decoder(src->data,  src->len, &dest->len,
         includeTag);
     if (dest->data == NULL)
     {
         PORT_SetError(SEC_ERROR_BAD_DER);
         return SECFailure;
     }
-    src->len -= (dest->data - src->data) + dest->len;
+    src->len -= (int)(dest->data - src->data) + dest->len;
     src->data = dest->data + dest->len;
     return SECSuccess;
 }
 
 /* check if the actual component's type matches the type in the template */
 
 static SECStatus MatchComponentType(const SEC_ASN1Template* templateEntry,
                                     SECItem* item, PRBool* match, void* dest)
 {
     unsigned long kind = 0;
@@ skipping 103 matching lines @@
            disables type checking, and effectively forbids us from
            transparently ignoring optional components we aren't aware of */
         *match = PR_TRUE;
         return SECSuccess;
     }
 
     /* first, do a class check */
     if ( (tag & SEC_ASN1_CLASS_MASK) !=
          (((unsigned char)kind) & SEC_ASN1_CLASS_MASK) )
     {
-#ifdef DEBUG
         /* this is only to help debugging of the decoder in case of problems */
-        unsigned char tagclass = tag & SEC_ASN1_CLASS_MASK;
-        unsigned char expectedclass = (unsigned char)kind & SEC_ASN1_CLASS_MASK;
-        tagclass = tagclass;
-        expectedclass = expectedclass;
-#endif
+        /* unsigned char tagclass = tag & SEC_ASN1_CLASS_MASK; */
+        /* unsigned char expectedclass = (unsigned char)kind & SEC_ASN1_CLASS_MASK; */
         *match = PR_FALSE;
         return SECSuccess;
     }
 
     /* now do a tag check */
     if ( ((unsigned char)kind & SEC_ASN1_TAGNUM_MASK) !=
          (tag & SEC_ASN1_TAGNUM_MASK))
     {
         *match = PR_FALSE;
         return SECSuccess;
@@ skipping 360 matching lines @@
 }
 
 /* new decoder implementation. This is a recursive function */
 
 static SECStatus DecodeItem(void* dest,
                      const SEC_ASN1Template* templateEntry,
                      SECItem* src, PLArenaPool* arena, PRBool checkTag)
 {
     SECStatus rv = SECSuccess;
     SECItem temp;
-    SECItem mark;
+    SECItem mark = {siBuffer, NULL, 0};
     PRBool pop = PR_FALSE;
     PRBool decode = PR_TRUE;
     PRBool save = PR_FALSE;
     unsigned long kind;
     PRBool match = PR_TRUE;
-    PRBool optional = PR_FALSE;
 
     PR_ASSERT(src && dest && templateEntry && arena);
 #if 0
     if (!src || !dest || !templateEntry || !arena)
     {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         rv = SECFailure;
     }
 #endif
 
     if (SECSuccess == rv)
     {
         /* do the template validation */
         kind = templateEntry->kind;
-        optional = (0 != (kind & SEC_ASN1_OPTIONAL));
         if (!kind)
         {
             PORT_SetError(SEC_ERROR_BAD_TEMPLATE);
             rv = SECFailure;
         }
     }
 
     if (SECSuccess == rv)
     {
 #ifdef DEBUG
@@ skipping 251 matching lines @@
         if (SECSuccess == rv && newsrc.len)
         {
             rv = SECFailure;
             PORT_SetError(SEC_ERROR_EXTRA_INPUT);
         }
     }
 
     return rv;
 }