From 4a497ce6d8a4d1d8ad65b9cab16cd4db028bafc7 Mon Sep 17 00:00:00 2001 From: "nelsonb%netscape.com" Date: Fri, 16 Jan 2004 02:11:44 +0000 Subject: [PATCH] Fix NSS parsing of Issuer Unique ID and Subject Unique ID fields in certificate. Bug 216116. r=jpierre git-svn-id: svn://10.0.0.236/trunk@151404 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/certdb/certdb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/security/nss/lib/certdb/certdb.c b/mozilla/security/nss/lib/certdb/certdb.c index ea1de191c4f..96ccb9f6441 100644 --- a/mozilla/security/nss/lib/certdb/certdb.c +++ b/mozilla/security/nss/lib/certdb/certdb.c @@ -34,7 +34,7 @@ /* * Certificate handling code * - * $Id: certdb.c,v 1.59 2004-01-07 23:07:22 jpierre%netscape.com Exp $ + * $Id: certdb.c,v 1.60 2004-01-16 02:11:44 nelsonb%netscape.com Exp $ */ #include "nssilock.h" @@ -118,12 +118,12 @@ const SEC_ASN1Template CERT_CertificateTemplate[] = { { SEC_ASN1_INLINE, offsetof(CERTCertificate,subjectPublicKeyInfo), CERT_SubjectPublicKeyInfoTemplate }, - { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 1, + { SEC_ASN1_OPTIONAL | SEC_ASN1_CONTEXT_SPECIFIC | 1, offsetof(CERTCertificate,issuerID), - SEC_ObjectIDTemplate }, - { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 2, + SEC_BitStringTemplate }, + { SEC_ASN1_OPTIONAL | SEC_ASN1_CONTEXT_SPECIFIC | 2, offsetof(CERTCertificate,subjectID), - SEC_ObjectIDTemplate }, + SEC_BitStringTemplate }, { SEC_ASN1_EXPLICIT | SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 3, offsetof(CERTCertificate,extensions),