Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/util/derenc.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 "secder.h"
 #include "secerr.h"
 
 #if 0
 /*
  * Generic templates for individual/simple items.
@@ skipping 261 matching lines @@
     return len;
 }
 
 
 static unsigned char *
 der_encode(unsigned char *buf, DERTemplate *dtemplate, void *src)
 {
     int header_len;
     PRUint32 contents_len;
     unsigned long encode_kind, under_kind;
-    PRBool explicit, optional, universal;
+    PRBool explicit, universal;
 
 
     /*
      * First figure out how long the encoding will be.  Do this by
      * traversing the template from top to bottom and accumulating
      * the length of each leaf item.
      */
     contents_len = contents_length (dtemplate, src);
     header_len = header_length (dtemplate, contents_len);
 
     /*
      * Enough smarts was involved already, so that if both the
      * header and the contents have a length of zero, then we
      * are not doing any encoding for this element.
      */
     if (header_len == 0 && contents_len == 0)
         return buf;
 
     encode_kind = dtemplate->kind;
 
     explicit = (encode_kind & DER_EXPLICIT) ? PR_TRUE : PR_FALSE;
-    optional = (encode_kind & DER_OPTIONAL) ? PR_TRUE : PR_FALSE;
     encode_kind &= ~DER_OPTIONAL;
     universal = ((encode_kind & DER_CLASS_MASK) == DER_UNIVERSAL)
                 ? PR_TRUE : PR_FALSE;
 
     if (encode_kind & DER_POINTER) {
         if (contents_len) {
             src = *(void **)src;
             PORT_Assert (src != NULL);
         }
         if (dtemplate->sub != NULL) {
@@ skipping 149 matching lines @@
     if (dest->data == NULL) {
         PORT_SetError(SEC_ERROR_NO_MEMORY);
         return SECFailure;
     }
 
     /* Now encode into the buffer */
     (void) der_encode (dest->data, dtemplate, src);
 
     return SECSuccess;
 }