Bugzilla bug 123938: renamed cert_EncodeGeneralName to

CERT_EncodeGeneralName.  Export CERT_EncodeGeneralName and
CERT_FindKeyUsageExtension from nss.def.  Have cmmfrec.c include
nssrenam.h to get __CERT_NewTempCertificate.
Modified Files:
	lib/certdb/genname.c lib/certdb/genname.h lib/certdb/xconst.c
	lib/crmf/cmmfchal.c lib/crmf/cmmfrec.c lib/nss/nss.def

security/nss/lib/certdb/genname.c

@@ -241,7 +241,7 @@ cert_get_prev_name_constraint(CERTNameConstraint *current)
 }
 
 SECItem *
-cert_EncodeGeneralName(CERTGeneralName *genName, SECItem *dest, PRArenaPool *arena)
+CERT_EncodeGeneralName(CERTGeneralName *genName, SECItem *dest, PRArenaPool *arena)
 {
 
 
@@ -337,7 +337,7 @@ cert_EncodeGeneralNames(PRArenaPool *arena, CERTGeneralName *names)
 	goto loser;
     }
     for (i = 0; i < count; i++) {
-	items[i] = cert_EncodeGeneralName(current_name, (SECItem *) NULL, arena);
+	items[i] = CERT_EncodeGeneralName(current_name, (SECItem *) NULL, arena);
 	if (items[i] == NULL) {
 	    goto loser;
 	}
@@ -477,7 +477,7 @@ cert_EncodeNameConstraint(CERTNameConstraint  *constraint,
 	    return NULL;
 	}
     }
-    cert_EncodeGeneralName(&(constraint->name), &(constraint->DERName), 
+    CERT_EncodeGeneralName(&(constraint->name), &(constraint->DERName), 
 			   arena);
     
     dest = SEC_ASN1EncodeItem (arena, dest, constraint,

security/nss/lib/certdb/genname.h

@@ -53,7 +53,7 @@ extern CERTGeneralName *
 cert_get_prev_general_name(CERTGeneralName *current);
 
 extern SECItem *
-cert_EncodeGeneralName(CERTGeneralName *genName, SECItem *dest,
+CERT_EncodeGeneralName(CERTGeneralName *genName, SECItem *dest,
 		       PRArenaPool *arena);
 
 extern SECItem **

security/nss/lib/certdb/xconst.c

@@ -239,7 +239,7 @@ cert_EncodeAuthInfoAccessExtension(PRArenaPool *arena,
     }
 
     for (i = 0; info[i] != NULL; i++) {
-	if (cert_EncodeGeneralName(info[i]->location, &(info[i]->derLocation),
+	if (CERT_EncodeGeneralName(info[i]->location, &(info[i]->derLocation),
 				   arena) == NULL)
 	    /* Note that this may leave some of the locations filled in. */
 	    return SECFailure;

security/nss/lib/crmf/cmmfchal.c

@@ -227,7 +227,7 @@ CMMF_POPODecKeyChallContentSetNextChallenge
     mark = PORT_ArenaMark(poolp);
 
     genNamePool = PORT_NewArena(CRMF_DEFAULT_ARENA_SIZE);
-    genNameDER = cert_EncodeGeneralName(inSender, NULL, genNamePool);
+    genNameDER = CERT_EncodeGeneralName(inSender, NULL, genNamePool);
     if (genNameDER == NULL) {
         rv = SECFailure;
         goto loser;

security/nss/lib/crmf/cmmfrec.c

@@ -37,6 +37,7 @@
  * CMMF
  */
 
+#include "nssrenam.h"
 #include "cmmf.h"
 #include "cmmfi.h"
 #include "secitem.h"

security/nss/lib/nss/nss.def

@@ -577,9 +577,11 @@ CERT_DecodeAVAValue;
 cert_DecodeGeneralName;
 CERT_DecodeTrustString;
 CERT_DerNameToAscii;
+CERT_EncodeGeneralName;
 CERT_FilterCertListByCANames;
 CERT_FilterCertListByUsage;
 CERT_FindCertExtension;
+CERT_FindKeyUsageExtension;
 CERT_FindUserCertByUsage;
 CERT_FindUserCertsByUsage;
 CERT_GetCertChainFromCert;