Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.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_socket.c
  *
  * Socket Function Definitions
  *
  */
 
@@ skipping 44 matching lines @@
  * PARAMETERS:
  *  none
  * THREAD SAFETY:
  *  Thread Safe (see Thread Safety definitions in Programmer's Guide)
  * RETURNS:
  *  none
  */
 static void pkix_pl_socket_timestamp() {
         PRInt64 prTime;
         prTime = PR_Now();
+/* We shouldn't use PR_ALTERNATE_INT64_TYPEDEF, but nor can we use PRId64 */
+#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF)
+        printf("%ld:\n", prTime);
+#else
         printf("%lld:\n", prTime);
+#endif
 }
 
 /*
  * FUNCTION: pkix_pl_socket_hexDigit
  * DESCRIPTION:
  *
  *  This functions prints to stdout the byte "byteVal" as two hex digits.
  *
  * PARAMETERS:
  *  "byteVal"
@@ skipping 57 matching lines @@
  * PARAMETERS:
  *  "ptr"
  *      The address of the first of the bytes to be printed
  * THREAD SAFETY:
  *  Thread Safe (see Thread Safety definitions in Programmer's Guide)
  * RETURNS:
  *  none
  */
 static void pkix_pl_socket_traceLine(char *ptr) {
         PKIX_UInt32 i = 0;
-        pkix_pl_socket_linePrefix((PKIX_UInt32)ptr);
+        pkix_pl_socket_linePrefix((PKIX_UInt32)((char *)ptr - (char *)NULL));
         for (i = 0; i < 16; i++) {
                 printf(" ");
                 pkix_pl_socket_hexDigit(ptr[i]);
                 if (i == 7) {
                         printf("  ");
                 }
         }
         printf("  ");
         for (i = 0; i < 16; i++) {
                 if ((ptr[i] < ' ') || (ptr[i] > '}')) {
@@ skipping 23 matching lines @@
  *      is greater than sixteen, the results will be unattractive.
  *  none
  * THREAD SAFETY:
  *  Thread Safe (see Thread Safety definitions in Programmer's Guide)
  * RETURNS:
  *  none
  */
 static void pkix_pl_socket_tracePartialLine(char *ptr, PKIX_UInt32 nBytes) {
         PKIX_UInt32 i = 0;
         if (nBytes > 0) {
-                pkix_pl_socket_linePrefix((PKIX_UInt32)ptr);
+                pkix_pl_socket_linePrefix((PKIX_UInt32)((char *)ptr - (char *)NULL));
         }
         for (i = 0; i < nBytes; i++) {
                 printf(" ");
                 pkix_pl_socket_hexDigit(ptr[i]);
                 if (i == 7) {
                         printf("  ");
                 }
         }
         for (i = nBytes; i < 16; i++) {
                 printf("   ");
@@ skipping 38 matching lines @@
         PKIX_UInt32 offset = 0;
         char *bufptr = (char *)buf;
 
         if (socketTraceFlag == PKIX_FALSE) return;
 
         pkix_pl_socket_timestamp();
         /*
          * Special case: if called with length of zero, just do address
          */
         if (nBytes == 0) {
-                pkix_pl_socket_linePrefix((PKIX_UInt32)buf);
+                pkix_pl_socket_linePrefix((PKIX_UInt32)((char *)buf - (char *)NULL));
                 printf("\n");
         } else {
                 while (bytesRemaining >= 16) {
                         pkix_pl_socket_traceLine(&bufptr[offset]);
                         bytesRemaining -= 16;
                         offset += 16;
                 }
                 pkix_pl_socket_tracePartialLine
                         (&bufptr[offset], bytesRemaining);
         }
@@ skipping 1424 matching lines @@
         PRFileDesc **pDesc,
         void *plContext)
 {
         PKIX_ENTER(SOCKET, "pkix_pl_Socket_GetPRFileDesc");
         PKIX_NULLCHECK_TWO(socket, pDesc);
 
         *pDesc = socket->clientSock;
 
         PKIX_RETURN(SOCKET);
 }