Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.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/. */
 /*
  * pkix_pl_httpdefaultclient.c
  *
  * HTTPDefaultClient Function Definitions
  *
  */
 
@@ skipping 247 matching lines @@
              *pKeepGoing = PKIX_FALSE;
              break;
  
          case HTTP_UNKNOWN_CONTENT_LENGTH:
              /* Unknown contentLength indicator.Will be set by
               * pkix_pl_HttpDefaultClient_RecvBody whey connection get closed */
              client->rcv_http_data_len = HTTP_UNKNOWN_CONTENT_LENGTH;
              contentLength =                 /* Try to reserve 4K+ buffer */
                  client->filledupBytes + HTTP_DATA_BUFSIZE;
              if (client->maxResponseLen > 0 &&
-                 contentLength > client->maxResponseLen) {
+                 contentLength > (PKIX_Int32)client->maxResponseLen) {
                  if (client->filledupBytes < client->maxResponseLen) {
                      contentLength = client->maxResponseLen;
                  } else {
                      client->connectStatus = HTTP_ERROR;
                      goto cleanup;
                  }
              }
              /* set available number of bytes in the buffer */
              client->capacity = contentLength;
              client->connectStatus = HTTP_RECV_BODY;
              *pKeepGoing = PKIX_TRUE;
              break;
  
          default:
              client->rcv_http_data_len = contentLength;
              if (client->maxResponseLen > 0 &&
-                 client->maxResponseLen < contentLength) {
+                 (PKIX_Int32)client->maxResponseLen < contentLength) {
                  client->connectStatus = HTTP_ERROR;
                  goto cleanup;
              }
              
              /*
               * Do we have all of the message body, or do we need to read some more?
               */
-             if (client->filledupBytes < contentLength) {
+             if ((PKIX_Int32)client->filledupBytes < contentLength) {
                  client->connectStatus = HTTP_RECV_BODY;
                  *pKeepGoing = PKIX_TRUE;
              } else {
                  client->connectStatus = HTTP_COMPLETE;
                  *pKeepGoing = PKIX_FALSE;
              }
          }
  
          if (contentLength > 0) {
              /* allocate a buffer of size contentLength  for the content */
@@ skipping 624 matching lines @@
         } else {
             /* Reading till the EOF. Context length is not known.*/
             /* Check the buffer capacity: increase and
              * reallocate if it is low. */
             int freeBuffSize = client->capacity - client->filledupBytes;
             if (freeBuffSize < HTTP_MIN_AVAILABLE_BUFFER_SIZE) {
                 /* New length will be consist of available(downloaded) bytes,
                  * plus remaining capacity, plus new expansion. */
                 int currBuffSize = client->capacity;
                 /* Try to increase the buffer by 4K */
-                int newLength = currBuffSize + HTTP_DATA_BUFSIZE;
+                unsigned int newLength = currBuffSize + HTTP_DATA_BUFSIZE;
                 if (client->maxResponseLen > 0 &&
                     newLength > client->maxResponseLen) {
                         newLength = client->maxResponseLen;
                 }
                 /* Check if we can grow the buffer and report an error if
                  * new size is not larger than the current size of the buffer.*/
                 if (newLength <= client->filledupBytes) {
                     client->rcv_http_data_len = client->filledupBytes;
                     client->connectStatus = HTTP_ERROR;
                     *pKeepGoing = PKIX_FALSE;
@@ skipping 524 matching lines @@
 
         PKIX_RETURN(HTTPDEFAULTCLIENT);
 
 }
 
 PKIX_Error *
 pkix_pl_HttpDefaultClient_Cancel(
         SEC_HTTP_REQUEST_SESSION request,
         void *plContext)
 {
-        PKIX_PL_HttpDefaultClient *client = NULL;
-
         PKIX_ENTER(HTTPDEFAULTCLIENT, "pkix_pl_HttpDefaultClient_Cancel");
         PKIX_NULLCHECK_ONE(request);
 
         PKIX_CHECK(pkix_CheckType
                 ((PKIX_PL_Object *)request,
                 PKIX_HTTPDEFAULTCLIENT_TYPE,
                 plContext),
                 PKIX_REQUESTNOTANHTTPDEFAULTCLIENT);
 
-        client = (PKIX_PL_HttpDefaultClient *)request;
-
         /* XXX Not implemented */
 
 cleanup:
 
         PKIX_RETURN(HTTPDEFAULTCLIENT);
 
 }
 
 SECStatus
 pkix_pl_HttpDefaultClient_CreateSessionFcn(
@@ skipping 143 matching lines @@
 {
         PKIX_Error *err =
             PKIX_PL_Object_DecRef((PKIX_PL_Object *)(request), plContext);
 
         if (err) {
                 PKIX_PL_Object_DecRef((PKIX_PL_Object *)err, plContext);
                 return SECFailure;
         }
         return SECSuccess;
 }