From c725a10985cd8e4ea72ef00aaf831df5616b088f Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Sat, 1 Oct 2011 00:39:15 +0000 Subject: [PATCH] Bug 632657: SEC_ASN1IsTemplateSimple may incorrectly treat choice templates as simple. Patch by Brian Smith . r=wtc. git-svn-id: svn://10.0.0.236/trunk@262944 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/util/secasn1u.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/security/nss/lib/util/secasn1u.c b/mozilla/security/nss/lib/util/secasn1u.c index eb69b639458..49b0562043b 100644 --- a/mozilla/security/nss/lib/util/secasn1u.c +++ b/mozilla/security/nss/lib/util/secasn1u.c @@ -37,7 +37,7 @@ /* * Utility routines to complement the ASN.1 encoding and decoding functions. * - * $Id: secasn1u.c,v 1.4 2005-04-09 05:06:34 julien.pierre.bugs%sun.com Exp $ + * $Id: secasn1u.c,v 1.5 2011-10-01 00:39:15 wtc%google.com Exp $ */ #include "secasn1.h" @@ -118,7 +118,7 @@ PRBool SEC_ASN1IsTemplateSimple(const SEC_ASN1Template *theTemplate) if (! (theTemplate->kind & (~SEC_ASN1_TAGNUM_MASK))) { return PR_TRUE; /* primitive type */ } - if (!theTemplate->kind & SEC_ASN1_CHOICE) { + if (!(theTemplate->kind & SEC_ASN1_CHOICE)) { return PR_FALSE; /* no choice means not simple */ } while (++theTemplate && theTemplate->kind) {