summaryrefslogtreecommitdiff
path: root/cmd/lib
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2018-02-14 18:46:10 +1100
committerMartin Thomson <martin.thomson@gmail.com>2018-02-14 18:46:10 +1100
commit61cc1fa706af88f1159f5089840b09e2b838d0f4 (patch)
tree0de9959927f7108c6d6a4c378c641dbf071b13aa /cmd/lib
parenta63322e39baae7b4c7f1f343891315973006493e (diff)
downloadnss-hg-61cc1fa706af88f1159f5089840b09e2b838d0f4.tar.gz
Bug 1309068 - Enable -Wshadow, r=franziskus
Diffstat (limited to 'cmd/lib')
-rw-r--r--cmd/lib/secutil.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/lib/secutil.c b/cmd/lib/secutil.c
index 2b33f8963..6be2df432 100644
--- a/cmd/lib/secutil.c
+++ b/cmd/lib/secutil.c
@@ -1528,9 +1528,9 @@ SECU_PrintDumpDerIssuerAndSerial(FILE *out, SECItem *der, char *m,
unsigned int i;
for (i = 0; i < c->serialNumber.len; ++i) {
unsigned char *chardata = (unsigned char *)(c->serialNumber.data);
- unsigned char c = *(chardata + i);
+ unsigned char ch = *(chardata + i);
- fprintf(out, "\\x%02x", c);
+ fprintf(out, "\\x%02x", ch);
}
fprintf(out, "\" }\n");
}
@@ -3137,7 +3137,7 @@ typedef enum {
static int
secu_PrintSignedDataSigOpt(FILE *out, SECItem *der, const char *m,
int level, SECU_PPFunc inner,
- SignatureOptionType withSignature)
+ SignatureOptionType signatureOption)
{
PLArenaPool *arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
CERTSignedData *sd;
@@ -3164,7 +3164,7 @@ secu_PrintSignedDataSigOpt(FILE *out, SECItem *der, const char *m,
}
rv = (*inner)(out, &sd->data, "Data", level + 1);
- if (withSignature) {
+ if (signatureOption == withSignature) {
SECU_PrintAlgorithmID(out, &sd->signatureAlgorithm, "Signature Algorithm",
level + 1);
DER_ConvertBitString(&sd->signature);