Merge branch 'master' of github.com:wolfSSL/wolfssl

This commit is contained in:
John Safranek
2015-10-13 14:52:20 -07:00

View File

@ -172,7 +172,7 @@ static void Usage(void)
printf("-S <str> Use Host Name Indication\n"); printf("-S <str> Use Host Name Indication\n");
#endif #endif
#ifdef HAVE_MAX_FRAGMENT #ifdef HAVE_MAX_FRAGMENT
printf("-L <num> Use Maximum Fragment Length [1-5]\n"); printf("-F <num> Use Maximum Fragment Length [1-5]\n");
#endif #endif
#ifdef HAVE_TRUNCATED_HMAC #ifdef HAVE_TRUNCATED_HMAC
printf("-T Use Truncated HMAC\n"); printf("-T Use Truncated HMAC\n");
@ -293,7 +293,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
StackTrap(); StackTrap();
while ((ch = mygetopt(argc, argv, while ((ch = mygetopt(argc, argv,
"?gdeDusmNrwRitfxXUPCh:p:v:l:A:c:k:Z:b:zS:L:ToO:a")) "?gdeDusmNrwRitfxXUPCh:p:v:l:A:c:k:Z:b:zS:F:ToO:a"))
!= -1) { != -1) {
switch (ch) { switch (ch) {
case '?' : case '?' :
@ -456,7 +456,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif #endif
break; break;
case 'L' : case 'F' :
#ifdef HAVE_MAX_FRAGMENT #ifdef HAVE_MAX_FRAGMENT
maxFragment = atoi(myoptarg); maxFragment = atoi(myoptarg);
if (maxFragment < WOLFSSL_MFL_2_9 || if (maxFragment < WOLFSSL_MFL_2_9 ||