feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Make the skip DH test flag build-conditional.

Browse Source
This commit is contained in:
John Safranek
2018-11-30 09:19:11 -08:00
parent ff1a1dc5d5
commit 564a1ee499
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/server/server.c
View File

@@ -733,7 +733,6 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
short minEccKeyBits = DEFAULT_MIN_ECCKEY_BITS; short minEccKeyBits = DEFAULT_MIN_ECCKEY_BITS;
int doListen = 1; int doListen = 1;
int crlFlags = 0; int crlFlags = 0;
int doDhKeyCheck = 1;
int ret; int ret;
int err = 0; int err = 0;
char* serverReadyFile = NULL; char* serverReadyFile = NULL;
@@ -782,6 +781,10 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
int hrrCookie = 0; int hrrCookie = 0;
#endif #endif
byte mcastID = 0; byte mcastID = 0;
#if !defined(NO_DH) && !defined(HAVE_FIPS) && \
!defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK)
int doDhKeyCheck = 1;
#endif
#ifdef WOLFSSL_STATIC_MEMORY #ifdef WOLFSSL_STATIC_MEMORY
#if (defined(HAVE_ECC) && !defined(ALT_ECC_SIZE)) \ #if (defined(HAVE_ECC) && !defined(ALT_ECC_SIZE)) \
@@ -832,7 +835,6 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
(void)alpnList; (void)alpnList;
(void)alpn_opt; (void)alpn_opt;
(void)crlFlags; (void)crlFlags;
(void)doDhKeyCheck;
(void)readySignal; (void)readySignal;
(void)updateKeysIVs; (void)updateKeysIVs;
(void)postHandAuth; (void)postHandAuth;
@@ -1157,7 +1159,10 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
break; break;
case 'X' : case 'X' :
doDhKeyCheck = 0; #if !defined(NO_DH) && !defined(HAVE_FIPS) && \
!defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK)
doDhKeyCheck = 0;
#endif
break; break;
case '0' : case '0' :
@@ -1772,8 +1777,8 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
#elif !defined(NO_DH) #elif !defined(NO_DH)
SetDH(ssl); /* repick suites with DHE, higher priority than PSK */ SetDH(ssl); /* repick suites with DHE, higher priority than PSK */
#endif #endif
#if !defined(WOLFSSL_OLD_PRIME_CHECK) && !defined(HAVE_FIPS) && \ #if !defined(NO_DH) && !defined(WOLFSSL_OLD_PRIME_CHECK) && \
!defined(HAVE_SELFTEST) !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
if (!doDhKeyCheck) if (!doDhKeyCheck)
wolfSSL_SetEnableDhKeyTest(ssl, 0); wolfSSL_SetEnableDhKeyTest(ssl, 0);
#endif #endif