From 46827ccc155dd9220a2515de6ca64e4a44ff157f Mon Sep 17 00:00:00 2001
From: "kaie%kuix.de" <kaie%kuix.de>
Date: Sat, 15 Mar 2008 01:21:21 +0000
Subject: [PATCH] Bug 294531 Follow up patch to rename some policy function
 names r=rrelyea

---
 security/nss/lib/certdb/cert.h          | 8 ++++----
 security/nss/lib/certhigh/certvfypkix.c | 6 +++---
 security/nss/lib/nss/nss.def            | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h
index cd5658059f0..9d00c64e8b3 100644
--- a/security/nss/lib/certdb/cert.h
+++ b/security/nss/lib/certdb/cert.h
@@ -37,7 +37,7 @@
 /*
  * cert.h - public data structures and prototypes for the certificate library
  *
- * $Id: cert.h,v 1.66 2008-03-14 23:29:04 kaie%kuix.de Exp $
+ * $Id: cert.h,v 1.67 2008-03-15 01:21:18 kaie%kuix.de Exp $
  */
 
 #ifndef _CERT_H_
@@ -1613,19 +1613,19 @@ CERT_GetPKIXVerifyNistRevocationPolicy();
  * Returns a pointer to a static structure.
  */
 extern const CERTRevocationFlags*
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Enabled_Soft_Policy();
+CERT_GetClassicOCSPEnabledSoftFailurePolicy();
 
 /*
  * Returns a pointer to a static structure.
  */
 extern const CERTRevocationFlags*
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Enabled_Hard_Policy();
+CERT_GetClassicOCSPEnabledHardFailurePolicy();
 
 /*
  * Returns a pointer to a static structure.
  */
 extern const CERTRevocationFlags*
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Disabled_Policy();
+CERT_GetClassicOCSPDisabledPolicy();
 
 /*
  * Verify a Cert with libpkix
diff --git a/security/nss/lib/certhigh/certvfypkix.c b/security/nss/lib/certhigh/certvfypkix.c
index 57db161c3ea..c2b1b799d1b 100644
--- a/security/nss/lib/certhigh/certvfypkix.c
+++ b/security/nss/lib/certhigh/certvfypkix.c
@@ -1763,7 +1763,7 @@ static const CERTRevocationFlags certRev_NSS_3_11_Ocsp_Enabled_Soft_Policy = {
 };
 
 extern const CERTRevocationFlags*
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Enabled_Soft_Policy()
+CERT_GetClassicOCSPEnabledSoftFailurePolicy()
 {
     return &certRev_NSS_3_11_Ocsp_Enabled_Soft_Policy;
 }
@@ -1813,7 +1813,7 @@ static const CERTRevocationFlags certRev_NSS_3_11_Ocsp_Enabled_Hard_Policy = {
 };
 
 extern const CERTRevocationFlags*
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Enabled_Hard_Policy()
+CERT_GetClassicOCSPEnabledHardFailurePolicy()
 {
     return &certRev_NSS_3_11_Ocsp_Enabled_Hard_Policy;
 }
@@ -1857,7 +1857,7 @@ static const CERTRevocationFlags certRev_NSS_3_11_Ocsp_Disabled_Policy = {
 };
 
 extern const CERTRevocationFlags*
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Disabled_Policy()
+CERT_GetClassicOCSPDisabledPolicy()
 {
     return &certRev_NSS_3_11_Ocsp_Disabled_Policy;
 }
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index ccbad60e5a0..72d7657468c 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -921,10 +921,10 @@ CERT_EncodeUserNotice;
 CERT_FindCRLEntryReasonExten;
 CERT_FindCRLNumberExten;
 CERT_FindNameConstraintsExten;
+CERT_GetClassicOCSPDisabledPolicy;
+CERT_GetClassicOCSPEnabledHardFailurePolicy;
+CERT_GetClassicOCSPEnabledSoftFailurePolicy;
 CERT_GetPKIXVerifyNistRevocationPolicy;
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Enabled_Hard_Policy;
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Enabled_Soft_Policy;
-CERT_GetPKIXVerifyNSS_3_11_OCSP_Disabled_Policy;
 CERT_GetUsePKIXForValidation;
 CERT_GetValidDNSPatternsFromCert;
 CERT_NewTempCertificate;