Bug 772365, Part 0: remove nsNSSCertHeader.h, r=honzab

--HG--
extra : rebase_source : b58ac957c58f647180f67a6e13be3cc81915d90c

security/manager/ssl/src/nsCRLManager.cpp

@@ -17,8 +17,6 @@
 #include "nsNSSShutDown.h"
 #include "nsThreadUtils.h"
 
-#include "nsNSSCertHeader.h"
-
 #include "nspr.h"
 #include "pk11func.h"
 #include "certdb.h"

security/manager/ssl/src/nsClientAuthRemember.cpp

@@ -16,6 +16,7 @@
 #include "nsPromiseFlatString.h"
 #include "nsThreadUtils.h"
 #include "nsStringBuffer.h"
+#include "cert.h"
 #include "nspr.h"
 #include "pk11pub.h"
 #include "certdb.h"

security/manager/ssl/src/nsNSSCertHeader.h

@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _NSNSSCERTHEADER_H_
-#define _NSNSSCERTHEADER_H_
-
-/* private NSS defines used by PSM */
-/* (must be declated before cert.h) */
-#define CERT_NewTempCertificate __CERT_NewTempCertificate
-#define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm
-
-#include "prtypes.h"
-#include "cert.h"
-#include "secitem.h"
-#include "nsString.h"
-
-#endif

security/manager/ssl/src/nsNSSCertHelper.h

@@ -5,12 +5,12 @@
 #ifndef _NSNSSCERTHELPER_H_
 #define _NSNSSCERTHELPER_H_
 
-#include "nsNSSCertHeader.h"
-
 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN 46
 #endif
 
+#include "certt.h"
+
 uint32_t
 getCertType(CERTCertificate *cert);
 

security/manager/ssl/src/nsNSSCertValidity.cpp

@@ -3,13 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsNSSCertValidity.h"
-#include "nsNSSCertHeader.h"
 #include "nsCOMPtr.h"
 #include "nsIDateTimeFormat.h"
 #include "nsDateTimeFormatCID.h"
 #include "nsComponentManagerUtils.h"
 #include "nsReadableUtils.h"
 #include "nsNSSShutDown.h"
+#include "cert.h"
 
 /* Implementation file */
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsX509CertValidity, nsIX509CertValidity)

security/manager/ssl/src/nsNSSCertificate.h

@@ -19,8 +19,7 @@
 #include "nsISimpleEnumerator.h"
 #include "nsISerializable.h"
 #include "nsIClassInfo.h"
-
-#include "nsNSSCertHeader.h"
+#include "certt.h"
 
 class nsINSSComponent;
 class nsIASN1Sequence;

security/manager/ssl/src/nsNSSCertificateDB.cpp

@@ -2,6 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// XXX: This must be done prior to including cert.h (directly or indirectly).
+// CERT_AddTempCertToPerm is exposed as __CERT_AddTempCertToPerm, but it is
+// only exported so PSM can use it for this specific purpose.
+#define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm
+
 #include "nsNSSComponent.h"
 #include "nsNSSCertificateDB.h"
 #include "nsCOMPtr.h"
@@ -379,9 +384,9 @@ nsNSSCertificateDB::handleCACertDownload(nsIArray *x509Certs,
                    !!(trustBits & nsIX509CertDB::TRUSTED_EMAIL),
                    !!(trustBits & nsIX509CertDB::TRUSTED_OBJSIGN));
 
-  SECStatus srv = CERT_AddTempCertToPerm(tmpCert, 
-                                         const_cast<char*>(nickname.get()), 
-                                         trust.GetTrust()); 
+  SECStatus srv = __CERT_AddTempCertToPerm(tmpCert,
+                                           const_cast<char*>(nickname.get()),
+                                           trust.GetTrust());
 
   if (srv != SECSuccess)
     return NS_ERROR_FAILURE;
@@ -1735,9 +1740,9 @@ NS_IMETHODIMP nsNSSCertificateDB::AddCertFromBase64(const char *aBase64, const c
 
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Created nick \"%s\"\n", nickname.get()));
 
-  SECStatus srv = CERT_AddTempCertToPerm(tmpCert, 
-                                         const_cast<char*>(nickname.get()), 
-                                         trust.GetTrust()); 
+  SECStatus srv = __CERT_AddTempCertToPerm(tmpCert,
+                                           const_cast<char*>(nickname.get()),
+                                           trust.GetTrust());
 
 
   return (srv == SECSuccess) ? NS_OK : NS_ERROR_FAILURE;

security/manager/ssl/src/nsNSSCertificateDB.h

@@ -7,8 +7,9 @@
 
 #include "nsIX509CertDB.h"
 #include "nsIX509CertDB2.h"
-#include "nsNSSCertHeader.h"
+#include "certt.h"
 
+class nsCString;
 class nsIArray;
 
 class nsNSSCertificateDB : public nsIX509CertDB, public nsIX509CertDB2

security/manager/ssl/src/nsNSSCertificateFakeTransport.h

@@ -7,14 +7,9 @@
 #define _NS_NSSCERTIFICATECHILD_H_
 
 #include "nsIX509Cert.h"
-#include "nsNSSShutDown.h"
 #include "nsISerializable.h"
 #include "nsIClassInfo.h"
-
-#include "nsNSSCertHeader.h"
-
-class nsINSSComponent;
-class nsIASN1Sequence;
+#include "secitem.h"
 
 /* Certificate */
 class nsNSSCertificateFakeTransport : public nsIX509Cert,

security/manager/ssl/src/nsRecentBadCerts.h

@@ -13,6 +13,7 @@
 #include "nsIRecentBadCertsService.h"
 #include "nsTHashtable.h"
 #include "nsString.h"
+#include "cert.h"
 #include "secitem.h"
 
 class RecentBadCert

security/manager/ssl/src/nsUsageArrayHelper.cpp

@@ -12,8 +12,6 @@
 #include "nsNSSCertificate.h"
 
 #include "nspr.h"
-#include "nsNSSCertHeader.h"
-
 #include "secerr.h"
 
 using namespace mozilla;