Update NSS to NSS 3.14 Beta 1.

mozilla/security/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"
@@ skipping 13 matching lines @@
  *
  * NOTE: the first component of the concatenated rcsid string
  * must not end in a '$' to prevent rcs keyword substitution.
  */
 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__;
 
 /* 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
 #define MISSI_ALT_KEA           MISSI, 0x16
 
 #define NISTALGS    USGOV, 3, 4
 #define AES         NISTALGS, 1
 #define SHAXXX      NISTALGS, 2
+#define DSA2        NISTALGS, 3
 
 /**
  ** The Netscape OID space is allocated by Terry Hayes.  If you need
  ** a piece of the space, contact him at thayes@netscape.com.
  **/
 
 /* Netscape Communications Corporation Object ID space */
 /* { 2 16 840 1 113730 } */
 #define NETSCAPE_OID              0x60, 0x86, 0x48, 0x01, 0x86, 0xf8, 0x42
 #define NETSCAPE_CERT_EXT         NETSCAPE_OID, 0x01
@@ skipping 18 matching lines @@
 #define RSADSI                  0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d
 #define PKCS                    RSADSI, 0x01
 #define DIGEST                  RSADSI, 0x02
 #define CIPHER                  RSADSI, 0x03
 #define PKCS1                   PKCS, 0x01
 #define PKCS5                   PKCS, 0x05
 #define PKCS7                   PKCS, 0x07
 #define PKCS9                   PKCS, 0x09
 #define PKCS12                  PKCS, 0x0c
 
-/* Fortezza algorithm OID space: { 2 16 840 1 101 2 1 1 } */
-/* ### mwelch -- Is this just for algorithms, or all of Fortezza? */
-#define FORTEZZA_ALG 0x60, 0x86, 0x48, 0x01, 0x65, 0x02, 0x01, 0x01
-
 /* Other OID name spaces */
 #define ALGORITHM               0x2b, 0x0e, 0x03, 0x02
 #define X500                    0x55
 #define X520_ATTRIBUTE_TYPE     X500, 0x04
 #define X500_ALG                X500, 0x08
 #define X500_ALG_ENCRYPTION     X500_ALG, 0x01
 
 /** X.509 v3 Extension OID 
  ** {joint-iso-ccitt (2) ds(5) 29}
  **/
@@ skipping 309 matching lines @@
 CONST_OID pkcs12V1SecretBag[]                   = { PKCS12_V1_BAG_IDS, 0x05 };
 CONST_OID pkcs12V1SafeContentsBag[]             = { PKCS12_V1_BAG_IDS, 0x06 };
 
 /* The following encoding is INCORRECT, but correcting it would create a
  * duplicate OID in the table.  So, we will leave it alone.
  */
 CONST_OID pkcs12KeyUsageAttr[]                  = { 2, 5, 29, 15 };
 
 CONST_OID ansix9DSASignature[]                  = { ANSI_X9_ALGORITHM, 0x01 };
 CONST_OID ansix9DSASignaturewithSHA1Digest[]    = { ANSI_X9_ALGORITHM, 0x03 };
+CONST_OID nistDSASignaturewithSHA224Digest[]    = { DSA2, 0x01 };
+CONST_OID nistDSASignaturewithSHA256Digest[]    = { DSA2, 0x02 };
 
 /* verisign OIDs */
 CONST_OID verisignUserNotices[]                 = { VERISIGN, 1, 7, 1, 1 };
 
 /* pkix OIDs */
 CONST_OID pkixCPSPointerQualifier[]             = { PKIX_POLICY_QUALIFIERS, 1 };
 CONST_OID pkixUserNoticeQualifier[]             = { PKIX_POLICY_QUALIFIERS, 2 };
 
 CONST_OID pkixOCSP[]                            = { PKIX_OCSP };
 CONST_OID pkixOCSPBasicResponse[]               = { PKIX_OCSP, 1 };
@@ skipping 19 matching lines @@
 CONST_OID pkixExtendedKeyUsageClientAuth[]      = { PKIX_KEY_USAGE, 2 };
 CONST_OID pkixExtendedKeyUsageCodeSign[]        = { PKIX_KEY_USAGE, 3 };
 CONST_OID pkixExtendedKeyUsageEMailProtect[]    = { PKIX_KEY_USAGE, 4 };
 CONST_OID pkixExtendedKeyUsageTimeStamp[]       = { PKIX_KEY_USAGE, 8 };
 CONST_OID pkixOCSPResponderExtendedKeyUsage[]   = { PKIX_KEY_USAGE, 9 };
 
 /* OIDs for Netscape defined algorithms */
 CONST_OID netscapeSMimeKEA[]                    = { NETSCAPE_ALGS, 0x01 };
 
 /* Fortezza algorithm OIDs */
-CONST_OID skipjackCBC[]                         = { FORTEZZA_ALG, 0x04 };
+CONST_OID skipjackCBC[]                         = { MISSI, 0x04 };
 CONST_OID dhPublicKey[]                         = { ANSI_X942_ALGORITHM, 0x1 };
 
 CONST_OID aes128_ECB[]                          = { AES, 1 };
 CONST_OID aes128_CBC[]                          = { AES, 2 };
 #ifdef DEFINE_ALL_AES_CIPHERS
 CONST_OID aes128_OFB[]                          = { AES, 3 };
 CONST_OID aes128_CFB[]                          = { AES, 4 };
 #endif
 CONST_OID aes128_KEY_WRAP[]                     = { AES, 5 };
 
@@ skipping 1152 matching lines @@
     OD( evIncorporationState,    SEC_OID_EV_INCORPORATION_STATE,
         "Jurisdiction of Incorporation State Name",
         CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ),
     OD( evIncorporationCountry,  SEC_OID_EV_INCORPORATION_COUNTRY,
         "Jurisdiction of Incorporation Country Name",
         CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ),
     OD( x520BusinessCategory,    SEC_OID_BUSINESS_CATEGORY,
         "Business Category",
         CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ),
 
+    OD( nistDSASignaturewithSHA224Digest,
+        SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST,
+        "DSA with SHA-224 Signature",
+        CKM_INVALID_MECHANISM /* not yet defined */, INVALID_CERT_EXTENSION),
+    OD( nistDSASignaturewithSHA256Digest,
+        SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST,
+        "DSA with SHA-256 Signature",
+        CKM_INVALID_MECHANISM /* not yet defined */, INVALID_CERT_EXTENSION)
 };
 
 /* PRIVATE EXTENDED SECOID Table
  * This table is private. Its structure is opaque to the outside.
  * It is indexed by the same SECOidTag as the oids table above.
  * Every member of this struct must have accessor functions (set, get)
  * and those functions must operate by value, not by reference.
  * The addresses of the contents of this table must not be exposed 
  * by the accessor functions.
  */
@@ skipping 523 matching lines @@
 void UTIL_SetForkState(PRBool forked)
 {
     parentForkedAfterC_Initialize = forked;
 }
 
 const char *
 NSSUTIL_GetVersion(void)
 {
     return NSSUTIL_VERSION;
 }