summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2002-02-14 02:53:20 +0000
committerwtc%netscape.com <devnull@localhost>2002-02-14 02:53:20 +0000
commitd83cff8a04e54dad788dbb78a45f371954d79724 (patch)
tree3fec4d9b8800b34b145b27980159947fd406c368
parentddf7d7e64b09c493d184efde52522a02696a3d9d (diff)
downloadnss-hg-d83cff8a04e54dad788dbb78a45f371954d79724.tar.gz
Bugzilla bug 122712: renamed cert_DecodeGeneralName to
CERT_DecodeGeneralName because we export this function from nss.def. (The cert_ prefix suggests an internal function.) Modified Files: lib/certdb/genname.c lib/certdb/genname.h lib/certdb/xconst.c lib/nss/nss.def
-rw-r--r--security/nss/lib/certdb/genname.c6
-rw-r--r--security/nss/lib/certdb/genname.h2
-rw-r--r--security/nss/lib/certdb/xconst.c2
-rw-r--r--security/nss/lib/nss/nss.def2
4 files changed, 6 insertions, 6 deletions
diff --git a/security/nss/lib/certdb/genname.c b/security/nss/lib/certdb/genname.c
index 140749904..fadf9d15f 100644
--- a/security/nss/lib/certdb/genname.c
+++ b/security/nss/lib/certdb/genname.c
@@ -350,7 +350,7 @@ loser:
}
CERTGeneralName *
-cert_DecodeGeneralName(PRArenaPool *arena,
+CERT_DecodeGeneralName(PRArenaPool *arena,
SECItem *encodedName,
CERTGeneralName *genName)
{
@@ -423,7 +423,7 @@ cert_DecodeGeneralNames (PRArenaPool *arena,
goto loser;
}
while (*encodedGenName != NULL) {
- currentName = cert_DecodeGeneralName(arena, *encodedGenName, NULL);
+ currentName = CERT_DecodeGeneralName(arena, *encodedGenName, NULL);
if (currentName == NULL) {
goto loser;
}
@@ -578,7 +578,7 @@ cert_DecodeNameConstraint(PRArenaPool *arena,
if (rv != SECSuccess) {
goto loser;
}
- temp = cert_DecodeGeneralName(arena, &(constraint->DERName), &(constraint->name));
+ temp = CERT_DecodeGeneralName(arena, &(constraint->DERName), &(constraint->name));
if (temp != &(constraint->name)) {
goto loser;
}
diff --git a/security/nss/lib/certdb/genname.h b/security/nss/lib/certdb/genname.h
index e1406019b..8e3a58619 100644
--- a/security/nss/lib/certdb/genname.h
+++ b/security/nss/lib/certdb/genname.h
@@ -60,7 +60,7 @@ extern SECItem **
cert_EncodeGeneralNames(PRArenaPool *arena, CERTGeneralName *names);
extern CERTGeneralName *
-cert_DecodeGeneralName(PRArenaPool *arena, SECItem *encodedName,
+CERT_DecodeGeneralName(PRArenaPool *arena, SECItem *encodedName,
CERTGeneralName *genName);
extern CERTGeneralName *
diff --git a/security/nss/lib/certdb/xconst.c b/security/nss/lib/certdb/xconst.c
index 6967411c1..74a4de08b 100644
--- a/security/nss/lib/certdb/xconst.c
+++ b/security/nss/lib/certdb/xconst.c
@@ -217,7 +217,7 @@ cert_DecodeAuthInfoAccessExtension(PRArenaPool *arena,
}
for (i = 0; info[i] != NULL; i++) {
- info[i]->location = cert_DecodeGeneralName(arena,
+ info[i]->location = CERT_DecodeGeneralName(arena,
&(info[i]->derLocation),
NULL);
}
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 78269a803..2f5221385 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -574,7 +574,7 @@ CERT_CopyName;
CERT_CreateSubjectCertList;
CERT_DecodeAVAValue;
;+#CERT_DecodeCertFromPackage;
-cert_DecodeGeneralName;
+CERT_DecodeGeneralName;
CERT_DecodeTrustString;
CERT_DerNameToAscii;
CERT_EncodeGeneralName;