From d596531040615aa8f43871cc1056be6e77d151e8 Mon Sep 17 00:00:00 2001 From: "nelsonb%netscape.com" Date: Wed, 26 Nov 2003 06:16:01 +0000 Subject: [PATCH] Remove an unnecessary and incorrect assert call. Bugscape bug 54018. r=jpierre --- security/nss/lib/certdb/genname.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/security/nss/lib/certdb/genname.c b/security/nss/lib/certdb/genname.c index 05feaaaa9351..93c437778018 100644 --- a/security/nss/lib/certdb/genname.c +++ b/security/nss/lib/certdb/genname.c @@ -120,7 +120,7 @@ static const SEC_ASN1Template CERT_DNSNameTemplate[] = { }; static const SEC_ASN1Template CERT_X400AddressTemplate[] = { - { SEC_ASN1_ANY | SEC_ASN1_CONTEXT_SPECIFIC | 3, + { SEC_ASN1_CONTEXT_SPECIFIC | 3, offsetof(CERTGeneralName, name.other), SEC_AnyTemplate, sizeof (CERTGeneralName)} }; @@ -133,7 +133,7 @@ static const SEC_ASN1Template CERT_DirectoryNameTemplate[] = { static const SEC_ASN1Template CERT_EDIPartyNameTemplate[] = { - { SEC_ASN1_ANY | SEC_ASN1_CONTEXT_SPECIFIC | 5, + { SEC_ASN1_CONTEXT_SPECIFIC | 5, offsetof(CERTGeneralName, name.other), SEC_AnyTemplate, sizeof (CERTGeneralName)} }; @@ -438,7 +438,7 @@ CERT_DecodeGeneralName(PRArenaPool *arena, case certX400Address: template = CERT_X400AddressTemplate; break; case certDirectoryName: template = CERT_DirectoryNameTemplate; break; default: - PORT_Assert(0); goto loser; + goto loser; } rv = SEC_ASN1DecodeItem(arena, genName, template, encodedName); if (rv != SECSuccess)