From ea17a78f86a42e876918dfd2032ecc858216c9a7 Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Fri, 28 Jan 2011 02:55:25 +0000 Subject: [PATCH] Bug 597624: pp -t certificate should identify and ident the DistributionPoints in the CRL distribution points extension. Add 'const' to the char* msg arguments to three functions. r=nelson. Modified Files: secutil.c secutil.h git-svn-id: svn://10.0.0.236/trunk@261856 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/cmd/lib/secutil.c | 18 ++++++++++-------- mozilla/security/nss/cmd/lib/secutil.h | 5 +++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/mozilla/security/nss/cmd/lib/secutil.c b/mozilla/security/nss/cmd/lib/secutil.c index 262db4a96c4..37b013d7c93 100644 --- a/mozilla/security/nss/cmd/lib/secutil.c +++ b/mozilla/security/nss/cmd/lib/secutil.c @@ -981,7 +981,7 @@ SECU_PrintInteger(FILE *out, SECItem *i, char *m, int level) } static void -secu_PrintRawString(FILE *out, SECItem *si, char *m, int level) +secu_PrintRawString(FILE *out, SECItem *si, const char *m, int level) { int column; unsigned int i; @@ -2162,23 +2162,25 @@ secu_PrintCRLDistPtsExtension(FILE *out, SECItem *value, char *msg, int level) CRLDistributionPoint ** pPoints = dPoints->distPoints; CRLDistributionPoint * pPoint; while (NULL != (pPoint = *pPoints++)) { + SECU_Indent(out, level); fputs("Distribution point:\n", out); if (pPoint->distPointType == generalName && pPoint->distPoint.fullName != NULL) { secu_PrintGeneralNames(out, pPoint->distPoint.fullName, NULL, - level); + level + 1); } else if (pPoint->distPointType == relativeDistinguishedName && pPoint->distPoint.relativeName.avas) { SECU_PrintRDN(out, &pPoint->distPoint.relativeName, "RDN", - level); + level + 1); } else if (pPoint->derDistPoint.data) { - SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level); + SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level + 1); } if (pPoint->reasons.data) { secu_PrintDecodedBitString(out, &pPoint->reasons, "Reasons", - level); + level + 1); } if (pPoint->crlIssuer) { - secu_PrintGeneralName(out, pPoint->crlIssuer, "Issuer", level); + secu_PrintGeneralName(out, pPoint->crlIssuer, "CRL issuer", + level + 1); } } } else { @@ -2400,7 +2402,7 @@ SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions, * print those, so make a directory name out of the RDN, and print it. */ void -SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level) +SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level) { CERTName name; CERTRDN *rdns[2]; @@ -2413,7 +2415,7 @@ SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level) } void -SECU_PrintName(FILE *out, CERTName *name, char *msg, int level) +SECU_PrintName(FILE *out, CERTName *name, const char *msg, int level) { char *nameStr = NULL; char *str; diff --git a/mozilla/security/nss/cmd/lib/secutil.h b/mozilla/security/nss/cmd/lib/secutil.h index 4aa7c3a227f..d5413eacb97 100644 --- a/mozilla/security/nss/cmd/lib/secutil.h +++ b/mozilla/security/nss/cmd/lib/secutil.h @@ -313,8 +313,9 @@ extern void SECU_PrintPrivKeyUsagePeriodExtension(FILE *out, SECItem *value, extern void SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions, char *msg, int level); -extern void SECU_PrintName(FILE *out, CERTName *name, char *msg, int level); -extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level); +extern void SECU_PrintName(FILE *out, CERTName *name, const char *msg, + int level); +extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level); #ifdef SECU_GetPassword /* Convert a High public Key to a Low public Key */