diff options
| author | Kai Engert <kaie@kuix.de> | 2013-08-23 21:53:07 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2013-08-23 21:53:07 +0200 |
| commit | bee7e0b1771e55011b65bc09bc28e876c85ee4a7 (patch) | |
| tree | eebabe611e19e34b379f7afadccdb703d4420ba5 | |
| parent | 69328fb294c1252b92029dc4d1018f021c2b5f8e (diff) | |
| download | nss-hg-bee7e0b1771e55011b65bc09bc28e876c85ee4a7.tar.gz | |
bug 908617, address review comments, r=wtc
| -rw-r--r-- | cmd/tstclnt/tstclnt.c | 17 | ||||
| -rw-r--r-- | tests/ocsp/ocsp.sh | 3 |
2 files changed, 12 insertions, 8 deletions
diff --git a/cmd/tstclnt/tstclnt.c b/cmd/tstclnt/tstclnt.c index 1c073ac80..f572e025d 100644 --- a/cmd/tstclnt/tstclnt.c +++ b/cmd/tstclnt/tstclnt.c @@ -237,6 +237,7 @@ static void PrintParameterUsage(void) fprintf(stderr, "%-20s Print cipher values allowed for parameter -c and exit\n", "-Y"); fprintf(stderr, "%-20s Enforce using an IPv4 destination address\n", "-4"); fprintf(stderr, "%-20s Enforce using an IPv6 destination address\n", "-6"); + fprintf(stderr, "%-20s (Options -4 and -6 cannot be combined.)\n", ""); } static void Usage(const char *progName) @@ -993,15 +994,15 @@ int main(int argc, char **argv) SECU_PrintError(progName, "error looking up host"); return 1; } - do { + for (;;) { enumPtr = PR_EnumerateAddrInfo(enumPtr, addrInfo, portno, &addr); - if (enumPtr) { - if (addr.raw.family == PR_AF_INET && allowIPv4) - break; - if (addr.raw.family == PR_AF_INET6 && allowIPv6) - break; - } - } while (enumPtr); + if (enumPtr == NULL) + break; + if (addr.raw.family == PR_AF_INET && allowIPv4) + break; + if (addr.raw.family == PR_AF_INET6 && allowIPv6) + break; + } PR_FreeAddrInfo(addrInfo); if (enumPtr == NULL) { SECU_PrintError(progName, "error looking up host address"); diff --git a/tests/ocsp/ocsp.sh b/tests/ocsp/ocsp.sh index 7626f6d89..84323c9c8 100644 --- a/tests/ocsp/ocsp.sh +++ b/tests/ocsp/ocsp.sh @@ -51,6 +51,9 @@ ocsp_init() ocsp_stapling() { + # Parameter -4 is used as a temporary workaround for lack of IPv6 connectivity + # on some build bot slaves. + TESTNAME="startssl valid, supports OCSP stapling" echo "$SCRIPTNAME: $TESTNAME" echo "tstclnt -4 -V tls1.0: -T -v -F -M 1 -O -h kuix.de -p 5143 -d . < ${REQF}" |