Fix compile error for net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp

Because in the new nss3 package, CERTDB_VALID_PEER is deprecated and in the
chromium build, deprecated is marked as errors.

BUG=108656
TEST= compiled under nss-devel-3.12.10-6.fc15 and nss-devel-3.13.1-9.fc16


Review URL: http://codereview.chromium.org/9041002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117791 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 6 deletions

diff --git a/net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp b/net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp
index 75fa04f..408e55d 100644
--- a/net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp
+++ b/net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp
@@ -38,6 +38,14 @@
 
 #include "net/third_party/mozilla_security_manager/nsNSSCertTrust.h"
 
+#if !defined(CERTDB_TERMINAL_RECORD)
+/* NSS 3.13 renames CERTDB_VALID_PEER to CERTDB_TERMINAL_RECORD
+ * and marks CERTDB_VALID_PEER as deprecated.
+ * If we're using an older version, rename it ourselves.
+ */
+#define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER
+#endif
+
 namespace mozilla_security_manager {
 
 void
@@ -102,7 +110,7 @@ nsNSSCertTrust::SetSSLTrust(PRBool peer, PRBool tPeer,
 {
   mTrust.sslFlags = 0;
   if (peer || tPeer)
-    addTrust(&mTrust.sslFlags, CERTDB_VALID_PEER);
+    addTrust(&mTrust.sslFlags, CERTDB_TERMINAL_RECORD);
   if (tPeer)
     addTrust(&mTrust.sslFlags, CERTDB_TRUSTED);
   if (ca || tCA)
@@ -124,7 +132,7 @@ nsNSSCertTrust::SetEmailTrust(PRBool peer, PRBool tPeer,
 {
   mTrust.emailFlags = 0;
   if (peer || tPeer)
-    addTrust(&mTrust.emailFlags, CERTDB_VALID_PEER);
+    addTrust(&mTrust.emailFlags, CERTDB_TERMINAL_RECORD);
   if (tPeer)
     addTrust(&mTrust.emailFlags, CERTDB_TRUSTED);
   if (ca || tCA)
@@ -146,7 +154,7 @@ nsNSSCertTrust::SetObjSignTrust(PRBool peer, PRBool tPeer,
 {
   mTrust.objectSigningFlags = 0;
   if (peer || tPeer)
-    addTrust(&mTrust.objectSigningFlags, CERTDB_VALID_PEER);
+    addTrust(&mTrust.objectSigningFlags, CERTDB_TERMINAL_RECORD);
   if (tPeer)
     addTrust(&mTrust.objectSigningFlags, CERTDB_TRUSTED);
   if (ca || tCA)
@@ -288,11 +296,12 @@ nsNSSCertTrust::HasPeer(PRBool checkSSL,
                         PRBool checkEmail,  
                         PRBool checkObjSign)
 {
-  if (checkSSL && !hasTrust(mTrust.sslFlags, CERTDB_VALID_PEER))
+  if (checkSSL && !hasTrust(mTrust.sslFlags, CERTDB_TERMINAL_RECORD))
     return PR_FALSE;
-  if (checkEmail && !hasTrust(mTrust.emailFlags, CERTDB_VALID_PEER))
+  if (checkEmail && !hasTrust(mTrust.emailFlags, CERTDB_TERMINAL_RECORD))
     return PR_FALSE;
-  if (checkObjSign && !hasTrust(mTrust.objectSigningFlags, CERTDB_VALID_PEER))
+  if (checkObjSign &&
+       !hasTrust(mTrust.objectSigningFlags, CERTDB_TERMINAL_RECORD))
     return PR_FALSE;
   return PR_TRUE;
 }