Fix for 178897 . QuickDER optimizations . r=nelsonb

security/nss/lib/pkcs7/certread.c

@@ -118,7 +118,7 @@ SEC_ReadCertSequence(SECItem *certsItem, CERTImportCertificateFunc f, void *arg)
     }
 
 
-    rv = SEC_ASN1DecodeItem(arena, &rawCerts, SEC_CertSequenceTemplate,
+    rv = SEC_QuickDERDecodeItem(arena, &rawCerts, SEC_CertSequenceTemplate,
 		    contentInfo->content.data);
 
     if (rv != SECSuccess) {

security/nss/lib/pkcs7/secmime.c

@@ -38,7 +38,7 @@
  * Stuff specific to S/MIME policy and interoperability.
  * Depends on PKCS7, but there should be no dependency the other way around.
  *
- * $Id: secmime.c,v 1.3 2004/04/25 15:03:13 gerv%gerv.net Exp $
+ * $Id: secmime.c,v 1.4 2004/06/18 00:38:45 jpierre%netscape.com Exp $
  */
 
 #include "secmime.h"
@@ -459,7 +459,7 @@ smime_choose_cipher (CERTCertificate *scert, CERTCertificate **rcerts)
 	profile = CERT_FindSMimeProfile (rcerts[rcount]);
 	if (profile != NULL && profile->data != NULL && profile->len > 0) {
 	    caps = NULL;
-	    dstat = SEC_ASN1DecodeItem (poolp, &caps,
+	    dstat = SEC_QuickDERDecodeItem (poolp, &caps,
 					smime_capabilities_template,
 					profile);
 	    if (dstat == SECSuccess && caps != NULL) {

security/nss/lib/smime/smimeutil.c

@@ -37,7 +37,7 @@
 /*
  * Stuff specific to S/MIME policy and interoperability.
  *
- * $Id: smimeutil.c,v 1.14 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: smimeutil.c,v 1.15 2004/06/18 00:38:44 jpierre%netscape.com Exp $
  */
 
 #include "secmime.h"
@@ -424,7 +424,7 @@ smime_choose_cipher(CERTCertificate *scert, CERTCertificate **rcerts)
 	    /* we have a profile (still DER-encoded) */
 	    caps = NULL;
 	    /* decode it */
-	    if (SEC_ASN1DecodeItem(poolp, &caps, NSSSMIMECapabilitiesTemplate, profile) == SECSuccess &&
+	    if (SEC_QuickDERDecodeItem(poolp, &caps, NSSSMIMECapabilitiesTemplate, profile) == SECSuccess &&
 		    caps != NULL)
 	    {
 		/* walk the SMIME capabilities for this recipient */
@@ -737,7 +737,7 @@ NSS_SMIMEUtil_GetCertFromEncryptionKeyPreference(CERTCertDBHandle *certdb, SECIt
 	return NULL;
 
     /* decode DERekp */
-    if (SEC_ASN1DecodeItem(tmppoolp, &ekp, smime_encryptionkeypref_template, DERekp) != SECSuccess)
+    if (SEC_QuickDERDecodeItem(tmppoolp, &ekp, smime_encryptionkeypref_template, DERekp) != SECSuccess)
 	goto loser;
 
     /* find cert */