diff options
author | cvs2hg <devnull@localhost> | 2003-06-05 21:52:54 +0000 |
---|---|---|
committer | cvs2hg <devnull@localhost> | 2003-06-05 21:52:54 +0000 |
commit | e4db90799bc45cda8ac3e416cf9e44b2b685eda4 (patch) | |
tree | 525743b19f8058ea2a25b37c3c98659ff694e246 | |
parent | 9732a3655f62930efd25aab0cfeb87f9134c08fd (diff) | |
download | nss-hg-e4db90799bc45cda8ac3e416cf9e44b2b685eda4.tar.gz |
fixup commit for tag 'CFM_LAST_RITES'CFM_LAST_RITES
-rw-r--r-- | security/coreconf/HP-UXB.11.22.mk | 55 | ||||
-rw-r--r-- | security/nss/lib/certdb/genname.c | 533 | ||||
-rw-r--r-- | security/nss/lib/certdb/secname.c | 91 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.c | 495 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.txt | 357 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/nssckbi.h | 2 | ||||
-rw-r--r-- | security/nss/lib/util/secasn1d.c | 11 | ||||
-rw-r--r-- | security/nss/tests/ssl/sslreq.txt | 5 |
8 files changed, 406 insertions, 1143 deletions
diff --git a/security/coreconf/HP-UXB.11.22.mk b/security/coreconf/HP-UXB.11.22.mk deleted file mode 100644 index 7199ce816..000000000 --- a/security/coreconf/HP-UXB.11.22.mk +++ /dev/null @@ -1,55 +0,0 @@ -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 2002 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# -# On HP-UX 10.30 and 11.x, the default implementation strategy is -# pthreads. Classic nspr and pthreads-user are also available. -# - -ifeq ($(OS_RELEASE),B.11.22) -OS_CFLAGS += -DHPUX10 -DEFAULT_IMPL_STRATEGY = _PTH -endif - -# -# To use the true pthread (kernel thread) library on 10.30 and -# 11.x, we should define _POSIX_C_SOURCE to be 199506L. -# The _REENTRANT macro is deprecated. -# - -ifdef USE_PTHREADS - OS_CFLAGS += -D_POSIX_C_SOURCE=199506L -endif - -# -# Config stuff for HP-UXB.11.x. -# -include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk diff --git a/security/nss/lib/certdb/genname.c b/security/nss/lib/certdb/genname.c index a8dcf6dff..94cde971a 100644 --- a/security/nss/lib/certdb/genname.c +++ b/security/nss/lib/certdb/genname.c @@ -433,12 +433,12 @@ cert_DecodeGeneralNames (PRArenaPool *arena, } currentName->l.next = head; currentName->l.prev = tail; - tail = &(currentName->l); - (cert_get_prev_general_name(currentName))->l.next = tail; + tail = head->prev = tail->next = &(currentName->l); encodedGenName++; } - (cert_get_next_general_name(currentName))->l.prev = tail; - return cert_get_next_general_name(currentName); + if (currentName) { + return cert_get_next_general_name(currentName); + } loser: return NULL; } @@ -605,6 +605,7 @@ cert_DecodeNameConstraintSubTree(PRArenaPool *arena, CERTNameConstraint *next = NULL; int i = 0; + PORT_Assert(arena); while (subTree[i] != NULL) { current = cert_DecodeNameConstraint(arena, subTree[i]); if (current == NULL) { @@ -621,14 +622,6 @@ cert_DecodeNameConstraintSubTree(PRArenaPool *arena, first->l.prev = &(current->l); return first; loser: - if (first) { - current = first; - do { - next = cert_get_next_name_constraint(current); - PORT_Free(current); - current = next; - }while (current != first); - } return NULL; } @@ -842,7 +835,7 @@ CERT_AddNameConstraint(CERTNameConstraint *list, SECStatus -CERT_GetNameConstriantByType (CERTNameConstraint *constraints, +CERT_GetNameConstraintByType (CERTNameConstraint *constraints, CERTGeneralNameType type, CERTNameConstraint **returnList, PRArenaPool *arena) @@ -967,41 +960,72 @@ loser: return NULL; } +/* This function does very basic regular expression matching. +** The only wildcard character is "*", which matches any substring. +** constraint is the regular expression. name is to be tested against it. +** return SECSuccess on match, SECFailure otherwise. Does not set error. +*/ static SECStatus -compareNameToConstraint(char *name, char *constraint, PRBool substring) +compareNameToConstraint(const char *name, const char *constraint, int level) { + PRBool substring = PR_FALSE; SECStatus rv; - if (*constraint == '\0' && *name == '\0') { - return SECSuccess; + while (*name == *constraint && *constraint != '\0' && *constraint != '*') { + ++name; + ++constraint; } - if (*constraint == '*') { - return compareNameToConstraint(name, constraint + 1, PR_TRUE); + if (*constraint == '\0' && *name == '\0') + return SECSuccess; + + while (*constraint == '*') { + ++constraint; + substring = PR_TRUE; } - if (substring) { - if (*constraint == '\0') { - return SECSuccess; - } - while (*name != *constraint) { - if (*name == '\0') { - return SECFailure; - } - name++; - } - rv = compareNameToConstraint(name + 1, constraint + 1, PR_FALSE); - if (rv == SECSuccess) { - return rv; - } - name++; - } else { - if (*name == *constraint) { + + if (!substring) + return SECFailure; + + if (*constraint == '\0') + return SECSuccess; + + if (++level > 20) + return SECFailure; /* prevent stack overflow */ + + do { + while (*name != *constraint && *name != '\0') name++; - constraint++; - } else { + if (*name == '\0') return SECFailure; - } - } - return compareNameToConstraint(name, constraint, substring); + + /* recurse */ + rv = compareNameToConstraint(name + 1, constraint + 1, level); + + ++name; + } while (rv != SECSuccess); + return rv; +} + +#define compareN2C(n,c) compareNameToConstraint((n),(c),0) + +/* This isn't right for items containing UCS2 or UCS4. +** Those should be converted to UTF8 rather than merely strncpy'ed. +** But it's not clear that we can tell what the encoding is here. +*/ +static char * +secItem2String(PLArenaPool *arena, SECItem *item) +{ + char * cPtr; + if (arena) + cPtr = PORT_ArenaAlloc(arena, item->len + 1); + else + cPtr = PORT_Alloc(item->len + 1); + if (cPtr) { + if (item->len) + PORT_Strncpy(cPtr, (char *)item->data, item->len); + cPtr[item->len] = '\0'; + } + return cPtr; } SECStatus @@ -1010,234 +1034,247 @@ cert_CompareNameWithConstraints(CERTGeneralName *name, PRBool excluded) { SECStatus rv = SECSuccess; - char *nameString = NULL; - char *constraintString = NULL; + char *nString = NULL; + char *cString = NULL; int start; int end; - int tag; - CERTRDN **nameRDNS, *nameRDN; - CERTRDN **constraintRDNS, *constraintRDN; - CERTAVA **nameAVAS, *nameAVA; - CERTAVA **constraintAVAS, *constraintAVA; + CERTRDN **nRDNs, *nRDN; + CERTAVA **nAVAs, *nAVA; CERTNameConstraint *current; - SECItem *avaValue; - CERTName constraintName; CERTName certName; SECComparison status = SECEqual; - PRArenaPool *certNameArena; - PRArenaPool *constraintNameArena; + PRArenaPool *nArena; + + if (!constraints) + return SECSuccess; + + nArena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); + if (!nArena) + return SECFailure; certName.arena = NULL; - certName.rdns = NULL; - constraintName.arena = NULL; - constraintName.rdns = NULL; - if (constraints != NULL) { - current = constraints; - if (name->type == certDirectoryName) { - certNameArena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); - CERT_CopyName(certNameArena, &certName, &name->name.directoryName); - nameRDNS = certName.rdns; - for (;;) { - nameRDN = *nameRDNS++; - nameAVAS = nameRDN->avas; - for(;;) { - nameAVA = *nameAVAS++; - tag = CERT_GetAVATag(nameAVA); - if ( tag == SEC_OID_PKCS9_EMAIL_ADDRESS || - tag == SEC_OID_RFC1274_MAIL) { - avaValue = CERT_DecodeAVAValue(&nameAVA->value); - nameString = (char*)PORT_ZAlloc(avaValue->len + 1); - nameString = PORT_Strncpy(nameString, (char *) avaValue->data, avaValue->len); - start = 0; - while(nameString[start] != '@' && nameString[start + 1] != '\0') { - start++; - } + certName.rdns = NULL; + + /* Phase 1. If the name is a Directory Name, look through all the + ** AVAs in all the RDNs for any that are email addresses. + ** Subject all email addresses to all RFC822 email address constraints. + */ + if (name->type == certDirectoryName) { + rv = CERT_CopyName(nArena, &certName, &name->name.directoryName); + if (rv != SECSuccess) + goto loser; + nRDNs = certName.rdns; + while (nRDNs && *nRDNs) { /* loop over RDNs */ + nRDN = *nRDNs++; + nAVAs = nRDN->avas; + while (nAVAs && *nAVAs) { /* loop over AVAs */ + int tag; + nAVA = *nAVAs++; + tag = CERT_GetAVATag(nAVA); + if ( tag == SEC_OID_PKCS9_EMAIL_ADDRESS || + tag == SEC_OID_RFC1274_MAIL) { /* email AVA */ + SECItem *avaValue; + avaValue = CERT_DecodeAVAValue(&nAVA->value); + if (!avaValue) + goto loser; + nString = secItem2String(nArena, avaValue); + SECITEM_FreeItem(avaValue, PR_TRUE); + if (!nString) + goto loser; + start = 0; + while (nString[start] != '@' && nString[start] != '\0') { + start++; + } + if (nString[start]) start++; - do{ - if (current->name.type == certRFC822Name) { - constraintString = (char*)PORT_ZAlloc(current->name.name.other.len + 1); - constraintString = PORT_Strncpy(constraintString, - (char *) current->name.name.other.data, - current->name.name.other.len); - rv = compareNameToConstraint(nameString + start, constraintString, - PR_FALSE); - - if (constraintString != NULL) { - PORT_Free(constraintString); - constraintString = NULL; - } - if (nameString != NULL) { - PORT_Free(nameString); - nameString = NULL; - } - if (rv == SECSuccess && excluded == PR_TRUE) { + current = constraints; + do { /* loop over constraints */ + if (current->name.type == certRFC822Name) { + cString = + secItem2String(nArena, ¤t->name.name.other); + if (!cString) + goto loser; + rv = compareN2C(nString + start, cString); + if (rv == SECSuccess) { + if (excluded) goto found; - } - if (rv == SECSuccess && excluded == PR_FALSE) { - break; - } + break; /* out of loop over constraints. */ } - current = cert_get_next_name_constraint(current); - } while (current != constraints); - } - if (rv != SECSuccess && excluded == PR_FALSE) { - goto loser; - } - if (*nameAVAS == NULL) { - break; - } - } - if (*nameRDNS == NULL) { - break; + } /* email address constraint */ + current = cert_get_next_name_constraint(current); + } while (current != constraints); /*loop over constraints*/ + } /* handle one email AVA */ + if (rv != SECSuccess && excluded == PR_FALSE) { + goto no_match; } } - } - current = constraints; - do { - switch (name->type) { - case certDNSName: - nameString = (char*)PORT_ZAlloc(name->name.other.len + 1); - nameString = PORT_Strncpy(nameString, (char *) name->name.other.data, - name->name.other.len); - constraintString = (char*)PORT_ZAlloc(current->name.name.other.len + 1); - constraintString = PORT_Strncpy(constraintString, - (char *) current->name.name.other.data, - current->name.name.other.len); - rv = compareNameToConstraint(nameString, constraintString, PR_FALSE); - if (nameString != NULL) { - PORT_Free(nameString); - } - if (constraintString != NULL) { - PORT_Free(constraintString); - } - break; - case certRFC822Name: - nameString = (char*)PORT_ZAlloc(name->name.other.len + 1); - nameString = PORT_Strncpy(nameString, (char *) name->name.other.data, - name->name.other.len); - start = 0; - while(nameString[start] != '@' && nameString[start + 1] != '\0') { - start++; - } + } /* loop over RDNs */ + } /* name->type == certDirectoryName */ + + /* Phase 2. loop over all constratints for this name. */ + current = constraints; + do { + switch (name->type) { + + case certDNSName: + PORT_Assert(name->type == current->name.type); + nString = secItem2String(nArena, &name->name.other); + if (!nString) + goto loser; + cString = secItem2String(nArena, ¤t->name.name.other); + if (!cString) + goto loser; + rv = compareN2C(nString, cString); + break; + + case certRFC822Name: + PORT_Assert(name->type == current->name.type); + nString = secItem2String(nArena, &name->name.other); + if (!nString) + goto loser; + start = 0; + while (nString[start] != '@' && + nString[start] != '\0') { start++; - constraintString = (char*)PORT_ZAlloc(current->name.name.other.len + 1); - constraintString = PORT_Strncpy(constraintString, - (char *) current->name.name.other.data, - current->name.name.other.len); - rv = compareNameToConstraint(nameString + start, constraintString, PR_FALSE); - if (nameString != NULL) { - PORT_Free(nameString); - } - if (constraintString != NULL) { - PORT_Free(constraintString); - } - break; - case certURI: - nameString = (char*)PORT_ZAlloc(name->name.other.len + 1); - nameString = PORT_Strncpy(nameString, (char *) name->name.other.data, - name->name.other.len); - start = 0; - while(PORT_Strncmp(nameString + start, "://", 3) != 0 && - nameString[start + 3] != '\0') { - start++; - } + } + if (nString[start]) + start++; + cString = secItem2String(nArena, ¤t->name.name.other); + if (!cString) + goto loser; + rv = compareN2C(nString + start, cString); + break; + + case certURI: + PORT_Assert(name->type == current->name.type); + nString = secItem2String(nArena, &name->name.other); + if (!nString) + goto loser; + /* XXX This URI hostname parsing is wrong because it doesn't + ** handle user name and password strings that can come + ** before the host name. + */ + start = 0; + while(nString[start] != 0 && + PORT_Strncmp(nString + start, "://", 3) != 0 ) { + start++; + } + if (nString[start]) start +=3; - end = 0; - while(nameString[start + end] != '/' && - nameString[start + end] != '\0') { - end++; - } - nameString[start + end] = '\0'; - constraintString = (char*)PORT_ZAlloc(current->name.name.other.len + 1); - constraintString = PORT_Strncpy(constraintString, - (char *) current->name.name.other.data, - current->name.name.other.len); - rv = compareNameToConstraint(nameString + start, constraintString, PR_FALSE); - if (nameString != NULL) { - PORT_Free(nameString); - } - if (constraintString != NULL) { - PORT_Free(constraintString); + end = 0; + while(nString[start + end] != '/' && + nString[start + end] != ':' && + nString[start + end] != '\0') { + end++; + } + nString[start + end] = '\0'; + cString = secItem2String(nArena, ¤t->name.name.other); + if (!cString) + goto loser; + rv = compareN2C(nString + start, cString); + break; + + case certDirectoryName: + PORT_Assert(current->name.type == certDirectoryName || \ + current->name.type == certRFC822Name); + if (current->name.type == certRFC822Name) + goto next_constraint; /* already handled in phase 1. */ + if (current->name.type == certDirectoryName) { + PRArenaPool *cArena; + CERTRDN **cRDNs, *cRDN; + CERTAVA **cAVAs, *cAVA; + CERTName constraintName; + + constraintName.arena = NULL; + constraintName.rdns = NULL; + + cArena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); + if (!cArena) + goto loser; + rv = CERT_CopyName(cArena, &constraintName, + ¤t->name.name.directoryName); + if (rv != SECSuccess) { + PORT_FreeArena(cArena, PR_FALSE); + goto loser; } - break; - case certDirectoryName: - if (current->name.type == certDirectoryName) { - constraintNameArena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); - CERT_CopyName(constraintNameArena, &constraintName, ¤t->name.name.directoryName); - constraintRDNS = constraintName.rdns; - for (;;) { - constraintRDN = *constraintRDNS++; - constraintAVAS = constraintRDN->avas; - for(;;) { - constraintAVA = *constraintAVAS++; - certNameArena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); - CERT_CopyName(certNameArena, &certName, &name->name.directoryName); - nameRDNS = certName.rdns; - for (;;) { - nameRDN = *nameRDNS++; - nameAVAS = nameRDN->avas++; - for(;;) { - nameAVA = *nameAVAS++; - status = CERT_CompareAVA(constraintAVA, nameAVA); - if (status == SECEqual || *nameAVAS == NULL) { - break; - } - } - if (status == SECEqual || *nameRDNS == NULL) { + cRDNs = constraintName.rdns; + while (cRDNs && *cRDNs) { /* loop over constraint RDNs */ + cRDN = *cRDNs++; + cAVAs = cRDN->avas; + while (cAVAs && *cAVAs) { /* loop over constraint AVAs */ + cAVA = *cAVAs++; + + /* certName was initialized in Phase 1. */ + PORT_Assert(certName.arena != NULL); + + nRDNs = certName.rdns; + while (nRDNs && *nRDNs) { /* loop over name RDNs */ + nRDN = *nRDNs++; + nAVAs = nRDN->avas; + while (nAVAs && *nAVAs) { /* loop over name AVAs */ + nAVA = *nAVAs++; + status = CERT_CompareAVA(cAVA, nAVA); + if (status == SECEqual) break; - } - } - if (status != SECEqual || *constraintAVAS == NULL) { + } /* loop over name AVAs */ + if (status == SECEqual) break; - } - } - if (status != SECEqual || *constraintRDNS == NULL) { + } /* loop over name RDNs */ + if (status != SECEqual) break; - } - } - if (status == SECEqual) { - if (excluded == PR_FALSE) { - goto found; - } else { - goto loser; - } - } - break; - } else if (current->name.type == certRFC822Name) { - current = cert_get_next_name_constraint(current); - continue; - } - default: - /* other types are not supported */ - if (excluded) { - goto found; - } else { - goto loser; + } /* loop over AVAs in constraint */ + if (status != SECEqual) + break; + } /* loop over RDNs in constraint */ + PORT_FreeArena(cArena, PR_FALSE); + if (status == SECEqual) { + if (!excluded) + goto found; + goto no_match; } + break; } - if (rv == SECSuccess && status == SECEqual) { - goto found; - } - current = cert_get_next_name_constraint(current); - } while (current !=constraints); - } else { - goto found; - } -loser: - if (certName.arena) { - CERT_DestroyName(&certName); - } - if (constraintName.arena) { - CERT_DestroyName(&constraintName); - } + goto loser; +#ifdef NOTYET + case certOtherName: /* type 1 */ + case certX400Address: /* type 4 */ + case certEDIPartyName: /* type 6 */ + case certIPAddress: /* type 8 */ + case certRegisterID: /* type 9 */ + PORT_Assert(name->type == current->name.type); + if (name->type == current->name.type && + name->name.other.len == current->name.name.other.len && + !memcmp(name->name.other.data, current->name.name.other.data, + name->name.other.len)) + rv = SECSuccess; + else + rv = SECFailure; + break; +#endif + default: + /* non-standard types are not supported */ + goto loser; + } + if (rv == SECSuccess && status == SECEqual) { + goto found; + } +next_constraint: + current = cert_get_next_name_constraint(current); + } while (current !=constraints); + +no_match: + if (nArena) + PORT_FreeArena(nArena, PR_FALSE); return SECFailure; + +loser: + if (nArena) + PORT_FreeArena(nArena, PR_FALSE); + return excluded ? SECSuccess : SECFailure; + found: - if (certName.arena) { - CERT_DestroyName(&certName); - } - if (constraintName.arena) { - CERT_DestroyName(&constraintName); - } + if (nArena) + PORT_FreeArena(nArena, PR_FALSE); return SECSuccess; } @@ -1268,7 +1305,7 @@ CERT_CompareNameSpace(CERTCertificate *cert, } do { if (constraints->excluded != NULL) { - rv = CERT_GetNameConstriantByType(constraints->excluded, currentName->type, + rv = CERT_GetNameConstraintByType(constraints->excluded, currentName->type, &matchingConstraints, arena); if (rv != SECSuccess) { goto loser; @@ -1282,7 +1319,7 @@ CERT_CompareNameSpace(CERTCertificate *cert, } } if (constraints->permited != NULL) { - rv = CERT_GetNameConstriantByType(constraints->permited, currentName->type, + rv = CERT_GetNameConstraintByType(constraints->permited, currentName->type, &matchingConstraints, arena); if (rv != SECSuccess) { goto loser; diff --git a/security/nss/lib/certdb/secname.c b/security/nss/lib/certdb/secname.c index a508dcb44..63f279bce 100644 --- a/security/nss/lib/certdb/secname.c +++ b/security/nss/lib/certdb/secname.c @@ -67,8 +67,8 @@ CountArray(void **array) return count; } -static void -**AddToArray(PRArenaPool *arena, void **array, void *element) +static void ** +AddToArray(PRArenaPool *arena, void **array, void *element) { unsigned count; void **ap; @@ -96,35 +96,6 @@ static void return array; } -#if 0 -static void -**RemoveFromArray(void **array, void *element) -{ - unsigned count; - void **ap; - int slot; - - /* Look for element */ - ap = array; - if (ap) { - count = 1; /* count the null at the end */ - slot = -1; - for (; *ap; ap++, count++) { - if (*ap == element) { - /* Found it */ - slot = ap - array; - } - } - if (slot >= 0) { - /* Found it. Squish array down */ - PORT_Memmove((void*) (array + slot), (void*) (array + slot + 1), - (count - slot - 1) * sizeof(void*)); - /* Don't bother reallocing the memory */ - } - } - return array; -} -#endif /* 0 */ SECOidTag CERT_GetAVATag(CERTAVA *ava) @@ -217,6 +188,7 @@ SetupAVAValue(PRArenaPool *arena, int valueType, char *value, SECItem *it, case SEC_ASN1_PRINTABLE_STRING: case SEC_ASN1_IA5_STRING: case SEC_ASN1_T61_STRING: + case SEC_ASN1_UTF8_STRING: /* no conversion required */ valueLen = PORT_Strlen(value); break; case SEC_ASN1_UNIVERSAL_STRING: @@ -357,17 +329,27 @@ SECStatus CERT_CopyRDN(PRArenaPool *arena, CERTRDN *to, CERTRDN *from) { CERTAVA **avas, *fava, *tava; - SECStatus rv; + SECStatus rv = SECSuccess; /* Copy each ava from from */ avas = from->avas; - while ((fava = *avas++) != 0) { - tava = CERT_CopyAVA(arena, fava); - if (!tava) return SECFailure; - rv = CERT_AddAVA(arena, to, tava); - if (rv) return rv; + if (avas) { + if (avas[0] == NULL) { + rv = CERT_AddAVA(arena, to, NULL); + return rv; + } + while ((fava = *avas++) != 0) { + tava = CERT_CopyAVA(arena, fava); + if (!tava) { + rv = SECFailure; + break; + } + rv = CERT_AddAVA(arena, to, tava); + if (rv != SECSuccess) + break; + } } - return SECSuccess; + return rv; } /************************************************************************/ @@ -460,27 +442,38 @@ SECStatus CERT_CopyName(PRArenaPool *arena, CERTName *to, CERTName *from) { CERTRDN **rdns, *frdn, *trdn; - SECStatus rv; + SECStatus rv = SECSuccess; - if (!to || !from) + if (!to || !from) { + PORT_SetError(SEC_ERROR_INVALID_ARGS); return SECFailure; + } CERT_DestroyName(to); to->arena = arena; /* Copy each rdn from from */ rdns = from->rdns; - while ((frdn = *rdns++) != 0) { - trdn = CERT_CreateRDN(arena, 0); - if ( trdn == NULL ) { - return(SECFailure); + if (rdns) { + if (rdns[0] == NULL) { + rv = CERT_AddRDN(to, NULL); + return rv; + } + while ((frdn = *rdns++) != NULL) { + trdn = CERT_CreateRDN(arena, 0); + if (!trdn) { + rv = SECFailure; + break; + } + rv = CERT_CopyRDN(arena, trdn, frdn); + if (rv != SECSuccess) + break; + rv = CERT_AddRDN(to, trdn); + if (rv != SECSuccess) + break; } - rv = CERT_CopyRDN(arena, trdn, frdn); - if (rv) return rv; - rv = CERT_AddRDN(to, trdn); - if (rv) return rv; } - return SECSuccess; + return rv; } /************************************************************************/ diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c index 90b8de68c..7e86bab81 100644 --- a/security/nss/lib/ckfw/builtins/certdata.c +++ b/security/nss/lib/ckfw/builtins/certdata.c @@ -39,15 +39,15 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $R #include "builtins.h" #endif /* BUILTINS_H */ -static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST; +static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE; +static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509; +static const CK_BBOOL ck_false = CK_FALSE; static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID; -static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST; static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR; -static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509; static const CK_OBJECT_CLASS cko_data = CKO_DATA; -static const CK_BBOOL ck_false = CK_FALSE; static const CK_BBOOL ck_true = CK_TRUE; -static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE; +static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST; +static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST; #ifdef DEBUG static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = { CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_APPLICATION, CKA_VALUE @@ -440,24 +440,6 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_128 [] = { static const CK_ATTRIBUTE_TYPE nss_builtins_types_129 [] = { CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING }; -static const CK_ATTRIBUTE_TYPE nss_builtins_types_130 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -}; -static const CK_ATTRIBUTE_TYPE nss_builtins_types_131 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING -}; -static const CK_ATTRIBUTE_TYPE nss_builtins_types_132 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -}; -static const CK_ATTRIBUTE_TYPE nss_builtins_types_133 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING -}; -static const CK_ATTRIBUTE_TYPE nss_builtins_types_134 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -}; -static const CK_ATTRIBUTE_TYPE nss_builtins_types_135 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING -}; #ifdef DEBUG static const NSSItem nss_builtins_items_0 [] = { { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, @@ -466,7 +448,7 @@ static const NSSItem nss_builtins_items_0 [] = { { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)"CVS ID", (PRUint32)7 }, { (void *)"NSS", (PRUint32)4 }, - { (void *)"@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$", (PRUint32)179 } + { (void *)"@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$", (PRUint32)184 } }; #endif /* DEBUG */ static const NSSItem nss_builtins_items_1 [] = { @@ -4244,239 +4226,6 @@ static const NSSItem nss_builtins_items_66 [] = { { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"ValiCert OCSP Responder", (PRUint32)24 }, - { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, - { (void *)"\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141" -"\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157" -"\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125" -"\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156" -"\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141" -"\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040" -"\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120" -"\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072" -"\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156" -"\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001" -"\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162" -"\164\056\143\157\155" -, (PRUint32)181 }, - { (void *)"0", (PRUint32)2 }, - { (void *)"\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141" -"\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157" -"\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125" -"\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156" -"\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141" -"\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040" -"\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120" -"\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072" -"\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156" -"\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001" -"\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162" -"\164\056\143\157\155" -, (PRUint32)181 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, - { (void *)"\060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001" -"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" -"\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141\154" -"\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157\156" -"\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125\004" -"\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156\143" -"\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141\163" -"\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040\101" -"\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120\061" -"\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072\057" -"\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156\145" -"\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001\011" -"\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162\164" -"\056\143\157\155\060\036\027\015\060\060\060\062\061\062\061\061" -"\065\060\060\065\132\027\015\060\065\060\062\061\060\061\061\065" -"\060\060\065\132\060\201\262\061\044\060\042\006\003\125\004\007" -"\023\033\126\141\154\151\103\145\162\164\040\126\141\154\151\144" -"\141\164\151\157\156\040\116\145\164\167\157\162\153\061\027\060" -"\025\006\003\125\004\012\023\016\126\141\154\151\103\145\162\164" -"\054\040\111\156\143\056\061\054\060\052\006\003\125\004\013\023" -"\043\103\154\141\163\163\040\061\040\126\141\154\151\144\141\164" -"\151\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040" -"\117\103\123\120\061\041\060\037\006\003\125\004\003\023\030\150" -"\164\164\160\072\057\057\167\167\167\056\166\141\154\151\143\145" -"\162\164\056\156\145\164\057\061\040\060\036\006\011\052\206\110" -"\206\367\015\001\011\001\026\021\151\156\146\157\100\166\141\154" -"\151\143\145\162\164\056\143\157\155\060\201\237\060\015\006\011" -"\052\206\110\206\367\015\001\001\001\005\000\003\201\215\000\060" -"\201\211\002\201\201\000\307\214\057\247\303\100\207\073\075\327" -"\304\232\130\024\144\012\303\010\071\142\032\317\322\353\251\361" -"\151\164\212\312\016\132\166\314\242\122\116\320\363\304\172\265" -"\370\246\034\273\243\247\244\123\207\133\215\300\000\273\325\146" -"\044\347\164\306\026\310\257\310\003\142\325\062\207\242\122\221" -"\104\224\225\250\107\103\155\245\110\234\366\114\165\325\117\142" -"\347\311\377\173\364\044\214\247\274\050\166\265\062\240\045\163" -"\267\107\057\170\370\106\371\207\024\360\167\374\012\167\350\117" -"\375\214\037\372\142\331\002\003\001\000\001\243\154\060\152\060" -"\017\006\011\053\006\001\005\005\007\060\001\005\004\002\005\000" -"\060\023\006\003\125\035\045\004\014\060\012\006\010\053\006\001" -"\005\005\007\003\011\060\013\006\003\125\035\017\004\004\003\002" -"\001\206\060\065\006\010\053\006\001\005\005\007\001\001\004\051" -"\060\047\060\045\006\010\053\006\001\005\005\007\060\001\206\031" -"\150\164\164\160\072\057\057\157\143\163\160\062\056\166\141\154" -"\151\143\145\162\164\056\156\145\164\060\015\006\011\052\206\110" -"\206\367\015\001\001\005\005\000\003\201\201\000\025\305\340\270" -"\064\162\022\006\040\250\142\225\223\321\274\223\272\220\253\334" -"\116\215\216\215\230\114\343\062\365\053\077\263\227\373\252\242" -"\255\100\227\255\150\275\134\255\123\016\320\246\263\015\254\032" -"\231\215\252\060\036\317\016\160\377\002\260\167\145\203\315\332" -"\007\134\122\315\131\273\242\310\342\264\026\203\217\324\225\171" -"\223\055\350\277\104\223\061\222\060\323\064\064\361\020\373\041" -"\254\056\364\303\135\144\143\172\231\341\232\253\102\035\110\146" -"\246\167\067\270\125\074\255\376\145\260\142\351" -, (PRUint32)844 } -}; -static const NSSItem nss_builtins_items_67 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"ValiCert OCSP Responder", (PRUint32)24 }, - { (void *)"\133\166\261\274\342\212\360\366\161\221\205\147\046\215\021\151" -"\017\027\077\163" -, (PRUint32)20 }, - { (void *)"\325\036\040\137\321\365\035\202\127\010\122\071\035\372\212\255" -, (PRUint32)16 }, - { (void *)"\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141" -"\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157" -"\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125" -"\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156" -"\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141" -"\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040" -"\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120" -"\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072" -"\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156" -"\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001" -"\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162" -"\164\056\143\157\155" -, (PRUint32)181 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } -}; -static const NSSItem nss_builtins_items_68 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"Baltimore CyberTrust Code Signing Root", (PRUint32)39 }, - { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, - { (void *)"\060\147\061\013\060\011\006\003\125\004\006\023\002\111\105\061" -"\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155" -"\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171" -"\142\145\162\124\162\165\163\164\061\057\060\055\006\003\125\004" -"\003\023\046\102\141\154\164\151\155\157\162\145\040\103\171\142" -"\145\162\124\162\165\163\164\040\103\157\144\145\040\123\151\147" -"\156\151\156\147\040\122\157\157\164" -, (PRUint32)105 }, - { (void *)"0", (PRUint32)2 }, - { (void *)"\060\147\061\013\060\011\006\003\125\004\006\023\002\111\105\061" -"\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155" -"\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171" -"\142\145\162\124\162\165\163\164\061\057\060\055\006\003\125\004" -"\003\023\046\102\141\154\164\151\155\157\162\145\040\103\171\142" -"\145\162\124\162\165\163\164\040\103\157\144\145\040\123\151\147" -"\156\151\156\147\040\122\157\157\164" -, (PRUint32)105 }, - { (void *)"\002\004\002\000\000\277" -, (PRUint32)6 }, - { (void *)"\060\202\003\246\060\202\002\216\240\003\002\001\002\002\004\002" -"\000\000\277\060\015\006\011\052\206\110\206\367\015\001\001\005" -"\005\000\060\147\061\013\060\011\006\003\125\004\006\023\002\111" -"\105\061\022\060\020\006\003\125\004\012\023\011\102\141\154\164" -"\151\155\157\162\145\061\023\060\021\006\003\125\004\013\023\012" -"\103\171\142\145\162\124\162\165\163\164\061\057\060\055\006\003" -"\125\004\003\023\046\102\141\154\164\151\155\157\162\145\040\103" -"\171\142\145\162\124\162\165\163\164\040\103\157\144\145\040\123" -"\151\147\156\151\156\147\040\122\157\157\164\060\036\027\015\060" -"\060\060\065\061\067\061\064\060\061\060\060\132\027\015\062\065" -"\060\065\061\067\062\063\065\071\060\060\132\060\147\061\013\060" -"\011\006\003\125\004\006\023\002\111\105\061\022\060\020\006\003" -"\125\004\012\023\011\102\141\154\164\151\155\157\162\145\061\023" -"\060\021\006\003\125\004\013\023\012\103\171\142\145\162\124\162" -"\165\163\164\061\057\060\055\006\003\125\004\003\023\046\102\141" -"\154\164\151\155\157\162\145\040\103\171\142\145\162\124\162\165" -"\163\164\040\103\157\144\145\040\123\151\147\156\151\156\147\040" -"\122\157\157\164\060\202\001\042\060\015\006\011\052\206\110\206" -"\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012" -"\002\202\001\001\000\310\161\232\030\022\216\172\333\371\232\374" -"\101\257\330\362\364\011\216\255\077\376\147\067\074\332\311\046" -"\120\261\261\076\313\350\116\163\000\362\262\334\363\305\106\373" -"\011\357\030\226\316\247\340\234\204\135\040\016\172\240\252\066" -"\213\372\050\266\170\056\263\354\350\107\363\004\360\220\043\264" -"\352\257\345\123\270\005\367\107\135\053\206\361\247\244\306\073" -"\065\266\322\015\122\101\327\364\222\165\341\242\012\120\126\207" -"\276\227\013\173\063\205\020\271\050\030\356\063\352\110\021\327" -"\133\221\107\166\042\324\356\317\135\347\250\116\034\235\226\221" -"\335\234\275\164\011\250\162\141\252\260\041\072\361\075\054\003" -"\126\011\322\301\334\303\265\307\124\067\253\346\046\242\262\106" -"\161\163\312\021\210\356\274\347\144\367\320\021\032\163\100\132" -"\310\111\054\017\267\357\220\177\150\200\004\070\013\033\017\073" -"\324\365\240\263\302\216\341\064\264\200\231\155\236\166\324\222" -"\051\100\261\225\322\067\244\147\022\177\340\142\273\256\065\305" -"\231\066\202\104\270\346\170\030\063\141\161\223\133\055\215\237" -"\170\225\202\353\155\002\003\001\000\001\243\132\060\130\060\023" -"\006\003\125\035\045\004\014\060\012\006\010\053\006\001\005\005" -"\007\003\003\060\035\006\003\125\035\016\004\026\004\024\310\101" -"\064\134\025\025\004\345\100\362\321\253\232\157\044\222\172\207" -"\102\132\060\022\006\003\125\035\023\001\001\377\004\010\060\006" -"\001\001\377\002\001\003\060\016\006\003\125\035\017\001\001\377" -"\004\004\003\002\001\006\060\015\006\011\052\206\110\206\367\015" -"\001\001\005\005\000\003\202\001\001\000\122\164\252\225\113\042" -"\214\307\075\226\244\376\135\372\057\265\274\353\360\013\351\126" -"\070\035\321\155\015\241\274\150\213\360\305\200\245\044\064\375" -"\362\226\030\021\206\241\066\365\067\347\124\100\325\144\037\303" -"\137\160\102\153\055\071\307\236\122\005\316\347\152\162\322\215" -"\162\077\107\120\203\253\307\215\045\311\260\343\247\123\026\225" -"\246\152\123\352\030\235\217\170\251\167\167\032\371\264\227\107" -"\131\210\047\050\265\312\341\056\327\076\016\242\015\270\042\104" -"\003\343\321\143\260\101\072\241\365\244\055\367\166\036\004\124" -"\231\170\062\100\327\053\174\115\272\246\234\260\171\156\007\276" -"\214\354\356\327\070\151\133\301\014\126\150\237\376\353\321\341" -"\310\210\371\362\315\177\276\205\264\104\147\000\120\076\364\046" -"\003\144\352\167\175\350\136\076\034\067\107\310\326\352\244\363" -"\066\074\227\302\071\162\005\224\031\045\303\327\067\101\017\301" -"\037\207\212\375\252\276\351\261\144\127\344\333\222\241\317\341" -"\111\350\073\037\221\023\132\303\217\331\045\130\111\200\107\017" -"\306\003\256\254\343\277\267\300\252\052" -, (PRUint32)938 } -}; -static const NSSItem nss_builtins_items_69 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"Baltimore CyberTrust Code Signing Root", (PRUint32)39 }, - { (void *)"\060\106\330\310\210\377\151\060\303\112\374\315\111\047\010\174" -"\140\126\173\015" -, (PRUint32)20 }, - { (void *)"\220\365\050\111\126\321\135\054\260\123\324\113\357\157\220\042" -, (PRUint32)16 }, - { (void *)"\060\147\061\013\060\011\006\003\125\004\006\023\002\111\105\061" -"\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155" -"\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171" -"\142\145\162\124\162\165\163\164\061\057\060\055\006\003\125\004" -"\003\023\046\102\141\154\164\151\155\157\162\145\040\103\171\142" -"\145\162\124\162\165\163\164\040\103\157\144\145\040\123\151\147" -"\156\151\156\147\040\122\157\157\164" -, (PRUint32)105 }, - { (void *)"\002\004\002\000\000\277" -, (PRUint32)6 }, - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } -}; -static const NSSItem nss_builtins_items_70 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)"Baltimore CyberTrust Root", (PRUint32)26 }, { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\111\105\061" @@ -4554,7 +4303,7 @@ static const NSSItem nss_builtins_items_70 [] = { "\347\201\035\031\303\044\102\352\143\071\251" , (PRUint32)891 } }; -static const NSSItem nss_builtins_items_71 [] = { +static const NSSItem nss_builtins_items_67 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4578,101 +4327,7 @@ static const NSSItem nss_builtins_items_71 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_72 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"Baltimore CyberTrust Mobile Commerce Root", (PRUint32)42 }, - { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, - { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\111\105\061" -"\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155" -"\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171" -"\142\145\162\124\162\165\163\164\061\051\060\047\006\003\125\004" -"\003\023\040\102\141\154\164\151\155\157\162\145\040\103\171\142" -"\145\162\124\162\165\163\164\040\115\157\142\151\154\145\040\122" -"\157\157\164" -, (PRUint32)99 }, - { (void *)"0", (PRUint32)2 }, - { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\111\105\061" -"\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155" -"\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171" -"\142\145\162\124\162\165\163\164\061\051\060\047\006\003\125\004" -"\003\023\040\102\141\154\164\151\155\157\162\145\040\103\171\142" -"\145\162\124\162\165\163\164\040\115\157\142\151\154\145\040\122" -"\157\157\164" -, (PRUint32)99 }, - { (void *)"\002\004\002\000\000\270" -, (PRUint32)6 }, - { (void *)"\060\202\002\175\060\202\001\346\240\003\002\001\002\002\004\002" -"\000\000\270\060\015\006\011\052\206\110\206\367\015\001\001\005" -"\005\000\060\141\061\013\060\011\006\003\125\004\006\023\002\111" -"\105\061\022\060\020\006\003\125\004\012\023\011\102\141\154\164" -"\151\155\157\162\145\061\023\060\021\006\003\125\004\013\023\012" -"\103\171\142\145\162\124\162\165\163\164\061\051\060\047\006\003" -"\125\004\003\023\040\102\141\154\164\151\155\157\162\145\040\103" -"\171\142\145\162\124\162\165\163\164\040\115\157\142\151\154\145" -"\040\122\157\157\164\060\036\027\015\060\060\060\065\061\062\061" -"\070\062\060\060\060\132\027\015\062\060\060\065\061\062\062\063" -"\065\071\060\060\132\060\141\061\013\060\011\006\003\125\004\006" -"\023\002\111\105\061\022\060\020\006\003\125\004\012\023\011\102" -"\141\154\164\151\155\157\162\145\061\023\060\021\006\003\125\004" -"\013\023\012\103\171\142\145\162\124\162\165\163\164\061\051\060" -"\047\006\003\125\004\003\023\040\102\141\154\164\151\155\157\162" -"\145\040\103\171\142\145\162\124\162\165\163\164\040\115\157\142" -"\151\154\145\040\122\157\157\164\060\201\237\060\015\006\011\052" -"\206\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201" -"\211\002\201\201\000\243\155\261\070\126\254\374\265\126\041\336" -"\300\220\135\046\107\202\306\175\217\037\240\205\217\057\273\324" -"\341\034\035\362\044\037\050\260\057\271\244\245\157\242\042\040" -"\144\376\204\107\074\176\053\154\151\152\270\324\300\226\216\214" -"\122\015\315\157\101\324\277\004\256\247\201\057\055\230\110\322" -"\301\224\243\265\031\135\135\121\144\364\216\101\260\233\300\055" -"\042\240\136\306\330\132\022\143\274\021\112\136\046\022\035\342" -"\046\005\346\017\137\042\037\172\137\166\224\256\317\132\050\016" -"\253\105\332\042\061\002\003\001\000\001\243\102\060\100\060\035" -"\006\003\125\035\016\004\026\004\024\311\342\217\300\002\046\132" -"\266\300\007\343\177\224\007\030\333\056\245\232\160\060\017\006" -"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016" -"\006\003\125\035\017\001\001\377\004\004\003\002\001\206\060\015" -"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201" -"\000\123\010\013\046\011\170\102\163\324\354\172\167\107\015\343" -"\013\063\161\357\256\063\024\115\373\372\375\032\267\121\365\344" -"\231\034\006\161\327\051\031\327\346\025\040\121\121\106\155\117" -"\336\030\111\230\320\370\170\273\161\350\215\001\006\325\327\144" -"\217\224\337\107\376\240\205\151\066\251\057\102\172\150\112\022" -"\326\213\013\160\104\012\244\004\357\046\210\301\065\161\070\135" -"\033\133\110\102\360\347\224\034\160\225\064\250\253\365\253\342" -"\170\255\365\360\122\375\233\352\102\014\350\330\124\276\123\146" -"\365" -, (PRUint32)641 } -}; -static const NSSItem nss_builtins_items_73 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"Baltimore CyberTrust Mobile Commerce Root", (PRUint32)42 }, - { (void *)"\264\343\013\234\301\325\356\275\240\040\030\370\271\212\321\377" -"\151\267\072\161" -, (PRUint32)20 }, - { (void *)"\353\264\040\035\017\266\161\003\367\304\367\307\244\162\206\350" -, (PRUint32)16 }, - { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\111\105\061" -"\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155" -"\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171" -"\142\145\162\124\162\165\163\164\061\051\060\047\006\003\125\004" -"\003\023\040\102\141\154\164\151\155\157\162\145\040\103\171\142" -"\145\162\124\162\165\163\164\040\115\157\142\151\154\145\040\122" -"\157\157\164" -, (PRUint32)99 }, - { (void *)"\002\004\002\000\000\270" -, (PRUint32)6 }, - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) } -}; -static const NSSItem nss_builtins_items_74 [] = { +static const NSSItem nss_builtins_items_68 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4740,7 +4395,7 @@ static const NSSItem nss_builtins_items_74 [] = { "\126\224\251\125" , (PRUint32)660 } }; -static const NSSItem nss_builtins_items_75 [] = { +static const NSSItem nss_builtins_items_69 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4764,7 +4419,7 @@ static const NSSItem nss_builtins_items_75 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_76 [] = { +static const NSSItem nss_builtins_items_70 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4831,7 +4486,7 @@ static const NSSItem nss_builtins_items_76 [] = { "\132\052\202\262\067\171" , (PRUint32)646 } }; -static const NSSItem nss_builtins_items_77 [] = { +static const NSSItem nss_builtins_items_71 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4855,7 +4510,7 @@ static const NSSItem nss_builtins_items_77 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_78 [] = { +static const NSSItem nss_builtins_items_72 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4930,7 +4585,7 @@ static const NSSItem nss_builtins_items_78 [] = { "\221\060\352\315" , (PRUint32)804 } }; -static const NSSItem nss_builtins_items_79 [] = { +static const NSSItem nss_builtins_items_73 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4953,7 +4608,7 @@ static const NSSItem nss_builtins_items_79 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_80 [] = { +static const NSSItem nss_builtins_items_74 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5038,7 +4693,7 @@ static const NSSItem nss_builtins_items_80 [] = { "\265\314\255\006" , (PRUint32)900 } }; -static const NSSItem nss_builtins_items_81 [] = { +static const NSSItem nss_builtins_items_75 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5063,7 +4718,7 @@ static const NSSItem nss_builtins_items_81 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_82 [] = { +static const NSSItem nss_builtins_items_76 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5172,7 +4827,7 @@ static const NSSItem nss_builtins_items_82 [] = { "\043\020\077\041\020\131\267\344\100\335\046\014\043\366\252\256" , (PRUint32)1328 } }; -static const NSSItem nss_builtins_items_83 [] = { +static const NSSItem nss_builtins_items_77 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5196,7 +4851,7 @@ static const NSSItem nss_builtins_items_83 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_84 [] = { +static const NSSItem nss_builtins_items_78 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5290,7 +4945,7 @@ static const NSSItem nss_builtins_items_84 [] = { "\065\341\035\026\034\320\274\053\216\326\161\331" , (PRUint32)1052 } }; -static const NSSItem nss_builtins_items_85 [] = { +static const NSSItem nss_builtins_items_79 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5315,7 +4970,7 @@ static const NSSItem nss_builtins_items_85 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_86 [] = { +static const NSSItem nss_builtins_items_80 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5413,7 +5068,7 @@ static const NSSItem nss_builtins_items_86 [] = { "\027\132\173\320\274\307\217\116\206\004" , (PRUint32)1082 } }; -static const NSSItem nss_builtins_items_87 [] = { +static const NSSItem nss_builtins_items_81 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5439,7 +5094,7 @@ static const NSSItem nss_builtins_items_87 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_88 [] = { +static const NSSItem nss_builtins_items_82 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5533,7 +5188,7 @@ static const NSSItem nss_builtins_items_88 [] = { "\116\072\063\014\053\263\055\220\006" , (PRUint32)1049 } }; -static const NSSItem nss_builtins_items_89 [] = { +static const NSSItem nss_builtins_items_83 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5559,7 +5214,7 @@ static const NSSItem nss_builtins_items_89 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_90 [] = { +static const NSSItem nss_builtins_items_84 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5654,7 +5309,7 @@ static const NSSItem nss_builtins_items_90 [] = { "\306\241" , (PRUint32)1058 } }; -static const NSSItem nss_builtins_items_91 [] = { +static const NSSItem nss_builtins_items_85 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5679,7 +5334,7 @@ static const NSSItem nss_builtins_items_91 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_92 [] = { +static const NSSItem nss_builtins_items_86 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5771,7 +5426,7 @@ static const NSSItem nss_builtins_items_92 [] = { "\051\303" , (PRUint32)930 } }; -static const NSSItem nss_builtins_items_93 [] = { +static const NSSItem nss_builtins_items_87 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5797,7 +5452,7 @@ static const NSSItem nss_builtins_items_93 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_94 [] = { +static const NSSItem nss_builtins_items_88 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5889,7 +5544,7 @@ static const NSSItem nss_builtins_items_94 [] = { "\064\215" , (PRUint32)930 } }; -static const NSSItem nss_builtins_items_95 [] = { +static const NSSItem nss_builtins_items_89 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5915,7 +5570,7 @@ static const NSSItem nss_builtins_items_95 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_96 [] = { +static const NSSItem nss_builtins_items_90 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6007,7 +5662,7 @@ static const NSSItem nss_builtins_items_96 [] = { "\116\101\325\226\343\116" , (PRUint32)934 } }; -static const NSSItem nss_builtins_items_97 [] = { +static const NSSItem nss_builtins_items_91 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6033,7 +5688,7 @@ static const NSSItem nss_builtins_items_97 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_98 [] = { +static const NSSItem nss_builtins_items_92 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6125,7 +5780,7 @@ static const NSSItem nss_builtins_items_98 [] = { "\316\324\357" , (PRUint32)931 } }; -static const NSSItem nss_builtins_items_99 [] = { +static const NSSItem nss_builtins_items_93 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6151,7 +5806,7 @@ static const NSSItem nss_builtins_items_99 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_100 [] = { +static const NSSItem nss_builtins_items_94 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6252,7 +5907,7 @@ static const NSSItem nss_builtins_items_100 [] = { "\024" , (PRUint32)977 } }; -static const NSSItem nss_builtins_items_101 [] = { +static const NSSItem nss_builtins_items_95 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6284,7 +5939,7 @@ static const NSSItem nss_builtins_items_101 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_102 [] = { +static const NSSItem nss_builtins_items_96 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6359,7 +6014,7 @@ static const NSSItem nss_builtins_items_102 [] = { "\011\254\211\111\323" , (PRUint32)677 } }; -static const NSSItem nss_builtins_items_103 [] = { +static const NSSItem nss_builtins_items_97 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6386,7 +6041,7 @@ static const NSSItem nss_builtins_items_103 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_104 [] = { +static const NSSItem nss_builtins_items_98 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6498,7 +6153,7 @@ static const NSSItem nss_builtins_items_104 [] = { "\005\377\154\211\063\360\354\025\017" , (PRUint32)1177 } }; -static const NSSItem nss_builtins_items_105 [] = { +static const NSSItem nss_builtins_items_99 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6528,7 +6183,7 @@ static const NSSItem nss_builtins_items_105 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_106 [] = { +static const NSSItem nss_builtins_items_100 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6639,7 +6294,7 @@ static const NSSItem nss_builtins_items_106 [] = { "\316\145\146\227\256\046\136" , (PRUint32)1159 } }; -static const NSSItem nss_builtins_items_107 [] = { +static const NSSItem nss_builtins_items_101 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6669,7 +6324,7 @@ static const NSSItem nss_builtins_items_107 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_108 [] = { +static const NSSItem nss_builtins_items_102 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6764,7 +6419,7 @@ static const NSSItem nss_builtins_items_108 [] = { "\071\050\150\016\163\335\045\232\336\022" , (PRUint32)1002 } }; -static const NSSItem nss_builtins_items_109 [] = { +static const NSSItem nss_builtins_items_103 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6791,7 +6446,7 @@ static const NSSItem nss_builtins_items_109 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_110 [] = { +static const NSSItem nss_builtins_items_104 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6918,7 +6573,7 @@ static const NSSItem nss_builtins_items_110 [] = { "\204\327\372\334\162\133\367\301\072\150" , (PRUint32)1514 } }; -static const NSSItem nss_builtins_items_111 [] = { +static const NSSItem nss_builtins_items_105 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6945,7 +6600,7 @@ static const NSSItem nss_builtins_items_111 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_112 [] = { +static const NSSItem nss_builtins_items_106 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7060,7 +6715,7 @@ static const NSSItem nss_builtins_items_112 [] = { "\061\210\027\120\237\311\304\016\213\330\250\002\143\015" , (PRUint32)1390 } }; -static const NSSItem nss_builtins_items_113 [] = { +static const NSSItem nss_builtins_items_107 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7085,7 +6740,7 @@ static const NSSItem nss_builtins_items_113 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_114 [] = { +static const NSSItem nss_builtins_items_108 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7215,7 +6870,7 @@ static const NSSItem nss_builtins_items_114 [] = { "\254\142\127\251\367" , (PRUint32)1621 } }; -static const NSSItem nss_builtins_items_115 [] = { +static const NSSItem nss_builtins_items_109 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7240,7 +6895,7 @@ static const NSSItem nss_builtins_items_115 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_116 [] = { +static const NSSItem nss_builtins_items_110 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7356,7 +7011,7 @@ static const NSSItem nss_builtins_items_116 [] = { "\230\150\373\001\103\326\033\342\011\261\227\034" , (PRUint32)1388 } }; -static const NSSItem nss_builtins_items_117 [] = { +static const NSSItem nss_builtins_items_111 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7382,7 +7037,7 @@ static const NSSItem nss_builtins_items_117 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_118 [] = { +static const NSSItem nss_builtins_items_112 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7460,7 +7115,7 @@ static const NSSItem nss_builtins_items_118 [] = { "\354\040\005\141\336" , (PRUint32)869 } }; -static const NSSItem nss_builtins_items_119 [] = { +static const NSSItem nss_builtins_items_113 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7483,7 +7138,7 @@ static const NSSItem nss_builtins_items_119 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_120 [] = { +static const NSSItem nss_builtins_items_114 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7544,7 +7199,7 @@ static const NSSItem nss_builtins_items_120 [] = { "\215\210\043\361\025\101\015\245\106\076\221\077\213\353\367\161" , (PRUint32)608 } }; -static const NSSItem nss_builtins_items_121 [] = { +static const NSSItem nss_builtins_items_115 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7567,7 +7222,7 @@ static const NSSItem nss_builtins_items_121 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_122 [] = { +static const NSSItem nss_builtins_items_116 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7645,7 +7300,7 @@ static const NSSItem nss_builtins_items_122 [] = { "\302\005\146\200\241\313\346\063" , (PRUint32)856 } }; -static const NSSItem nss_builtins_items_123 [] = { +static const NSSItem nss_builtins_items_117 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7668,7 +7323,7 @@ static const NSSItem nss_builtins_items_123 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_124 [] = { +static const NSSItem nss_builtins_items_118 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7776,7 +7431,7 @@ static const NSSItem nss_builtins_items_124 [] = { "\152\372\246\070\254\037\304\204" , (PRUint32)1128 } }; -static const NSSItem nss_builtins_items_125 [] = { +static const NSSItem nss_builtins_items_119 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7806,7 +7461,7 @@ static const NSSItem nss_builtins_items_125 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_126 [] = { +static const NSSItem nss_builtins_items_120 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7893,7 +7548,7 @@ static const NSSItem nss_builtins_items_126 [] = { "\200\072\231\355\165\314\106\173" , (PRUint32)936 } }; -static const NSSItem nss_builtins_items_127 [] = { +static const NSSItem nss_builtins_items_121 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7918,7 +7573,7 @@ static const NSSItem nss_builtins_items_127 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_128 [] = { +static const NSSItem nss_builtins_items_122 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8037,7 +7692,7 @@ static const NSSItem nss_builtins_items_128 [] = { "\105\217\046\221\242\216\376\251" , (PRUint32)1448 } }; -static const NSSItem nss_builtins_items_129 [] = { +static const NSSItem nss_builtins_items_123 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8062,7 +7717,7 @@ static const NSSItem nss_builtins_items_129 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_130 [] = { +static const NSSItem nss_builtins_items_124 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8150,7 +7805,7 @@ static const NSSItem nss_builtins_items_130 [] = { "\222\340\134\366\007\017" , (PRUint32)934 } }; -static const NSSItem nss_builtins_items_131 [] = { +static const NSSItem nss_builtins_items_125 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8176,7 +7831,7 @@ static const NSSItem nss_builtins_items_131 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_132 [] = { +static const NSSItem nss_builtins_items_126 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8268,7 +7923,7 @@ static const NSSItem nss_builtins_items_132 [] = { "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144" , (PRUint32)864 } }; -static const NSSItem nss_builtins_items_133 [] = { +static const NSSItem nss_builtins_items_127 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8298,7 +7953,7 @@ static const NSSItem nss_builtins_items_133 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_134 [] = { +static const NSSItem nss_builtins_items_128 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8390,7 +8045,7 @@ static const NSSItem nss_builtins_items_134 [] = { "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064" , (PRUint32)864 } }; -static const NSSItem nss_builtins_items_135 [] = { +static const NSSItem nss_builtins_items_129 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8554,17 +8209,11 @@ nss_builtins_data[] = { { 11, nss_builtins_types_126, nss_builtins_items_126, {NULL} }, { 12, nss_builtins_types_127, nss_builtins_items_127, {NULL} }, { 11, nss_builtins_types_128, nss_builtins_items_128, {NULL} }, - { 12, nss_builtins_types_129, nss_builtins_items_129, {NULL} }, - { 11, nss_builtins_types_130, nss_builtins_items_130, {NULL} }, - { 12, nss_builtins_types_131, nss_builtins_items_131, {NULL} }, - { 11, nss_builtins_types_132, nss_builtins_items_132, {NULL} }, - { 12, nss_builtins_types_133, nss_builtins_items_133, {NULL} }, - { 11, nss_builtins_types_134, nss_builtins_items_134, {NULL} }, - { 12, nss_builtins_types_135, nss_builtins_items_135, {NULL} } + { 12, nss_builtins_types_129, nss_builtins_items_129, {NULL} } }; PR_IMPLEMENT_DATA(const PRUint32) #ifdef DEBUG - nss_builtins_nObjects = 135+1; + nss_builtins_nObjects = 129+1; #else - nss_builtins_nObjects = 135; + nss_builtins_nObjects = 129; #endif /* DEBUG */ diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt index 3e28a3c6d..f4f9566b4 100644 --- a/security/nss/lib/ckfw/builtins/certdata.txt +++ b/security/nss/lib/ckfw/builtins/certdata.txt @@ -4181,259 +4181,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR # -# Certificate "ValiCert OCSP Responder" -# -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ValiCert OCSP Responder" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141 -\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157 -\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125 -\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156 -\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141 -\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040 -\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120 -\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072 -\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156 -\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001 -\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162 -\164\056\143\157\155 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141 -\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157 -\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125 -\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156 -\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141 -\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040 -\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120 -\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072 -\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156 -\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001 -\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162 -\164\056\143\157\155 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001 -\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 -\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141\154 -\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157\156 -\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125\004 -\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156\143 -\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141\163 -\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120\061 -\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072\057 -\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156\145 -\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001\011 -\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162\164 -\056\143\157\155\060\036\027\015\060\060\060\062\061\062\061\061 -\065\060\060\065\132\027\015\060\065\060\062\061\060\061\061\065 -\060\060\065\132\060\201\262\061\044\060\042\006\003\125\004\007 -\023\033\126\141\154\151\103\145\162\164\040\126\141\154\151\144 -\141\164\151\157\156\040\116\145\164\167\157\162\153\061\027\060 -\025\006\003\125\004\012\023\016\126\141\154\151\103\145\162\164 -\054\040\111\156\143\056\061\054\060\052\006\003\125\004\013\023 -\043\103\154\141\163\163\040\061\040\126\141\154\151\144\141\164 -\151\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040 -\117\103\123\120\061\041\060\037\006\003\125\004\003\023\030\150 -\164\164\160\072\057\057\167\167\167\056\166\141\154\151\143\145 -\162\164\056\156\145\164\057\061\040\060\036\006\011\052\206\110 -\206\367\015\001\011\001\026\021\151\156\146\157\100\166\141\154 -\151\143\145\162\164\056\143\157\155\060\201\237\060\015\006\011 -\052\206\110\206\367\015\001\001\001\005\000\003\201\215\000\060 -\201\211\002\201\201\000\307\214\057\247\303\100\207\073\075\327 -\304\232\130\024\144\012\303\010\071\142\032\317\322\353\251\361 -\151\164\212\312\016\132\166\314\242\122\116\320\363\304\172\265 -\370\246\034\273\243\247\244\123\207\133\215\300\000\273\325\146 -\044\347\164\306\026\310\257\310\003\142\325\062\207\242\122\221 -\104\224\225\250\107\103\155\245\110\234\366\114\165\325\117\142 -\347\311\377\173\364\044\214\247\274\050\166\265\062\240\045\163 -\267\107\057\170\370\106\371\207\024\360\167\374\012\167\350\117 -\375\214\037\372\142\331\002\003\001\000\001\243\154\060\152\060 -\017\006\011\053\006\001\005\005\007\060\001\005\004\002\005\000 -\060\023\006\003\125\035\045\004\014\060\012\006\010\053\006\001 -\005\005\007\003\011\060\013\006\003\125\035\017\004\004\003\002 -\001\206\060\065\006\010\053\006\001\005\005\007\001\001\004\051 -\060\047\060\045\006\010\053\006\001\005\005\007\060\001\206\031 -\150\164\164\160\072\057\057\157\143\163\160\062\056\166\141\154 -\151\143\145\162\164\056\156\145\164\060\015\006\011\052\206\110 -\206\367\015\001\001\005\005\000\003\201\201\000\025\305\340\270 -\064\162\022\006\040\250\142\225\223\321\274\223\272\220\253\334 -\116\215\216\215\230\114\343\062\365\053\077\263\227\373\252\242 -\255\100\227\255\150\275\134\255\123\016\320\246\263\015\254\032 -\231\215\252\060\036\317\016\160\377\002\260\167\145\203\315\332 -\007\134\122\315\131\273\242\310\342\264\026\203\217\324\225\171 -\223\055\350\277\104\223\061\222\060\323\064\064\361\020\373\041 -\254\056\364\303\135\144\143\172\231\341\232\253\102\035\110\146 -\246\167\067\270\125\074\255\376\145\260\142\351 -END - -# Trust for Certificate "ValiCert OCSP Responder" -CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ValiCert OCSP Responder" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\133\166\261\274\342\212\360\366\161\221\205\147\046\215\021\151 -\017\027\077\163 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\325\036\040\137\321\365\035\202\127\010\122\071\035\372\212\255 -END -CKA_ISSUER MULTILINE_OCTAL -\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141 -\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157 -\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125 -\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156 -\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141 -\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040 -\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120 -\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072 -\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156 -\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001 -\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162 -\164\056\143\157\155 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - -# -# Certificate "Baltimore CyberTrust Code Signing Root" -# -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Baltimore CyberTrust Code Signing Root" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\147\061\013\060\011\006\003\125\004\006\023\002\111\105\061 -\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155 -\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171 -\142\145\162\124\162\165\163\164\061\057\060\055\006\003\125\004 -\003\023\046\102\141\154\164\151\155\157\162\145\040\103\171\142 -\145\162\124\162\165\163\164\040\103\157\144\145\040\123\151\147 -\156\151\156\147\040\122\157\157\164 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\147\061\013\060\011\006\003\125\004\006\023\002\111\105\061 -\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155 -\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171 -\142\145\162\124\162\165\163\164\061\057\060\055\006\003\125\004 -\003\023\046\102\141\154\164\151\155\157\162\145\040\103\171\142 -\145\162\124\162\165\163\164\040\103\157\144\145\040\123\151\147 -\156\151\156\147\040\122\157\157\164 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\004\002\000\000\277 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\246\060\202\002\216\240\003\002\001\002\002\004\002 -\000\000\277\060\015\006\011\052\206\110\206\367\015\001\001\005 -\005\000\060\147\061\013\060\011\006\003\125\004\006\023\002\111 -\105\061\022\060\020\006\003\125\004\012\023\011\102\141\154\164 -\151\155\157\162\145\061\023\060\021\006\003\125\004\013\023\012 -\103\171\142\145\162\124\162\165\163\164\061\057\060\055\006\003 -\125\004\003\023\046\102\141\154\164\151\155\157\162\145\040\103 -\171\142\145\162\124\162\165\163\164\040\103\157\144\145\040\123 -\151\147\156\151\156\147\040\122\157\157\164\060\036\027\015\060 -\060\060\065\061\067\061\064\060\061\060\060\132\027\015\062\065 -\060\065\061\067\062\063\065\071\060\060\132\060\147\061\013\060 -\011\006\003\125\004\006\023\002\111\105\061\022\060\020\006\003 -\125\004\012\023\011\102\141\154\164\151\155\157\162\145\061\023 -\060\021\006\003\125\004\013\023\012\103\171\142\145\162\124\162 -\165\163\164\061\057\060\055\006\003\125\004\003\023\046\102\141 -\154\164\151\155\157\162\145\040\103\171\142\145\162\124\162\165 -\163\164\040\103\157\144\145\040\123\151\147\156\151\156\147\040 -\122\157\157\164\060\202\001\042\060\015\006\011\052\206\110\206 -\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012 -\002\202\001\001\000\310\161\232\030\022\216\172\333\371\232\374 -\101\257\330\362\364\011\216\255\077\376\147\067\074\332\311\046 -\120\261\261\076\313\350\116\163\000\362\262\334\363\305\106\373 -\011\357\030\226\316\247\340\234\204\135\040\016\172\240\252\066 -\213\372\050\266\170\056\263\354\350\107\363\004\360\220\043\264 -\352\257\345\123\270\005\367\107\135\053\206\361\247\244\306\073 -\065\266\322\015\122\101\327\364\222\165\341\242\012\120\126\207 -\276\227\013\173\063\205\020\271\050\030\356\063\352\110\021\327 -\133\221\107\166\042\324\356\317\135\347\250\116\034\235\226\221 -\335\234\275\164\011\250\162\141\252\260\041\072\361\075\054\003 -\126\011\322\301\334\303\265\307\124\067\253\346\046\242\262\106 -\161\163\312\021\210\356\274\347\144\367\320\021\032\163\100\132 -\310\111\054\017\267\357\220\177\150\200\004\070\013\033\017\073 -\324\365\240\263\302\216\341\064\264\200\231\155\236\166\324\222 -\051\100\261\225\322\067\244\147\022\177\340\142\273\256\065\305 -\231\066\202\104\270\346\170\030\063\141\161\223\133\055\215\237 -\170\225\202\353\155\002\003\001\000\001\243\132\060\130\060\023 -\006\003\125\035\045\004\014\060\012\006\010\053\006\001\005\005 -\007\003\003\060\035\006\003\125\035\016\004\026\004\024\310\101 -\064\134\025\025\004\345\100\362\321\253\232\157\044\222\172\207 -\102\132\060\022\006\003\125\035\023\001\001\377\004\010\060\006 -\001\001\377\002\001\003\060\016\006\003\125\035\017\001\001\377 -\004\004\003\002\001\006\060\015\006\011\052\206\110\206\367\015 -\001\001\005\005\000\003\202\001\001\000\122\164\252\225\113\042 -\214\307\075\226\244\376\135\372\057\265\274\353\360\013\351\126 -\070\035\321\155\015\241\274\150\213\360\305\200\245\044\064\375 -\362\226\030\021\206\241\066\365\067\347\124\100\325\144\037\303 -\137\160\102\153\055\071\307\236\122\005\316\347\152\162\322\215 -\162\077\107\120\203\253\307\215\045\311\260\343\247\123\026\225 -\246\152\123\352\030\235\217\170\251\167\167\032\371\264\227\107 -\131\210\047\050\265\312\341\056\327\076\016\242\015\270\042\104 -\003\343\321\143\260\101\072\241\365\244\055\367\166\036\004\124 -\231\170\062\100\327\053\174\115\272\246\234\260\171\156\007\276 -\214\354\356\327\070\151\133\301\014\126\150\237\376\353\321\341 -\310\210\371\362\315\177\276\205\264\104\147\000\120\076\364\046 -\003\144\352\167\175\350\136\076\034\067\107\310\326\352\244\363 -\066\074\227\302\071\162\005\224\031\045\303\327\067\101\017\301 -\037\207\212\375\252\276\351\261\144\127\344\333\222\241\317\341 -\111\350\073\037\221\023\132\303\217\331\045\130\111\200\107\017 -\306\003\256\254\343\277\267\300\252\052 -END - -# Trust for Certificate "Baltimore CyberTrust Code Signing Root" -CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Baltimore CyberTrust Code Signing Root" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\060\106\330\310\210\377\151\060\303\112\374\315\111\047\010\174 -\140\126\173\015 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\220\365\050\111\126\321\135\054\260\123\324\113\357\157\220\042 -END -CKA_ISSUER MULTILINE_OCTAL -\060\147\061\013\060\011\006\003\125\004\006\023\002\111\105\061 -\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155 -\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171 -\142\145\162\124\162\165\163\164\061\057\060\055\006\003\125\004 -\003\023\046\102\141\154\164\151\155\157\162\145\040\103\171\142 -\145\162\124\162\165\163\164\040\103\157\144\145\040\123\151\147 -\156\151\156\147\040\122\157\157\164 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\004\002\000\000\277 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - -# # Certificate "Baltimore CyberTrust Root" # CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE @@ -4550,110 +4297,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID # -# Certificate "Baltimore CyberTrust Mobile Commerce Root" -# -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Baltimore CyberTrust Mobile Commerce Root" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\141\061\013\060\011\006\003\125\004\006\023\002\111\105\061 -\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155 -\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171 -\142\145\162\124\162\165\163\164\061\051\060\047\006\003\125\004 -\003\023\040\102\141\154\164\151\155\157\162\145\040\103\171\142 -\145\162\124\162\165\163\164\040\115\157\142\151\154\145\040\122 -\157\157\164 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\141\061\013\060\011\006\003\125\004\006\023\002\111\105\061 -\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155 -\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171 -\142\145\162\124\162\165\163\164\061\051\060\047\006\003\125\004 -\003\023\040\102\141\154\164\151\155\157\162\145\040\103\171\142 -\145\162\124\162\165\163\164\040\115\157\142\151\154\145\040\122 -\157\157\164 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\004\002\000\000\270 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\002\175\060\202\001\346\240\003\002\001\002\002\004\002 -\000\000\270\060\015\006\011\052\206\110\206\367\015\001\001\005 -\005\000\060\141\061\013\060\011\006\003\125\004\006\023\002\111 -\105\061\022\060\020\006\003\125\004\012\023\011\102\141\154\164 -\151\155\157\162\145\061\023\060\021\006\003\125\004\013\023\012 -\103\171\142\145\162\124\162\165\163\164\061\051\060\047\006\003 -\125\004\003\023\040\102\141\154\164\151\155\157\162\145\040\103 -\171\142\145\162\124\162\165\163\164\040\115\157\142\151\154\145 -\040\122\157\157\164\060\036\027\015\060\060\060\065\061\062\061 -\070\062\060\060\060\132\027\015\062\060\060\065\061\062\062\063 -\065\071\060\060\132\060\141\061\013\060\011\006\003\125\004\006 -\023\002\111\105\061\022\060\020\006\003\125\004\012\023\011\102 -\141\154\164\151\155\157\162\145\061\023\060\021\006\003\125\004 -\013\023\012\103\171\142\145\162\124\162\165\163\164\061\051\060 -\047\006\003\125\004\003\023\040\102\141\154\164\151\155\157\162 -\145\040\103\171\142\145\162\124\162\165\163\164\040\115\157\142 -\151\154\145\040\122\157\157\164\060\201\237\060\015\006\011\052 -\206\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201 -\211\002\201\201\000\243\155\261\070\126\254\374\265\126\041\336 -\300\220\135\046\107\202\306\175\217\037\240\205\217\057\273\324 -\341\034\035\362\044\037\050\260\057\271\244\245\157\242\042\040 -\144\376\204\107\074\176\053\154\151\152\270\324\300\226\216\214 -\122\015\315\157\101\324\277\004\256\247\201\057\055\230\110\322 -\301\224\243\265\031\135\135\121\144\364\216\101\260\233\300\055 -\042\240\136\306\330\132\022\143\274\021\112\136\046\022\035\342 -\046\005\346\017\137\042\037\172\137\166\224\256\317\132\050\016 -\253\105\332\042\061\002\003\001\000\001\243\102\060\100\060\035 -\006\003\125\035\016\004\026\004\024\311\342\217\300\002\046\132 -\266\300\007\343\177\224\007\030\333\056\245\232\160\060\017\006 -\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016 -\006\003\125\035\017\001\001\377\004\004\003\002\001\206\060\015 -\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201 -\000\123\010\013\046\011\170\102\163\324\354\172\167\107\015\343 -\013\063\161\357\256\063\024\115\373\372\375\032\267\121\365\344 -\231\034\006\161\327\051\031\327\346\025\040\121\121\106\155\117 -\336\030\111\230\320\370\170\273\161\350\215\001\006\325\327\144 -\217\224\337\107\376\240\205\151\066\251\057\102\172\150\112\022 -\326\213\013\160\104\012\244\004\357\046\210\301\065\161\070\135 -\033\133\110\102\360\347\224\034\160\225\064\250\253\365\253\342 -\170\255\365\360\122\375\233\352\102\014\350\330\124\276\123\146 -\365 -END - -# Trust for Certificate "Baltimore CyberTrust Mobile Commerce Root" -CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Baltimore CyberTrust Mobile Commerce Root" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\264\343\013\234\301\325\356\275\240\040\030\370\271\212\321\377 -\151\267\072\161 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\353\264\040\035\017\266\161\003\367\304\367\307\244\162\206\350 -END -CKA_ISSUER MULTILINE_OCTAL -\060\141\061\013\060\011\006\003\125\004\006\023\002\111\105\061 -\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155 -\157\162\145\061\023\060\021\006\003\125\004\013\023\012\103\171 -\142\145\162\124\162\165\163\164\061\051\060\047\006\003\125\004 -\003\023\040\102\141\154\164\151\155\157\162\145\040\103\171\142 -\145\162\124\162\165\163\164\040\115\157\142\151\154\145\040\122 -\157\157\164 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\004\002\000\000\270 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID - -# # Certificate "Equifax Secure Global eBusiness CA" # CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h index 81c3f47a3..ef4f48c42 100644 --- a/security/nss/lib/ckfw/builtins/nssckbi.h +++ b/security/nss/lib/ckfw/builtins/nssckbi.h @@ -50,7 +50,7 @@ /* These are the correct verion numbers that details the changes * to the list of trusted certificates. */ #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 -#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 20 +#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 31 /* These verion numbers that details the semantic changes to the ckfw engine. */ #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 diff --git a/security/nss/lib/util/secasn1d.c b/security/nss/lib/util/secasn1d.c index 4f3a8be1b..a03d2f4ef 100644 --- a/security/nss/lib/util/secasn1d.c +++ b/security/nss/lib/util/secasn1d.c @@ -934,10 +934,9 @@ sec_asn1d_prepare_for_contents (sec_asn1d_state *state) } else { /* * A group of zero; we are done. - * XXX Should we store a NULL here? Or set state to - * afterGroup and let that code do it? + * Set state to afterGroup and let that code plant the NULL. */ - state->place = afterEndOfContents; + state->place = afterGroup; } return; } @@ -1936,7 +1935,8 @@ sec_asn1d_concat_group (sec_asn1d_state *state) PORT_Assert (state->place == afterGroup); placep = (const void***)state->dest; - if (state->subitems_head != NULL) { + PORT_Assert(state->subitems_head == NULL || placep != NULL); + if (placep != NULL) { struct subitem *item; const void **group; int count; @@ -1956,7 +1956,6 @@ sec_asn1d_concat_group (sec_asn1d_state *state) return; } - PORT_Assert (placep != NULL); *placep = group; item = state->subitems_head; @@ -1972,8 +1971,6 @@ sec_asn1d_concat_group (sec_asn1d_state *state) * a memory leak (it is just temporarily left dangling). */ state->subitems_head = state->subitems_tail = NULL; - } else if (placep != NULL) { - *placep = NULL; } state->place = afterEndOfContents; diff --git a/security/nss/tests/ssl/sslreq.txt b/security/nss/tests/ssl/sslreq.txt index 16a750fbf..2f7ad7736 100644 --- a/security/nss/tests/ssl/sslreq.txt +++ b/security/nss/tests/ssl/sslreq.txt @@ -1,3 +1,2 @@ -GET / HTTP/1.0 - - +GET / HTTP/1.0
+
|