From cd1c6e78dee48e3ebbc8da6cdadc9e9254398f56 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <wtc%netscape.com>
Date: Mon, 23 Sep 2002 21:31:47 +0000
Subject: [PATCH] Bug 169790: renamed CERT_DecodeDERCrlEx to
 CERT_DecodeDERCrlWithFlags. Modified files: certdb/cert.h certdb/crl.c
 nss/nss.def pk11wrap/pk11cert.c

---
 security/nss/lib/certdb/cert.h       |  9 +++++----
 security/nss/lib/certdb/crl.c        | 10 +++++-----
 security/nss/lib/nss/nss.def         |  2 +-
 security/nss/lib/pk11wrap/pk11cert.c |  3 ++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h
index 86b9f2d98d3..d7a64b6bf08 100644
--- a/security/nss/lib/certdb/cert.h
+++ b/security/nss/lib/certdb/cert.h
@@ -34,7 +34,7 @@
 /*
  * cert.h - public data structures and prototypes for the certificate library
  *
- * $Id: cert.h,v 1.21 2002-08-30 22:56:51 jpierre%netscape.com Exp $
+ * $Id: cert.h,v 1.22 2002-09-23 21:31:35 wtc%netscape.com Exp $
  */
 
 #ifndef _CERT_H_
@@ -394,8 +394,8 @@ CERT_DecodeDERCrl (PRArenaPool *arena, SECItem *derSignedCrl,int type);
  */
 
 extern CERTSignedCrl *
-CERT_DecodeDERCrlEx(PRArenaPool *narena, SECItem *derSignedCrl, int type,
-                          PRInt32 options);
+CERT_DecodeDERCrlWithFlags(PRArenaPool *narena, SECItem *derSignedCrl,
+                          int type, PRInt32 options);
 
 /* CRL options to pass */
 
@@ -404,7 +404,8 @@ CERT_DecodeDERCrlEx(PRArenaPool *narena, SECItem *derSignedCrl, int type,
 /* when CRL_DECODE_DONT_COPY_DER is set, the DER is not copied . The
    application must then keep derSignedCrl until it destroys the
    CRL . Ideally, it should allocate derSignedCrl in an arena
-   and pass that arena in as the first argument to CERT_DecodeDERCrlEx */
+   and pass that arena in as the first argument to
+   CERT_DecodeDERCrlWithFlags */
 
 #define CRL_DECODE_DONT_COPY_DER            0x00000001
 #define CRL_DECODE_SKIP_ENTRIES             0x00000002
diff --git a/security/nss/lib/certdb/crl.c b/security/nss/lib/certdb/crl.c
index c468eed8aaa..37bf83036ac 100644
--- a/security/nss/lib/certdb/crl.c
+++ b/security/nss/lib/certdb/crl.c
@@ -34,7 +34,7 @@
 /*
  * Moved from secpkcs7.c
  *
- * $Id: crl.c,v 1.25 2002-09-18 00:34:32 jpierre%netscape.com Exp $
+ * $Id: crl.c,v 1.26 2002-09-23 21:31:38 wtc%netscape.com Exp $
  */
  
 #include "cert.h"
@@ -432,8 +432,8 @@ SECStatus CERT_CompleteCRLDecodeEntries(CERTSignedCrl* crl)
  * allow reusing the input DER without making a copy
  */
 CERTSignedCrl *
-CERT_DecodeDERCrlEx(PRArenaPool *narena, SECItem *derSignedCrl, int type,
-                          PRInt32 options)
+CERT_DecodeDERCrlWithFlags(PRArenaPool *narena, SECItem *derSignedCrl,
+                          int type, PRInt32 options)
 {
     PRArenaPool *arena;
     CERTSignedCrl *crl;
@@ -541,7 +541,7 @@ loser:
 CERTSignedCrl *
 CERT_DecodeDERCrl(PRArenaPool *narena, SECItem *derSignedCrl, int type)
 {
-    return CERT_DecodeDERCrlEx(narena, derSignedCrl, type, CRL_DECODE_DEFAULT_OPTIONS);
+    return CERT_DecodeDERCrlWithFlags(narena, derSignedCrl, type, CRL_DECODE_DEFAULT_OPTIONS);
 }
 
 /*
@@ -586,7 +586,7 @@ SEC_FindCrlByKeyOnSlot(PK11SlotInfo *slot, SECItem *crlKey, int type,
     }
     PORT_Assert(crlHandle != CK_INVALID_HANDLE);
     
-    crl = CERT_DecodeDERCrlEx(NULL, derCrl, type, decodeoptions);
+    crl = CERT_DecodeDERCrlWithFlags(NULL, derCrl, type, decodeoptions);
     if (crl) {
         crl->slot = slot;
         slot = NULL; /* adopt it */
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index fdb159e62e7..d94ff2a005d 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -684,7 +684,7 @@ SECMOD_CanDeleteInternalModule;
 ;+    global:
 CERT_AddOCSPAcceptableResponses;
 CERT_CompleteCRLDecodeEntries;
-CERT_DecodeDERCrlEx;
+CERT_DecodeDERCrlWithFlags;
 CERT_CreateOCSPCertID;
 CERT_CreateOCSPRequest;
 CERT_DecodeOCSPResponse;
diff --git a/security/nss/lib/pk11wrap/pk11cert.c b/security/nss/lib/pk11wrap/pk11cert.c
index 11f62d8684e..ba4325ef9b7 100644
--- a/security/nss/lib/pk11wrap/pk11cert.c
+++ b/security/nss/lib/pk11wrap/pk11cert.c
@@ -4054,7 +4054,8 @@ CERTSignedCrl* PK11_ImportCRL(PK11SlotInfo * slot, SECItem *derCRL, char *url,
     newCrl = crl = NULL;
 
     do {
-        newCrl = CERT_DecodeDERCrlEx(arena, derCRL, type, decodeoptions);
+        newCrl = CERT_DecodeDERCrlWithFlags(arena, derCRL, type,
+                                            decodeoptions);
         if (newCrl == NULL) {
             if (type == SEC_CRL_TYPE) {
                 /* only promote error when the error code is too generic */