diff options
author | Martin Thomson <martin.thomson@gmail.com> | 2018-02-14 18:46:10 +1100 |
---|---|---|
committer | Martin Thomson <martin.thomson@gmail.com> | 2018-02-14 18:46:10 +1100 |
commit | 61cc1fa706af88f1159f5089840b09e2b838d0f4 (patch) | |
tree | 0de9959927f7108c6d6a4c378c641dbf071b13aa /cmd/vfyserv | |
parent | a63322e39baae7b4c7f1f343891315973006493e (diff) | |
download | nss-hg-61cc1fa706af88f1159f5089840b09e2b838d0f4.tar.gz |
Bug 1309068 - Enable -Wshadow, r=franziskus
Diffstat (limited to 'cmd/vfyserv')
-rw-r--r-- | cmd/vfyserv/vfyserv.c | 6 | ||||
-rw-r--r-- | cmd/vfyserv/vfyutil.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmd/vfyserv/vfyserv.c b/cmd/vfyserv/vfyserv.c index aa648ad8c..4234ecd09 100644 --- a/cmd/vfyserv/vfyserv.c +++ b/cmd/vfyserv/vfyserv.c @@ -327,9 +327,7 @@ do_connects(void *a, int connection) } void -client_main(unsigned short port, - int connections, - const char *hostName) +client_main(int connections) { int i; SECStatus secStatus; @@ -553,7 +551,7 @@ main(int argc, char **argv) } } - client_main(port, connections, hostName); + client_main(connections); cleanup: if (doOcspCheck) { diff --git a/cmd/vfyserv/vfyutil.c b/cmd/vfyserv/vfyutil.c index 2f1b53262..d3d8a206e 100644 --- a/cmd/vfyserv/vfyutil.c +++ b/cmd/vfyserv/vfyutil.c @@ -310,13 +310,13 @@ myHandshakeCallback(PRFileDesc *socket, void *arg) void disableAllSSLCiphers(void) { - const PRUint16 *cipherSuites = SSL_ImplementedCiphers; + const PRUint16 *allSuites = SSL_ImplementedCiphers; int i = SSL_NumImplementedCiphers; SECStatus rv; /* disable all the SSL3 cipher suites */ while (--i >= 0) { - PRUint16 suite = cipherSuites[i]; + PRUint16 suite = allSuites[i]; rv = SSL_CipherPrefSetDefault(suite, PR_FALSE); if (rv != SECSuccess) { fprintf(stderr, |