Bugzilla bug #65416: assign values explicitly to enumeration constants.

The same values that the compiler would assign are assigned, with only
one exception (cmmfNoPKIStatus in cmmft.h).  This is patch id=22555,
reviewed by Nelson Bolyard.

15 files changed, 349 insertions, 349 deletions

diff --git a/security/nss/lib/certdb/certt.h b/security/nss/lib/certdb/certt.h
index 15cee76d8..af8b60fb1 100644
--- a/security/nss/lib/certdb/certt.h
+++ b/security/nss/lib/certdb/certt.h
@@ -173,10 +173,10 @@ struct CERTCertTrustStr {
  * defined the types of trust that exist
  */
 typedef enum {
-    trustSSL,
-    trustEmail,
-    trustObjectSigning,
-    trustTypeNone
+    trustSSL = 0,
+    trustEmail = 1,
+    trustObjectSigning = 2,
+    trustTypeNone = 3
 } SECTrustType;
 
 #define SEC_GET_TRUST_FLAGS(trust,type) \
@@ -451,36 +451,36 @@ struct CERTDistNamesStr {
 			 NS_CERT_TYPE_OBJECT_SIGNING_CA | \
 			 EXT_KEY_USAGE_STATUS_RESPONDER )
 typedef enum {
-    certUsageSSLClient,
-    certUsageSSLServer,
-    certUsageSSLServerWithStepUp,
-    certUsageSSLCA,
-    certUsageEmailSigner,
-    certUsageEmailRecipient,
-    certUsageObjectSigner,
-    certUsageUserCertImport,
-    certUsageVerifyCA,
-    certUsageProtectedObjectSigner,
-    certUsageStatusResponder,
-    certUsageAnyCA
+    certUsageSSLClient = 0,
+    certUsageSSLServer = 1,
+    certUsageSSLServerWithStepUp = 2,
+    certUsageSSLCA = 3,
+    certUsageEmailSigner = 4,
+    certUsageEmailRecipient = 5,
+    certUsageObjectSigner = 6,
+    certUsageUserCertImport = 7,
+    certUsageVerifyCA = 8,
+    certUsageProtectedObjectSigner = 9,
+    certUsageStatusResponder = 10,
+    certUsageAnyCA = 11
 } SECCertUsage;
 
 /*
  * Does the cert belong to the user, a peer, or a CA.
  */
 typedef enum {
-    certOwnerUser,
-    certOwnerPeer,
-    certOwnerCA
+    certOwnerUser = 0,
+    certOwnerPeer = 1,
+    certOwnerCA = 2
 } CERTCertOwner;
 
 /*
  * This enum represents the state of validity times of a certificate
  */
 typedef enum {
-    secCertTimeValid,
-    secCertTimeExpired,
-    secCertTimeNotValidYet
+    secCertTimeValid = 0,
+    secCertTimeExpired = 1,
+    secCertTimeNotValidYet = 2
 } SECCertTimeValidity;
 
 /*
@@ -727,11 +727,11 @@ typedef char * (*CERTDBNameFunc)(void *arg, int dbVersion);
  * types of cert packages that we can decode
  */
 typedef enum {
-    certPackageNone,
-    certPackageCert,
-    certPackagePKCS7,
-    certPackageNSCertSeq,
-    certPackageNSCertWrap
+    certPackageNone = 0,
+    certPackageCert = 1,
+    certPackagePKCS7 = 2,
+    certPackageNSCertSeq = 3,
+    certPackageNSCertWrap = 4
 } CERTPackageType;
 
 /*
diff --git a/security/nss/lib/crmf/cmmft.h b/security/nss/lib/crmf/cmmft.h
index 3db678714..078253057 100644
--- a/security/nss/lib/crmf/cmmft.h
+++ b/security/nss/lib/crmf/cmmft.h
@@ -42,9 +42,9 @@
  * choices available for the CMMFCertOrEncCert structure.
  */
 typedef enum {
-    cmmfNoCertOrEncCert,
-    cmmfCertificate,
-    cmmfEncryptedCert
+    cmmfNoCertOrEncCert = 0,
+    cmmfCertificate = 1,
+    cmmfEncryptedCert = 2
 } CMMFCertOrEncCertChoice;
 
 /*
@@ -52,15 +52,15 @@ typedef enum {
  * represent the CMMF type PKIStatus
  */
 typedef enum {
-    cmmfGranted,
-    cmmfGrantedWithMods,
-    cmmfRejection,
-    cmmfWaiting,
-    cmmfRevocationWarning,
-    cmmfRevocationNotification,
-    cmmfKeyUpdateWarning,
-    cmmfNumPKIStatus,
-    cmmfNoPKIStatus
+    cmmfNoPKIStatus = -1,
+    cmmfGranted = 0,
+    cmmfGrantedWithMods = 1,
+    cmmfRejection = 2,
+    cmmfWaiting = 3,
+    cmmfRevocationWarning = 4,
+    cmmfRevocationNotification = 5,
+    cmmfKeyUpdateWarning = 6,
+    cmmfNumPKIStatus
 } CMMFPKIStatus;
 
 /*
@@ -68,16 +68,16 @@ typedef enum {
  * in PKIFailureInfo defined in CMMF.
  */
 typedef enum {
-    cmmfBadAlg,
-    cmmfBadMessageCheck,
-    cmmfBadRequest,
-    cmmfBadTime,
-    cmmfBadCertId,
-    cmmfBadDataFormat,
-    cmmfWrongAuthority,
-    cmmfIncorrectData,
-    cmmfMissingTimeStamp,
-    cmmfNoFailureInfo
+    cmmfBadAlg = 0,
+    cmmfBadMessageCheck = 1,
+    cmmfBadRequest = 2,
+    cmmfBadTime = 3,
+    cmmfBadCertId = 4,
+    cmmfBadDataFormat = 5,
+    cmmfWrongAuthority = 6,
+    cmmfIncorrectData = 7,
+    cmmfMissingTimeStamp = 8,
+    cmmfNoFailureInfo = 9
 } CMMFPKIFailureInfo;
 
 typedef struct CMMFPKIStatusInfoStr          CMMFPKIStatusInfo;
diff --git a/security/nss/lib/crmf/crmft.h b/security/nss/lib/crmf/crmft.h
index 574c7212e..3bc4d3826 100644
--- a/security/nss/lib/crmf/crmft.h
+++ b/security/nss/lib/crmf/crmft.h
@@ -42,37 +42,37 @@
 
 /* Use these enumerated values for adding fields to the certificate request */
 typedef enum {
-    crmfVersion,
-    crmfSerialNumber,
-    crmfSigningAlg,
-    crmfIssuer,
-    crmfValidity,
-    crmfSubject,
-    crmfPublicKey,
-    crmfIssuerUID,
-    crmfSubjectUID,
-    crmfExtension
+    crmfVersion = 0,
+    crmfSerialNumber = 1,
+    crmfSigningAlg = 2,
+    crmfIssuer = 3,
+    crmfValidity = 4,
+    crmfSubject = 5,
+    crmfPublicKey = 6,
+    crmfIssuerUID = 7,
+    crmfSubjectUID = 8,
+    crmfExtension = 9
 } CRMFCertTemplateField;
 
 /*
  * An enumeration for the different types of controls.
  */
 typedef enum {
-    crmfNoControl,
-    crmfRegTokenControl,
-    crmfAuthenticatorControl,
-    crmfPKIPublicationInfoControl,
-    crmfPKIArchiveOptionsControl,
-    crmfOldCertIDControl,
-    crmfProtocolEncrKeyControl
+    crmfNoControl = 0,
+    crmfRegTokenControl = 1,
+    crmfAuthenticatorControl = 2,
+    crmfPKIPublicationInfoControl = 3,
+    crmfPKIArchiveOptionsControl = 4,
+    crmfOldCertIDControl = 5,
+    crmfProtocolEncrKeyControl = 6
 } CRMFControlType;
 
 /*
  * The possible values that are passed into CRMF_CreatePKIPublicationInfo
  */
-typedef enum{
-    crmfDontPublish,
-    crmfPleasePublish
+typedef enum {
+    crmfDontPublish = 0,
+    crmfPleasePublish = 1
 } CRMFPublicationAction;
 
 /*
@@ -80,31 +80,31 @@ typedef enum{
  * the SinglePubInfo ASN1 type.
  */
 typedef enum {
-    crmfDontCare,
-    crmfX500,
-    crmfWeb,
-    crmfLdap
+    crmfDontCare = 0,
+    crmfX500 = 1,
+    crmfWeb = 2,
+    crmfLdap = 3
 } CRMFPublicationMethod;
 
 /*
  * An enumeration for the different options for PKIArchiveOptions type.
  */
 typedef enum {
-    crmfNoArchiveOptions,
-    crmfEncryptedPrivateKey,
-    crmfKeyGenParameters,
-    crmfArchiveRemGenPrivKey
+    crmfNoArchiveOptions = 0,
+    crmfEncryptedPrivateKey = 1,
+    crmfKeyGenParameters = 2,
+    crmfArchiveRemGenPrivKey = 3
 } CRMFPKIArchiveOptionsType;
 
 /*
  * An enumeration for the different options for ProofOfPossession
  */
 typedef enum {
-    crmfNoPOPChoice,
-    crmfRAVerified,
-    crmfSignature,
-    crmfKeyEncipherment,
-    crmfKeyAgreement
+    crmfNoPOPChoice = 0,
+    crmfRAVerified = 1,
+    crmfSignature = 2,
+    crmfKeyEncipherment = 3,
+    crmfKeyAgreement = 4
 } CRMFPOPChoice;
 
 /*
@@ -112,36 +112,36 @@ typedef enum {
  * CRMFPOPOSigningKeyInput structure.
  */
 typedef enum {
-    crmfSender,
-    crmfPublicKeyMAC
+    crmfSender = 0,
+    crmfPublicKeyMAC = 1
 } CRMFPOPOSkiInputAuthChoice;
 
 /*
  * An enumeration for the SubsequentMessage Options.
  */
 typedef enum {
-    crmfNoSubseqMess,
-    crmfEncrCert,
-    crmfChallengeResp
+    crmfNoSubseqMess = 0,
+    crmfEncrCert = 1,
+    crmfChallengeResp = 2
 } CRMFSubseqMessOptions;
 
 /*
  * An enumeration for the choice used by POPOPrivKey.
  */
 typedef enum {
-    crmfNoMessage,
-    crmfThisMessage,
-    crmfSubsequentMessage,
-    crmfDHMAC
+    crmfNoMessage = 0,
+    crmfThisMessage = 1,
+    crmfSubsequentMessage = 2,
+    crmfDHMAC = 3
 } CRMFPOPOPrivKeyChoice;
 
 /*
  * An enumeration for the choices for the EncryptedKey type.
  */
 typedef enum {
-    crmfNoEncryptedKeyChoice,
-    crmfEncryptedValueChoice,
-    crmfEnvelopedDataChoice
+    crmfNoEncryptedKeyChoice = 0,
+    crmfEncryptedValueChoice = 1,
+    crmfEnvelopedDataChoice = 2
 } CRMFEncryptedKeyChoice;
 
 /*
diff --git a/security/nss/lib/cryptohi/hasht.h b/security/nss/lib/cryptohi/hasht.h
index aa5e39215..143e37486 100644
--- a/security/nss/lib/cryptohi/hasht.h
+++ b/security/nss/lib/cryptohi/hasht.h
@@ -47,10 +47,10 @@ typedef struct HASHContextStr HASHContext;
  * NOTE the order must match the definition of SECHashObjects[]!
  */
 typedef enum {
-    HASH_AlgNULL,
-    HASH_AlgMD2,
-    HASH_AlgMD5,
-    HASH_AlgSHA1,
+    HASH_AlgNULL = 0,
+    HASH_AlgMD2 = 1,
+    HASH_AlgMD5 = 2,
+    HASH_AlgSHA1 = 3,
     HASH_AlgTOTAL
 } HASH_HashType;
 
diff --git a/security/nss/lib/pk11wrap/secmodt.h b/security/nss/lib/pk11wrap/secmodt.h
index fde43bbb0..5fdc158c2 100644
--- a/security/nss/lib/pk11wrap/secmodt.h
+++ b/security/nss/lib/pk11wrap/secmodt.h
@@ -149,20 +149,20 @@ struct PK11DefaultArrayEntryStr {
  * hack.
  */
 typedef enum {
-	PK11_OriginNULL,	/* There is not key, it's a null SymKey */
-	PK11_OriginDerive,	/* Key was derived from some other key */
-	PK11_OriginGenerated,	/* Key was generated (also PBE keys) */
-	PK11_OriginFortezzaHack,/* Key was marked for fortezza hack */
-	PK11_OriginUnwrap	/* Key was unwrapped or decrypted */
+    PK11_OriginNULL = 0,	/* There is not key, it's a null SymKey */
+    PK11_OriginDerive = 1,	/* Key was derived from some other key */
+    PK11_OriginGenerated = 2,	/* Key was generated (also PBE keys) */
+    PK11_OriginFortezzaHack = 3,/* Key was marked for fortezza hack */
+    PK11_OriginUnwrap = 4	/* Key was unwrapped or decrypted */
 } PK11Origin;
 
 /* PKCS #11 disable reasons */
 typedef enum {
     PK11_DIS_NONE = 0,
-    PK11_DIS_USER_SELECTED,
-    PK11_DIS_COULD_NOT_INIT_TOKEN,
-    PK11_DIS_TOKEN_VERIFY_FAILED,
-    PK11_DIS_TOKEN_NOT_PRESENT
+    PK11_DIS_USER_SELECTED = 1,
+    PK11_DIS_COULD_NOT_INIT_TOKEN = 2,
+    PK11_DIS_TOKEN_VERIFY_FAILED = 3,
+    PK11_DIS_TOKEN_NOT_PRESENT = 4
 } PK11DisableReasons;
 
 /* function pointer type for password callback function.
diff --git a/security/nss/lib/pkcs7/pkcs7t.h b/security/nss/lib/pkcs7/pkcs7t.h
index 73b23014d..a3e974f7b 100644
--- a/security/nss/lib/pkcs7/pkcs7t.h
+++ b/security/nss/lib/pkcs7/pkcs7t.h
@@ -221,9 +221,9 @@ struct SEC_PKCS7AttributeStr {
    scenario and data specifics. */
 typedef enum
 {
-	SECKEAUsesSkipjack,
-	SECKEAUsesNonSkipjack,
-	SECKEAUsesNonSkipjackWithPaddedEncKey
+	SECKEAUsesSkipjack = 0,
+	SECKEAUsesNonSkipjack = 1,
+	SECKEAUsesNonSkipjackWithPaddedEncKey = 2
 } SECKEATemplateSelector;
 
 /* ### mwelch - S/MIME KEA parameters. These don't really fit here,
diff --git a/security/nss/lib/smime/cmsreclist.h b/security/nss/lib/smime/cmsreclist.h
index 32ff188ef..19b13e115 100644
--- a/security/nss/lib/smime/cmsreclist.h
+++ b/security/nss/lib/smime/cmsreclist.h
@@ -42,7 +42,7 @@ struct NSSCMSRecipientStr {
     int				riIndex;	/* this recipient's index in recipientInfo array */
     int				subIndex;	/* index into recipientEncryptedKeys */
 						/* (only in NSSCMSKeyAgreeRecipientInfoStr) */
-    enum {RLIssuerSN, RLSubjKeyID} kind;	/* for conversion recipientinfos -> recipientlist */
+    enum {RLIssuerSN=0, RLSubjKeyID=1} kind;	/* for conversion recipientinfos -> recipientlist */
     union {
 	CERTIssuerAndSN *	issuerAndSN;
 	SECItem *		subjectKeyID;
diff --git a/security/nss/lib/smime/cmst.h b/security/nss/lib/smime/cmst.h
index 5f7fd0984..3872489b7 100644
--- a/security/nss/lib/smime/cmst.h
+++ b/security/nss/lib/smime/cmst.h
@@ -205,20 +205,20 @@ struct NSSCMSSignedDataStr {
 
 typedef enum {
     NSSCMSVS_Unverified = 0,
-    NSSCMSVS_GoodSignature,
-    NSSCMSVS_BadSignature,
-    NSSCMSVS_DigestMismatch,
-    NSSCMSVS_SigningCertNotFound,
-    NSSCMSVS_SigningCertNotTrusted,
-    NSSCMSVS_SignatureAlgorithmUnknown,
-    NSSCMSVS_SignatureAlgorithmUnsupported,
-    NSSCMSVS_MalformedSignature,
-    NSSCMSVS_ProcessingError
+    NSSCMSVS_GoodSignature = 1,
+    NSSCMSVS_BadSignature = 2,
+    NSSCMSVS_DigestMismatch = 3,
+    NSSCMSVS_SigningCertNotFound = 4,
+    NSSCMSVS_SigningCertNotTrusted = 5,
+    NSSCMSVS_SignatureAlgorithmUnknown = 6,
+    NSSCMSVS_SignatureAlgorithmUnsupported = 7,
+    NSSCMSVS_MalformedSignature = 8,
+    NSSCMSVS_ProcessingError = 9
 } NSSCMSVerificationStatus;
 
 typedef enum {
-    NSSCMSSignerID_IssuerSN,
-    NSSCMSSignerID_SubjectKeyID
+    NSSCMSSignerID_IssuerSN = 0,
+    NSSCMSSignerID_SubjectKeyID = 1
 } NSSCMSSignerIDSelector;
 
 struct NSSCMSSignerIdentifierStr {
@@ -249,9 +249,9 @@ struct NSSCMSSignerInfoStr {
 
 typedef enum {
     NSSCMSCM_None = 0,
-    NSSCMSCM_CertOnly,
-    NSSCMSCM_CertChain,
-    NSSCMSCM_CertChainWithRoot
+    NSSCMSCM_CertOnly = 1,
+    NSSCMSCM_CertChain = 2,
+    NSSCMSCM_CertChainWithRoot = 3
 } NSSCMSCertChainMode;
 
 /* =============================================================================
@@ -280,8 +280,8 @@ struct NSSCMSOriginatorInfoStr {
  * key transport recipient info
  */
 typedef enum {
-    NSSCMSRecipientID_IssuerSN,
-    NSSCMSRecipientID_SubjectKeyID
+    NSSCMSRecipientID_IssuerSN = 0,
+    NSSCMSRecipientID_SubjectKeyID = 1
 } NSSCMSRecipientIDSelector;
 
 struct NSSCMSRecipientIdentifierStr {
@@ -314,9 +314,9 @@ struct NSSCMSOriginatorPublicKeyStr {
 typedef struct NSSCMSOriginatorPublicKeyStr NSSCMSOriginatorPublicKey;
 
 typedef enum {
-    NSSCMSOriginatorIDOrKey_IssuerSN,
-    NSSCMSOriginatorIDOrKey_SubjectKeyID,
-    NSSCMSOriginatorIDOrKey_OriginatorPublicKey
+    NSSCMSOriginatorIDOrKey_IssuerSN = 0,
+    NSSCMSOriginatorIDOrKey_SubjectKeyID = 1,
+    NSSCMSOriginatorIDOrKey_OriginatorPublicKey = 2
 } NSSCMSOriginatorIDOrKeySelector;
 
 struct NSSCMSOriginatorIdentifierOrKeyStr {
@@ -337,8 +337,8 @@ struct NSSCMSRecipientKeyIdentifierStr {
 typedef struct NSSCMSRecipientKeyIdentifierStr NSSCMSRecipientKeyIdentifier;
 
 typedef enum {
-    NSSCMSKeyAgreeRecipientID_IssuerSN,
-    NSSCMSKeyAgreeRecipientID_RKeyID
+    NSSCMSKeyAgreeRecipientID_IssuerSN = 0,
+    NSSCMSKeyAgreeRecipientID_RKeyID = 1
 } NSSCMSKeyAgreeRecipientIDSelector;
 
 struct NSSCMSKeyAgreeRecipientIdentifierStr {
@@ -392,9 +392,9 @@ typedef struct NSSCMSKEKRecipientInfoStr NSSCMSKEKRecipientInfo;
  */
 
 typedef enum {
-    NSSCMSRecipientInfoID_KeyTrans,
-    NSSCMSRecipientInfoID_KeyAgree,
-    NSSCMSRecipientInfoID_KEK
+    NSSCMSRecipientInfoID_KeyTrans = 0,
+    NSSCMSRecipientInfoID_KeyAgree = 1,
+    NSSCMSRecipientInfoID_KEK = 2
 } NSSCMSRecipientInfoIDSelector;
 
 struct NSSCMSRecipientInfoStr {
@@ -444,9 +444,9 @@ struct NSSCMSEncryptedDataStr {
 /* An enumerated type used to select templates based on the encryption
    scenario and data specifics. */
 typedef enum {
-    NSSCMSKEAUsesSkipjack,
-    NSSCMSKEAUsesNonSkipjack,
-    NSSCMSKEAUsesNonSkipjackWithPaddedEncKey
+    NSSCMSKEAUsesSkipjack = 0,
+    NSSCMSKEAUsesNonSkipjack = 1,
+    NSSCMSKEAUsesNonSkipjackWithPaddedEncKey = 2
 } NSSCMSKEATemplateSelector;
 
 /* ### mwelch - S/MIME KEA parameters. These don't really fit here,
diff --git a/security/nss/lib/softoken/keytlow.h b/security/nss/lib/softoken/keytlow.h
index 0b47ceb99..8c81c5baa 100644
--- a/security/nss/lib/softoken/keytlow.h
+++ b/security/nss/lib/softoken/keytlow.h
@@ -36,12 +36,12 @@
 #include "blapit.h"
 
 typedef enum { 
-    nullKey, 
-    rsaKey, 
-    dsaKey, 
-    fortezzaKey,
-    dhKey, 
-    keaKey 
+    nullKey = 0, 
+    rsaKey = 1, 
+    dsaKey = 2, 
+    fortezzaKey = 3,
+    dhKey = 4, 
+    keaKey = 5
 } KeyType;
 
 struct FortezzaPublicKeyStr {
diff --git a/security/nss/lib/softoken/secpkcs5.h b/security/nss/lib/softoken/secpkcs5.h
index 7719ac115..d538450dd 100644
--- a/security/nss/lib/softoken/secpkcs5.h
+++ b/security/nss/lib/softoken/secpkcs5.h
@@ -44,7 +44,7 @@ typedef SECItem * (* SEC_PKCS5GetPBEPassword)(void *arg);
 
 /* used for V2 PKCS 12 Draft Spec */ 
 typedef enum {
-    pbeBitGenIDNull,
+    pbeBitGenIDNull = 0,
     pbeBitGenCipherKey = 0x01,
     pbeBitGenCipherIV = 0x02,
     pbeBitGenIntegrityKey = 0x03
diff --git a/security/nss/lib/ssl/ssl.h b/security/nss/lib/ssl/ssl.h
index 23d9df9d5..7e434aa33 100644
--- a/security/nss/lib/ssl/ssl.h
+++ b/security/nss/lib/ssl/ssl.h
@@ -258,9 +258,9 @@ SSL_IMPORT int SSL_BadCertHook(PRFileDesc *fd, SSLBadCertHandler f, void *arg);
 /* Key Exchange values */
 typedef enum {
     kt_null = 0,
-    kt_rsa,
-    kt_dh,
-    kt_fortezza,
+    kt_rsa = 1,
+    kt_dh = 2,
+    kt_fortezza = 3,
     kt_kea_size
 } SSLKEAType;
 
diff --git a/security/nss/lib/ssl/sslsecur.c b/security/nss/lib/ssl/sslsecur.c
index 66bc3762a..89072f5ca 100644
--- a/security/nss/lib/ssl/sslsecur.c
+++ b/security/nss/lib/ssl/sslsecur.c
@@ -637,7 +637,7 @@ SSL_ConfigSecureServer(PRFileDesc *fd, CERTCertificate *cert,
     }
 
     /* make sure the key exchange is recognized */
-    if ((kea > kt_kea_size) || (kea < kt_null)) {
+    if ((kea >= kt_kea_size) || (kea < kt_null)) {
 	PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
 	return SECFailure;
     }
diff --git a/security/nss/lib/util/secasn1t.h b/security/nss/lib/util/secasn1t.h
index 44907a518..45f0eba60 100644
--- a/security/nss/lib/util/secasn1t.h
+++ b/security/nss/lib/util/secasn1t.h
@@ -230,10 +230,10 @@ typedef struct sec_EncoderContext_struct SEC_ASN1EncoderContext;
  * contents octets.
  */
 typedef enum {
-    SEC_ASN1_Identifier,
-    SEC_ASN1_Length,
-    SEC_ASN1_Contents,
-    SEC_ASN1_EndOfContents
+    SEC_ASN1_Identifier = 0,
+    SEC_ASN1_Length = 1,
+    SEC_ASN1_Contents = 2,
+    SEC_ASN1_EndOfContents = 3
 } SEC_ASN1EncodingPart;
 
 /*
diff --git a/security/nss/lib/util/seccomon.h b/security/nss/lib/util/seccomon.h
index 707db8bbc..75ce628f0 100644
--- a/security/nss/lib/util/seccomon.h
+++ b/security/nss/lib/util/seccomon.h
@@ -58,16 +58,16 @@
 #include "secport.h"
 
 typedef enum {
-    siBuffer,
-    siClearDataBuffer,
-    siCipherDataBuffer,
-    siDERCertBuffer,
-    siEncodedCertBuffer,
-    siDERNameBuffer,
-    siEncodedNameBuffer,
-    siAsciiNameString,
-    siAsciiString,
-    siDEROID
+    siBuffer = 0,
+    siClearDataBuffer = 1,
+    siCipherDataBuffer = 2,
+    siDERCertBuffer = 3,
+    siEncodedCertBuffer = 4,
+    siDERNameBuffer = 5,
+    siEncodedNameBuffer = 6,
+    siAsciiNameString = 7,
+    siAsciiString = 8,
+    siDEROID = 9
 } SECItemType;
 
 typedef struct SECItemStr SECItem;
diff --git a/security/nss/lib/util/secoidt.h b/security/nss/lib/util/secoidt.h
index 66d3424a0..0594610ec 100644
--- a/security/nss/lib/util/secoidt.h
+++ b/security/nss/lib/util/secoidt.h
@@ -60,229 +60,229 @@ struct SECAlgorithmIDStr {
  * in util/secoid.c.
  */
 typedef enum {
-    SEC_OID_UNKNOWN,
-    SEC_OID_MD2,
-    SEC_OID_MD4,
-    SEC_OID_MD5,
-    SEC_OID_SHA1,
-    SEC_OID_RC2_CBC,
-    SEC_OID_RC4,
-    SEC_OID_DES_EDE3_CBC,
-    SEC_OID_RC5_CBC_PAD,
-    SEC_OID_DES_ECB,
-    SEC_OID_DES_CBC,
-    SEC_OID_DES_OFB,
-    SEC_OID_DES_CFB,
-    SEC_OID_DES_MAC,
-    SEC_OID_DES_EDE,
-    SEC_OID_ISO_SHA_WITH_RSA_SIGNATURE,
-    SEC_OID_PKCS1_RSA_ENCRYPTION,
-    SEC_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION,
-    SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION,
-    SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION,
-    SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION,
-    SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC,
-    SEC_OID_PKCS5_PBE_WITH_MD5_AND_DES_CBC,
-    SEC_OID_PKCS5_PBE_WITH_SHA1_AND_DES_CBC,
-    SEC_OID_PKCS7,
-    SEC_OID_PKCS7_DATA,
-    SEC_OID_PKCS7_SIGNED_DATA,
-    SEC_OID_PKCS7_ENVELOPED_DATA,
-    SEC_OID_PKCS7_SIGNED_ENVELOPED_DATA,
-    SEC_OID_PKCS7_DIGESTED_DATA,
-    SEC_OID_PKCS7_ENCRYPTED_DATA,
-    SEC_OID_PKCS9_EMAIL_ADDRESS,
-    SEC_OID_PKCS9_UNSTRUCTURED_NAME,
-    SEC_OID_PKCS9_CONTENT_TYPE,
-    SEC_OID_PKCS9_MESSAGE_DIGEST,
-    SEC_OID_PKCS9_SIGNING_TIME,
-    SEC_OID_PKCS9_COUNTER_SIGNATURE,
-    SEC_OID_PKCS9_CHALLENGE_PASSWORD,
-    SEC_OID_PKCS9_UNSTRUCTURED_ADDRESS,
-    SEC_OID_PKCS9_EXTENDED_CERTIFICATE_ATTRIBUTES,
-    SEC_OID_PKCS9_SMIME_CAPABILITIES,
-    SEC_OID_AVA_COMMON_NAME,
-    SEC_OID_AVA_COUNTRY_NAME,
-    SEC_OID_AVA_LOCALITY,
-    SEC_OID_AVA_STATE_OR_PROVINCE,
-    SEC_OID_AVA_ORGANIZATION_NAME,
-    SEC_OID_AVA_ORGANIZATIONAL_UNIT_NAME,
-    SEC_OID_AVA_DN_QUALIFIER,
-    SEC_OID_AVA_DC,
+    SEC_OID_UNKNOWN = 0,
+    SEC_OID_MD2 = 1,
+    SEC_OID_MD4 = 2,
+    SEC_OID_MD5 = 3,
+    SEC_OID_SHA1 = 4,
+    SEC_OID_RC2_CBC = 5,
+    SEC_OID_RC4 = 6,
+    SEC_OID_DES_EDE3_CBC = 7,
+    SEC_OID_RC5_CBC_PAD = 8,
+    SEC_OID_DES_ECB = 9,
+    SEC_OID_DES_CBC = 10,
+    SEC_OID_DES_OFB = 11,
+    SEC_OID_DES_CFB = 12,
+    SEC_OID_DES_MAC = 13,
+    SEC_OID_DES_EDE = 14,
+    SEC_OID_ISO_SHA_WITH_RSA_SIGNATURE = 15,
+    SEC_OID_PKCS1_RSA_ENCRYPTION = 16,
+    SEC_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION = 17,
+    SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION = 18,
+    SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION = 19,
+    SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION = 20,
+    SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC = 21,
+    SEC_OID_PKCS5_PBE_WITH_MD5_AND_DES_CBC = 22,
+    SEC_OID_PKCS5_PBE_WITH_SHA1_AND_DES_CBC = 23,
+    SEC_OID_PKCS7 = 24,
+    SEC_OID_PKCS7_DATA = 25,
+    SEC_OID_PKCS7_SIGNED_DATA = 26,
+    SEC_OID_PKCS7_ENVELOPED_DATA = 27,
+    SEC_OID_PKCS7_SIGNED_ENVELOPED_DATA = 28,
+    SEC_OID_PKCS7_DIGESTED_DATA = 29,
+    SEC_OID_PKCS7_ENCRYPTED_DATA = 30,
+    SEC_OID_PKCS9_EMAIL_ADDRESS = 31,
+    SEC_OID_PKCS9_UNSTRUCTURED_NAME = 32,
+    SEC_OID_PKCS9_CONTENT_TYPE = 33,
+    SEC_OID_PKCS9_MESSAGE_DIGEST = 34,
+    SEC_OID_PKCS9_SIGNING_TIME = 35,
+    SEC_OID_PKCS9_COUNTER_SIGNATURE = 36,
+    SEC_OID_PKCS9_CHALLENGE_PASSWORD = 37,
+    SEC_OID_PKCS9_UNSTRUCTURED_ADDRESS = 38,
+    SEC_OID_PKCS9_EXTENDED_CERTIFICATE_ATTRIBUTES = 39,
+    SEC_OID_PKCS9_SMIME_CAPABILITIES = 40,
+    SEC_OID_AVA_COMMON_NAME = 41,
+    SEC_OID_AVA_COUNTRY_NAME = 42,
+    SEC_OID_AVA_LOCALITY = 43,
+    SEC_OID_AVA_STATE_OR_PROVINCE = 44,
+    SEC_OID_AVA_ORGANIZATION_NAME = 45,
+    SEC_OID_AVA_ORGANIZATIONAL_UNIT_NAME = 46,
+    SEC_OID_AVA_DN_QUALIFIER = 47,
+    SEC_OID_AVA_DC = 48,
 
-    SEC_OID_NS_TYPE_GIF,
-    SEC_OID_NS_TYPE_JPEG,
-    SEC_OID_NS_TYPE_URL,
-    SEC_OID_NS_TYPE_HTML,
-    SEC_OID_NS_TYPE_CERT_SEQUENCE,
-    SEC_OID_MISSI_KEA_DSS_OLD,
-    SEC_OID_MISSI_DSS_OLD,
-    SEC_OID_MISSI_KEA_DSS,
-    SEC_OID_MISSI_DSS,
-    SEC_OID_MISSI_KEA,
-    SEC_OID_MISSI_ALT_KEA,
+    SEC_OID_NS_TYPE_GIF = 49,
+    SEC_OID_NS_TYPE_JPEG = 50,
+    SEC_OID_NS_TYPE_URL = 51,
+    SEC_OID_NS_TYPE_HTML = 52,
+    SEC_OID_NS_TYPE_CERT_SEQUENCE = 53,
+    SEC_OID_MISSI_KEA_DSS_OLD = 54,
+    SEC_OID_MISSI_DSS_OLD = 55,
+    SEC_OID_MISSI_KEA_DSS = 56,
+    SEC_OID_MISSI_DSS = 57,
+    SEC_OID_MISSI_KEA = 58,
+    SEC_OID_MISSI_ALT_KEA = 59,
 
     /* Netscape private certificate extensions */
-    SEC_OID_NS_CERT_EXT_NETSCAPE_OK,
-    SEC_OID_NS_CERT_EXT_ISSUER_LOGO,
-    SEC_OID_NS_CERT_EXT_SUBJECT_LOGO,
-    SEC_OID_NS_CERT_EXT_CERT_TYPE,
-    SEC_OID_NS_CERT_EXT_BASE_URL,
-    SEC_OID_NS_CERT_EXT_REVOCATION_URL,
-    SEC_OID_NS_CERT_EXT_CA_REVOCATION_URL,
-    SEC_OID_NS_CERT_EXT_CA_CRL_URL,
-    SEC_OID_NS_CERT_EXT_CA_CERT_URL,
-    SEC_OID_NS_CERT_EXT_CERT_RENEWAL_URL,
-    SEC_OID_NS_CERT_EXT_CA_POLICY_URL,
-    SEC_OID_NS_CERT_EXT_HOMEPAGE_URL,
-    SEC_OID_NS_CERT_EXT_ENTITY_LOGO,
-    SEC_OID_NS_CERT_EXT_USER_PICTURE,
-    SEC_OID_NS_CERT_EXT_SSL_SERVER_NAME,
-    SEC_OID_NS_CERT_EXT_COMMENT,
-    SEC_OID_NS_CERT_EXT_LOST_PASSWORD_URL,
-    SEC_OID_NS_CERT_EXT_CERT_RENEWAL_TIME,
-    SEC_OID_NS_KEY_USAGE_GOVT_APPROVED,
+    SEC_OID_NS_CERT_EXT_NETSCAPE_OK = 60,
+    SEC_OID_NS_CERT_EXT_ISSUER_LOGO = 61,
+    SEC_OID_NS_CERT_EXT_SUBJECT_LOGO = 62,
+    SEC_OID_NS_CERT_EXT_CERT_TYPE = 63,
+    SEC_OID_NS_CERT_EXT_BASE_URL = 64,
+    SEC_OID_NS_CERT_EXT_REVOCATION_URL = 65,
+    SEC_OID_NS_CERT_EXT_CA_REVOCATION_URL = 66,
+    SEC_OID_NS_CERT_EXT_CA_CRL_URL = 67,
+    SEC_OID_NS_CERT_EXT_CA_CERT_URL = 68,
+    SEC_OID_NS_CERT_EXT_CERT_RENEWAL_URL = 69,
+    SEC_OID_NS_CERT_EXT_CA_POLICY_URL = 70,
+    SEC_OID_NS_CERT_EXT_HOMEPAGE_URL = 71,
+    SEC_OID_NS_CERT_EXT_ENTITY_LOGO = 72,
+    SEC_OID_NS_CERT_EXT_USER_PICTURE = 73,
+    SEC_OID_NS_CERT_EXT_SSL_SERVER_NAME = 74,
+    SEC_OID_NS_CERT_EXT_COMMENT = 75,
+    SEC_OID_NS_CERT_EXT_LOST_PASSWORD_URL = 76,
+    SEC_OID_NS_CERT_EXT_CERT_RENEWAL_TIME = 77,
+    SEC_OID_NS_KEY_USAGE_GOVT_APPROVED = 78,
 
     /* x.509 v3 Extensions */
-    SEC_OID_X509_SUBJECT_DIRECTORY_ATTR,
-    SEC_OID_X509_SUBJECT_KEY_ID,
-    SEC_OID_X509_KEY_USAGE,
-    SEC_OID_X509_PRIVATE_KEY_USAGE_PERIOD,
-    SEC_OID_X509_SUBJECT_ALT_NAME,
-    SEC_OID_X509_ISSUER_ALT_NAME,
-    SEC_OID_X509_BASIC_CONSTRAINTS,
-    SEC_OID_X509_NAME_CONSTRAINTS,
-    SEC_OID_X509_CRL_DIST_POINTS,
-    SEC_OID_X509_CERTIFICATE_POLICIES,
-    SEC_OID_X509_POLICY_MAPPINGS,
-    SEC_OID_X509_POLICY_CONSTRAINTS,
-    SEC_OID_X509_AUTH_KEY_ID,
-    SEC_OID_X509_EXT_KEY_USAGE,
-    SEC_OID_X509_AUTH_INFO_ACCESS,
+    SEC_OID_X509_SUBJECT_DIRECTORY_ATTR = 79,
+    SEC_OID_X509_SUBJECT_KEY_ID = 80,
+    SEC_OID_X509_KEY_USAGE = 81,
+    SEC_OID_X509_PRIVATE_KEY_USAGE_PERIOD = 82,
+    SEC_OID_X509_SUBJECT_ALT_NAME = 83,
+    SEC_OID_X509_ISSUER_ALT_NAME = 84,
+    SEC_OID_X509_BASIC_CONSTRAINTS = 85,
+    SEC_OID_X509_NAME_CONSTRAINTS = 86,
+    SEC_OID_X509_CRL_DIST_POINTS = 87,
+    SEC_OID_X509_CERTIFICATE_POLICIES = 88,
+    SEC_OID_X509_POLICY_MAPPINGS = 89,
+    SEC_OID_X509_POLICY_CONSTRAINTS = 90,
+    SEC_OID_X509_AUTH_KEY_ID = 91,
+    SEC_OID_X509_EXT_KEY_USAGE = 92,
+    SEC_OID_X509_AUTH_INFO_ACCESS = 93,
 
-    SEC_OID_X509_CRL_NUMBER,
-    SEC_OID_X509_REASON_CODE,
-    SEC_OID_X509_INVALID_DATE,
+    SEC_OID_X509_CRL_NUMBER = 94,
+    SEC_OID_X509_REASON_CODE = 95,
+    SEC_OID_X509_INVALID_DATE = 96,
     /* End of x.509 v3 Extensions */    
 
-    SEC_OID_X500_RSA_ENCRYPTION,
+    SEC_OID_X500_RSA_ENCRYPTION = 97,
 
     /* alg 1485 additions */
-    SEC_OID_RFC1274_UID,
-    SEC_OID_RFC1274_MAIL,
+    SEC_OID_RFC1274_UID = 98,
+    SEC_OID_RFC1274_MAIL = 99,
 
     /* PKCS 12 additions */
-    SEC_OID_PKCS12,
-    SEC_OID_PKCS12_MODE_IDS,
-    SEC_OID_PKCS12_ESPVK_IDS,
-    SEC_OID_PKCS12_BAG_IDS,
-    SEC_OID_PKCS12_CERT_BAG_IDS,
-    SEC_OID_PKCS12_OIDS,
-    SEC_OID_PKCS12_PBE_IDS,
-    SEC_OID_PKCS12_SIGNATURE_IDS,
-    SEC_OID_PKCS12_ENVELOPING_IDS,
+    SEC_OID_PKCS12 = 100,
+    SEC_OID_PKCS12_MODE_IDS = 101,
+    SEC_OID_PKCS12_ESPVK_IDS = 102,
+    SEC_OID_PKCS12_BAG_IDS = 103,
+    SEC_OID_PKCS12_CERT_BAG_IDS = 104,
+    SEC_OID_PKCS12_OIDS = 105,
+    SEC_OID_PKCS12_PBE_IDS = 106,
+    SEC_OID_PKCS12_SIGNATURE_IDS = 107,
+    SEC_OID_PKCS12_ENVELOPING_IDS = 108,
    /* SEC_OID_PKCS12_OFFLINE_TRANSPORT_MODE,
     SEC_OID_PKCS12_ONLINE_TRANSPORT_MODE, */
-    SEC_OID_PKCS12_PKCS8_KEY_SHROUDING,
-    SEC_OID_PKCS12_KEY_BAG_ID,
-    SEC_OID_PKCS12_CERT_AND_CRL_BAG_ID,
-    SEC_OID_PKCS12_SECRET_BAG_ID,
-    SEC_OID_PKCS12_X509_CERT_CRL_BAG,
-    SEC_OID_PKCS12_SDSI_CERT_BAG,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC4,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC4,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_TRIPLE_DES_CBC,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC,
-    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_128_BIT_RC4,
-    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_40_BIT_RC4,
-    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_TRIPLE_DES,
-    SEC_OID_PKCS12_RSA_SIGNATURE_WITH_SHA1_DIGEST,
+    SEC_OID_PKCS12_PKCS8_KEY_SHROUDING = 109,
+    SEC_OID_PKCS12_KEY_BAG_ID = 110,
+    SEC_OID_PKCS12_CERT_AND_CRL_BAG_ID = 111,
+    SEC_OID_PKCS12_SECRET_BAG_ID = 112,
+    SEC_OID_PKCS12_X509_CERT_CRL_BAG = 113,
+    SEC_OID_PKCS12_SDSI_CERT_BAG = 114,
+    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC4 = 115,
+    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC4 = 116,
+    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_TRIPLE_DES_CBC = 117,
+    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC = 118,
+    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC = 119,
+    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_128_BIT_RC4 = 120,
+    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_40_BIT_RC4 = 121,
+    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_TRIPLE_DES = 122,
+    SEC_OID_PKCS12_RSA_SIGNATURE_WITH_SHA1_DIGEST = 123,
     /* end of PKCS 12 additions */
 
     /* DSA signatures */
-    SEC_OID_ANSIX9_DSA_SIGNATURE,
-    SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST,
-    SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST,
+    SEC_OID_ANSIX9_DSA_SIGNATURE = 124,
+    SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST = 125,
+    SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST = 126,
 
     /* Verisign OIDs */
-    SEC_OID_VERISIGN_USER_NOTICES,
+    SEC_OID_VERISIGN_USER_NOTICES = 127,
 
     /* PKIX OIDs */
-    SEC_OID_PKIX_CPS_POINTER_QUALIFIER,
-    SEC_OID_PKIX_USER_NOTICE_QUALIFIER,
-    SEC_OID_PKIX_OCSP,
-    SEC_OID_PKIX_OCSP_BASIC_RESPONSE,
-    SEC_OID_PKIX_OCSP_NONCE,
-    SEC_OID_PKIX_OCSP_CRL,
-    SEC_OID_PKIX_OCSP_RESPONSE,
-    SEC_OID_PKIX_OCSP_NO_CHECK,
-    SEC_OID_PKIX_OCSP_ARCHIVE_CUTOFF,
-    SEC_OID_PKIX_OCSP_SERVICE_LOCATOR,
-    SEC_OID_PKIX_REGCTRL_REGTOKEN,
-    SEC_OID_PKIX_REGCTRL_AUTHENTICATOR,
-    SEC_OID_PKIX_REGCTRL_PKIPUBINFO,
-    SEC_OID_PKIX_REGCTRL_PKI_ARCH_OPTIONS,
-    SEC_OID_PKIX_REGCTRL_OLD_CERT_ID,
-    SEC_OID_PKIX_REGCTRL_PROTOCOL_ENC_KEY,
-    SEC_OID_PKIX_REGINFO_UTF8_PAIRS,
-    SEC_OID_PKIX_REGINFO_CERT_REQUEST,
-    SEC_OID_EXT_KEY_USAGE_SERVER_AUTH,
-    SEC_OID_EXT_KEY_USAGE_CLIENT_AUTH,
-    SEC_OID_EXT_KEY_USAGE_CODE_SIGN,
-    SEC_OID_EXT_KEY_USAGE_EMAIL_PROTECT,
-    SEC_OID_EXT_KEY_USAGE_TIME_STAMP,
-    SEC_OID_OCSP_RESPONDER,
+    SEC_OID_PKIX_CPS_POINTER_QUALIFIER = 128,
+    SEC_OID_PKIX_USER_NOTICE_QUALIFIER = 129,
+    SEC_OID_PKIX_OCSP = 130,
+    SEC_OID_PKIX_OCSP_BASIC_RESPONSE = 131,
+    SEC_OID_PKIX_OCSP_NONCE = 132,
+    SEC_OID_PKIX_OCSP_CRL = 133,
+    SEC_OID_PKIX_OCSP_RESPONSE = 134,
+    SEC_OID_PKIX_OCSP_NO_CHECK = 135,
+    SEC_OID_PKIX_OCSP_ARCHIVE_CUTOFF = 136,
+    SEC_OID_PKIX_OCSP_SERVICE_LOCATOR = 137,
+    SEC_OID_PKIX_REGCTRL_REGTOKEN = 138,
+    SEC_OID_PKIX_REGCTRL_AUTHENTICATOR = 139,
+    SEC_OID_PKIX_REGCTRL_PKIPUBINFO = 140,
+    SEC_OID_PKIX_REGCTRL_PKI_ARCH_OPTIONS = 141,
+    SEC_OID_PKIX_REGCTRL_OLD_CERT_ID = 142,
+    SEC_OID_PKIX_REGCTRL_PROTOCOL_ENC_KEY = 143,
+    SEC_OID_PKIX_REGINFO_UTF8_PAIRS = 144,
+    SEC_OID_PKIX_REGINFO_CERT_REQUEST = 145,
+    SEC_OID_EXT_KEY_USAGE_SERVER_AUTH = 146,
+    SEC_OID_EXT_KEY_USAGE_CLIENT_AUTH = 147,
+    SEC_OID_EXT_KEY_USAGE_CODE_SIGN = 148,
+    SEC_OID_EXT_KEY_USAGE_EMAIL_PROTECT = 149,
+    SEC_OID_EXT_KEY_USAGE_TIME_STAMP = 150,
+    SEC_OID_OCSP_RESPONDER = 151,
 
     /* Netscape Algorithm OIDs */
-    SEC_OID_NETSCAPE_SMIME_KEA,
+    SEC_OID_NETSCAPE_SMIME_KEA = 152,
 
     /* Skipjack OID -- ### mwelch temporary */
-    SEC_OID_FORTEZZA_SKIPJACK,
+    SEC_OID_FORTEZZA_SKIPJACK = 153,
 
     /* PKCS 12 V2 oids */
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC4,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC4,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_2KEY_TRIPLE_DES_CBC,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC,
-    SEC_OID_PKCS12_SAFE_CONTENTS_ID,
-    SEC_OID_PKCS12_PKCS8_SHROUDED_KEY_BAG_ID,
+    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC4 = 154,
+    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC4 = 155,
+    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC = 156,
+    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_2KEY_TRIPLE_DES_CBC = 157,
+    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC = 158,
+    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC = 159,
+    SEC_OID_PKCS12_SAFE_CONTENTS_ID = 160,
+    SEC_OID_PKCS12_PKCS8_SHROUDED_KEY_BAG_ID = 161,
 
-    SEC_OID_PKCS12_V1_KEY_BAG_ID,
-    SEC_OID_PKCS12_V1_PKCS8_SHROUDED_KEY_BAG_ID,
-    SEC_OID_PKCS12_V1_CERT_BAG_ID,
-    SEC_OID_PKCS12_V1_CRL_BAG_ID,
-    SEC_OID_PKCS12_V1_SECRET_BAG_ID,
-    SEC_OID_PKCS12_V1_SAFE_CONTENTS_BAG_ID,
-    SEC_OID_PKCS9_X509_CERT,
-    SEC_OID_PKCS9_SDSI_CERT,
-    SEC_OID_PKCS9_X509_CRL,
-    SEC_OID_PKCS9_FRIENDLY_NAME,
-    SEC_OID_PKCS9_LOCAL_KEY_ID,
-    SEC_OID_PKCS12_KEY_USAGE,
+    SEC_OID_PKCS12_V1_KEY_BAG_ID = 162,
+    SEC_OID_PKCS12_V1_PKCS8_SHROUDED_KEY_BAG_ID = 163,
+    SEC_OID_PKCS12_V1_CERT_BAG_ID = 164,
+    SEC_OID_PKCS12_V1_CRL_BAG_ID = 165,
+    SEC_OID_PKCS12_V1_SECRET_BAG_ID = 166,
+    SEC_OID_PKCS12_V1_SAFE_CONTENTS_BAG_ID = 167,
+    SEC_OID_PKCS9_X509_CERT = 168,
+    SEC_OID_PKCS9_SDSI_CERT = 169,
+    SEC_OID_PKCS9_X509_CRL = 170,
+    SEC_OID_PKCS9_FRIENDLY_NAME = 171,
+    SEC_OID_PKCS9_LOCAL_KEY_ID = 172,
+    SEC_OID_PKCS12_KEY_USAGE = 173,
 
     /*Diffe Helman OIDS */
-    SEC_OID_X942_DIFFIE_HELMAN_KEY,
+    SEC_OID_X942_DIFFIE_HELMAN_KEY = 174,
 
     /* Netscape other name types */
-    SEC_OID_NETSCAPE_NICKNAME,
+    SEC_OID_NETSCAPE_NICKNAME = 175,
 
     /* Cert Server OIDS */
-    SEC_OID_NETSCAPE_RECOVERY_REQUEST,
+    SEC_OID_NETSCAPE_RECOVERY_REQUEST = 176,
 
     /* New PSM certificate management OIDs */
-    SEC_OID_CERT_RENEWAL_LOCATOR,
-    SEC_OID_NS_CERT_EXT_SCOPE_OF_USE,
+    SEC_OID_CERT_RENEWAL_LOCATOR = 177,
+    SEC_OID_NS_CERT_EXT_SCOPE_OF_USE = 178,
     
     /* CMS (RFC2630) OIDs */
-    SEC_OID_CMS_EPHEMERAL_STATIC_DIFFIE_HELLMAN,
-    SEC_OID_CMS_3DES_KEY_WRAP,
-    SEC_OID_CMS_RC2_KEY_WRAP,
+    SEC_OID_CMS_EPHEMERAL_STATIC_DIFFIE_HELLMAN = 179,
+    SEC_OID_CMS_3DES_KEY_WRAP = 180,
+    SEC_OID_CMS_RC2_KEY_WRAP = 181,
 
     /* SMIME attributes */
-    SEC_OID_SMIME_ENCRYPTION_KEY_PREFERENCE,
+    SEC_OID_SMIME_ENCRYPTION_KEY_PREFERENCE = 182,
 
     SEC_OID_TOTAL
 } SECOidTag;
@@ -291,9 +291,9 @@ typedef enum {
 #define SEC_OID_SHA SEC_OID_MISS_DSS
 
 typedef enum {
-    INVALID_CERT_EXTENSION,
-    UNSUPPORTED_CERT_EXTENSION,
-    SUPPORTED_CERT_EXTENSION
+    INVALID_CERT_EXTENSION = 0,
+    UNSUPPORTED_CERT_EXTENSION = 1,
+    SUPPORTED_CERT_EXTENSION = 2
 } SECSupportExtenTag;
 
 struct SECOidDataStr {