Bug 419523: Export Cert_NewTempCertificate. Remove unnecessary inclusions

of nssrenam.h.  Remove functions that no longer need to be renamed from
nssrenam.h.  r=rrelyea.
Modified Files:
	cmd/vfychain/vfychain.c lib/certdb/stanpcertdb.c
	lib/crmf/asn1cmn.c lib/crmf/cmmfrec.c lib/crmf/respcmn.c
	lib/nss/nss.def lib/nss/nssrenam.h lib/pkcs12/p12e.c
	lib/pkcs7/certread.c lib/pkcs7/p7decode.c lib/pkcs7/p7encode.c
	lib/smime/cmsutil.c lib/ssl/ssl3con.c lib/ssl/ssl3ecc.c
	lib/ssl/sslnonce.c lib/ssl/sslsnce.c

16 files changed, 8 insertions, 27 deletions

diff --git a/security/nss/cmd/vfychain/vfychain.c b/security/nss/cmd/vfychain/vfychain.c
index 4a233abbb..b2fb69af7 100644
--- a/security/nss/cmd/vfychain/vfychain.c
+++ b/security/nss/cmd/vfychain/vfychain.c
@@ -50,7 +50,6 @@
 
 #include "prerror.h"
 
-#include "nssrenam.h"
 #include "pk11func.h"
 #include "seccomon.h"
 #include "secutil.h"
diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c
index 8d1bd631e..6f05a40c4 100644
--- a/security/nss/lib/certdb/stanpcertdb.c
+++ b/security/nss/lib/certdb/stanpcertdb.c
@@ -361,8 +361,8 @@ CERT_AddTempCertToPerm(CERTCertificate *cert, char *nickname,
 }
 
 CERTCertificate *
-__CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert,
-			  char *nickname, PRBool isperm, PRBool copyDER)
+CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert,
+			char *nickname, PRBool isperm, PRBool copyDER)
 {
     NSSCertificate *c;
     CERTCertificate *cc;
@@ -480,12 +480,13 @@ loser:
     return NULL;
 }
 
+/* This symbol is exported for backward compatibility. */
 CERTCertificate *
-CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert,
-			char *nickname, PRBool isperm, PRBool copyDER)
+__CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert,
+			  char *nickname, PRBool isperm, PRBool copyDER)
 {
-    return( __CERT_NewTempCertificate(handle, derCert, nickname,
-                                      isperm, copyDER) );
+    return CERT_NewTempCertificate(handle, derCert, nickname,
+                                   isperm, copyDER);
 }
 
 /* maybe all the wincx's should be some const for internal token login? */
diff --git a/security/nss/lib/crmf/asn1cmn.c b/security/nss/lib/crmf/asn1cmn.c
index c93e6ab82..8cebff016 100644
--- a/security/nss/lib/crmf/asn1cmn.c
+++ b/security/nss/lib/crmf/asn1cmn.c
@@ -34,7 +34,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nssrenam.h"
 #include "cmmf.h"
 #include "cmmfi.h"
 
diff --git a/security/nss/lib/crmf/cmmfrec.c b/security/nss/lib/crmf/cmmfrec.c
index 3dd7cdd07..6e80d7f0e 100644
--- a/security/nss/lib/crmf/cmmfrec.c
+++ b/security/nss/lib/crmf/cmmfrec.c
@@ -40,7 +40,6 @@
  * CMMF
  */
 
-#include "nssrenam.h"
 #include "cmmf.h"
 #include "cmmfi.h"
 #include "secitem.h"
diff --git a/security/nss/lib/crmf/respcmn.c b/security/nss/lib/crmf/respcmn.c
index 14de15db8..1152e74d0 100644
--- a/security/nss/lib/crmf/respcmn.c
+++ b/security/nss/lib/crmf/respcmn.c
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nssrenam.h"
 #include "cmmf.h"
 #include "cmmfi.h"
 #include "secitem.h"
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 4da9e55c6..e4dd0dfb0 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -922,6 +922,7 @@ CERT_FindCRLEntryReasonExten;
 CERT_FindCRLNumberExten;
 CERT_FindNameConstraintsExten;
 CERT_GetValidDNSPatternsFromCert;
+CERT_NewTempCertificate;
 CERT_SetOCSPTimeout;
 CERT_PKIXVerifyCert;
 HASH_GetType;
diff --git a/security/nss/lib/nss/nssrenam.h b/security/nss/lib/nss/nssrenam.h
index 7802d3eb2..156646cdd 100644
--- a/security/nss/lib/nss/nssrenam.h
+++ b/security/nss/lib/nss/nssrenam.h
@@ -37,16 +37,11 @@
 #ifndef __nssrenam_h_
 #define __nssrenam_h_
 
-#define CERT_NewTempCertificate __CERT_NewTempCertificate
 #define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm
 #define PK11_CreateContextByRawKey __PK11_CreateContextByRawKey
-#define PK11_GetKeyData __PK11_GetKeyData
 #define CERT_ClosePermCertDB __CERT_ClosePermCertDB
 #define CERT_DecodeDERCertificate __CERT_DecodeDERCertificate
 #define CERT_TraversePermCertsForNickname __CERT_TraversePermCertsForNickname
 #define CERT_TraversePermCertsForSubject __CERT_TraversePermCertsForSubject
-#define PBE_CreateContext __PBE_CreateContext
-#define PBE_DestroyContext __PBE_DestroyContext
-#define PBE_GenerateBits __PBE_GenerateBits
 
 #endif /* __nssrenam_h_ */
diff --git a/security/nss/lib/pkcs12/p12e.c b/security/nss/lib/pkcs12/p12e.c
index 52f3871c8..b84ac58e7 100644
--- a/security/nss/lib/pkcs12/p12e.c
+++ b/security/nss/lib/pkcs12/p12e.c
@@ -34,7 +34,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nssrenam.h"
 #include "p12t.h"
 #include "p12.h"
 #include "plarena.h"
diff --git a/security/nss/lib/pkcs7/certread.c b/security/nss/lib/pkcs7/certread.c
index 4887d26b8..e439362de 100644
--- a/security/nss/lib/pkcs7/certread.c
+++ b/security/nss/lib/pkcs7/certread.c
@@ -34,7 +34,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nssrenam.h"
 #include "cert.h"
 #include "secpkcs7.h"
 #include "base64.h"
diff --git a/security/nss/lib/pkcs7/p7decode.c b/security/nss/lib/pkcs7/p7decode.c
index b6f2e7076..beef4a56d 100644
--- a/security/nss/lib/pkcs7/p7decode.c
+++ b/security/nss/lib/pkcs7/p7decode.c
@@ -41,8 +41,6 @@
  * $Id$
  */
 
-#include "nssrenam.h"
-
 #include "p7local.h"
 
 #include "cert.h"
diff --git a/security/nss/lib/pkcs7/p7encode.c b/security/nss/lib/pkcs7/p7encode.c
index cedb6cd08..ac615bc21 100644
--- a/security/nss/lib/pkcs7/p7encode.c
+++ b/security/nss/lib/pkcs7/p7encode.c
@@ -41,8 +41,6 @@
  * $Id$
  */
 
-#include "nssrenam.h"
-
 #include "p7local.h"
 
 #include "cert.h"
diff --git a/security/nss/lib/smime/cmsutil.c b/security/nss/lib/smime/cmsutil.c
index 945395f52..ddd87870a 100644
--- a/security/nss/lib/smime/cmsutil.c
+++ b/security/nss/lib/smime/cmsutil.c
@@ -41,8 +41,6 @@
  * $Id$
  */
 
-#include "nssrenam.h"
-
 #include "cmslocal.h"
 
 #include "cert.h"
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index 0197b3bb3..9530c6358 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -41,7 +41,6 @@
  * ***** END LICENSE BLOCK ***** */
 /* $Id$ */
 
-#include "nssrenam.h"
 #include "cert.h"
 #include "ssl.h"
 #include "cryptohi.h"	/* for DSAU_ stuff */
diff --git a/security/nss/lib/ssl/ssl3ecc.c b/security/nss/lib/ssl/ssl3ecc.c
index 38144df8b..af0e2c9b6 100644
--- a/security/nss/lib/ssl/ssl3ecc.c
+++ b/security/nss/lib/ssl/ssl3ecc.c
@@ -42,7 +42,6 @@
 /* ECC code moved here from ssl3con.c */
 /* $Id$ */
 
-#include "nssrenam.h"
 #include "nss.h"
 #include "cert.h"
 #include "ssl.h"
diff --git a/security/nss/lib/ssl/sslnonce.c b/security/nss/lib/ssl/sslnonce.c
index 608b56394..8c097f8d4 100644
--- a/security/nss/lib/ssl/sslnonce.c
+++ b/security/nss/lib/ssl/sslnonce.c
@@ -38,7 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 /* $Id$ */
 
-#include "nssrenam.h"
 #include "cert.h"
 #include "pk11pub.h"
 #include "secitem.h"
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index d884473dc..72c7009ce 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -73,7 +73,6 @@
  *     PRBool                   ticketKeysValid;
  * } cacheMemCacheData;
  */
-#include "nssrenam.h"
 #include "seccomon.h"
 
 #if (defined(XP_UNIX) || defined(XP_WIN32) || defined (XP_OS2) || defined(XP_BEOS)) && !defined(_WIN32_WCE)