Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/util/secoid.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 "secoid.h"
 #include "pkcs11t.h"
 #include "secitem.h"
 #include "secerr.h"
 #include "prenv.h"
 #include "plhash.h"
 #include "nssrwlk.h"
 #include "nssutil.h"
 
 /* Library identity and versioning */
 
 #if defined(DEBUG)
 #define _DEBUG_STRING " (debug)"
 #else
 #define _DEBUG_STRING ""
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_util_rcsid[] = "$Header: NSS " NSSUTIL_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_util_sccsid[] = "@(#)NSS " NSSUTIL_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_util_version[] = "Version: NSS " NSSUTIL_VERSION _DEBUG_STRING;
 
 /* MISSI Mosaic Object ID space */
 /* USGov algorithm OID space: { 2 16 840 1 101 } */
 #define USGOV                   0x60, 0x86, 0x48, 0x01, 0x65
 #define MISSI                   USGOV, 0x02, 0x01, 0x01
 #define MISSI_OLD_KEA_DSS       MISSI, 0x0c
 #define MISSI_OLD_DSS           MISSI, 0x02
 #define MISSI_KEA_DSS           MISSI, 0x14
 #define MISSI_DSS               MISSI, 0x13
 #define MISSI_KEA               MISSI, 0x0a
@@ skipping 443 matching lines @@
 CONST_OID aes256_CBC[]                          = { AES, 42 };
 #ifdef DEFINE_ALL_AES_CIPHERS
 CONST_OID aes256_OFB[]                          = { AES, 43 };
 CONST_OID aes256_CFB[]                          = { AES, 44 };
 #endif
 CONST_OID aes256_KEY_WRAP[]                     = { AES, 45 };
 
 CONST_OID camellia128_CBC[]                     = { CAMELLIA_ENCRYPT_OID, 2};
 CONST_OID camellia192_CBC[]                     = { CAMELLIA_ENCRYPT_OID, 3};
 CONST_OID camellia256_CBC[]                     = { CAMELLIA_ENCRYPT_OID, 4};
-CONST_OID camellia128_KEY_WRAP[]                = { CAMELLIA_WRAP_OID, 2};
-CONST_OID camellia192_KEY_WRAP[]                = { CAMELLIA_WRAP_OID, 3};
-CONST_OID camellia256_KEY_WRAP[]                = { CAMELLIA_WRAP_OID, 4};
 
 CONST_OID sha256[]                              = { SHAXXX, 1 };
 CONST_OID sha384[]                              = { SHAXXX, 2 };
 CONST_OID sha512[]                              = { SHAXXX, 3 };
 CONST_OID sha224[]                              = { SHAXXX, 4 };
 
 CONST_OID ansix962ECPublicKey[]             = { ANSI_X962_OID, 0x02, 0x01 };
 CONST_OID ansix962SignaturewithSHA1Digest[] = { ANSI_X962_SIGNATURE_OID, 0x01 };
 CONST_OID ansix962SignatureRecommended[]    = { ANSI_X962_SIGNATURE_OID, 0x02 };
 CONST_OID ansix962SignatureSpecified[]      = { ANSI_X962_SPECIFY_OID };
@@ skipping 1363 matching lines @@
 }
 
 
 /* normal static table processing */
 static PLHashTable *oidhash     = NULL;
 static PLHashTable *oidmechhash = NULL;
 
 static PLHashNumber
 secoid_HashNumber(const void *key)
 {
-    return (PLHashNumber) key;
+    return (PLHashNumber)((char *)key - (char *)NULL);
 }
 
 static void
 handleHashAlgSupport(char * envVal)
 {
     char * myVal = PORT_Strdup(envVal);  /* Get a copy we can alter */
     char * arg   = myVal;
 
     while (arg && *arg) {
         char *   nextArg = PL_strpbrk(arg, ";");
         PRUint32 notEnable;
 
         if (nextArg) {
             while (*nextArg == ';') {
                 *nextArg++ = '\0';
             }
         }
-        notEnable = (*arg == '-') ? NSS_USE_ALG_IN_CERT_SIGNATURE : 0;
+        notEnable = (*arg == '-') ? (NSS_USE_ALG_IN_CERT_SIGNATURE|NSS_USE_ALG_IN_SSL_KX) : 0;
         if ((*arg == '+' || *arg == '-') && *++arg) { 
             int i;
 
             for (i = 1; i < SEC_OID_TOTAL; i++) {
                 if (oids[i].desc && strstr(arg, oids[i].desc)) {
                      xOids[i].notPolicyFlags = notEnable |
-                    (xOids[i].notPolicyFlags & ~NSS_USE_ALG_IN_CERT_SIGNATURE);
+                    (xOids[i].notPolicyFlags & ~(NSS_USE_ALG_IN_CERT_SIGNATURE|NSS_USE_ALG_IN_SSL_KX));
                 }
             }
         }
         arg = nextArg;
     }
     PORT_Free(myVal);  /* can handle NULL argument OK */
 }
 
 SECStatus
 SECOID_Init(void)
 {
     PLHashEntry *entry;
     const SECOidData *oid;
     int i;
     char * envVal;
-    volatile char c; /* force a reference that won't get optimized away */
 
-    c = __nss_util_rcsid[0] + __nss_util_sccsid[0];
+#define NSS_VERSION_VARIABLE __nss_util_version
+#include "verref.h"
 
     if (oidhash) {
         return SECSuccess; /* already initialized */
     }
 
     if (!PR_GetEnv("NSS_ALLOW_WEAK_SIGNATURE_ALG")) {
         /* initialize any policy flags that are disabled by default */
         xOids[SEC_OID_MD2                           ].notPolicyFlags = ~0;
         xOids[SEC_OID_MD4                           ].notPolicyFlags = ~0;
         xOids[SEC_OID_MD5                           ].notPolicyFlags = ~0;
@@ skipping 253 matching lines @@
 void UTIL_SetForkState(PRBool forked)
 {
     parentForkedAfterC_Initialize = forked;
 }
 
 const char *
 NSSUTIL_GetVersion(void)
 {
     return NSSUTIL_VERSION;
 }