Fix for unused useSupCurve in example client with --disable-ecc.

This commit is contained in:
David Garske
2018-11-08 15:43:18 -08:00
parent e9a10e3614
commit d5dddd2b29

View File

@ -1310,7 +1310,9 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
int doSTARTTLS = 0; int doSTARTTLS = 0;
char* starttlsProt = NULL; char* starttlsProt = NULL;
int useVerifyCb = 0; int useVerifyCb = 0;
#ifdef HAVE_ECC
int useSupCurve = 0; int useSupCurve = 0;
#endif
#ifdef WOLFSSL_TRUST_PEER_CERT #ifdef WOLFSSL_TRUST_PEER_CERT
const char* trustCert = NULL; const char* trustCert = NULL;
@ -1410,7 +1412,9 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
(void)useX25519; (void)useX25519;
(void)helloRetry; (void)helloRetry;
(void)onlyKeyShare; (void)onlyKeyShare;
#ifdef HAVE_ECC
(void)useSupCurve; (void)useSupCurve;
#endif
(void)loadCertKeyIntoSSLObj; (void)loadCertKeyIntoSSLObj;
StackTrap(); StackTrap();
@ -1557,10 +1561,12 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
printf("Verify should fail\n"); printf("Verify should fail\n");
myVerifyFail = 1; myVerifyFail = 1;
} }
#ifdef HAVE_ECC
else if (XSTRNCMP(myoptarg, "useSupCurve", 11) == 0) { else if (XSTRNCMP(myoptarg, "useSupCurve", 11) == 0) {
printf("Test use supported curve\n"); printf("Test use supported curve\n");
useSupCurve = 1; useSupCurve = 1;
} }
#endif
else if (XSTRNCMP(myoptarg, "loadSSL", 7) == 0) { else if (XSTRNCMP(myoptarg, "loadSSL", 7) == 0) {
printf("Load cert/key into wolfSSL object\n"); printf("Load cert/key into wolfSSL object\n");
loadCertKeyIntoSSLObj = 1; loadCertKeyIntoSSLObj = 1;
@ -1785,9 +1791,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
case 't' : case 't' :
#ifdef HAVE_CURVE25519 #ifdef HAVE_CURVE25519
useX25519 = 1; useX25519 = 1;
#ifdef HAVE_ECC
useSupCurve = 1; useSupCurve = 1;
#if defined(WOLFSSL_TLS13) && defined(HAVE_ECC) #ifdef WOLFSSL_TLS13
onlyKeyShare = 2; onlyKeyShare = 2;
#endif
#endif #endif
#endif #endif
break; break;