diff --git a/commit-tests.sh b/commit-tests.sh index 1950d8691..f76d6ba3f 100755 --- a/commit-tests.sh +++ b/commit-tests.sh @@ -23,7 +23,7 @@ RESULT=$? # make sure full config is ok echo -e "\n\nTesting full config as well...\n\n" -./configure --enable-opensslExtra --enable-fastmath --enable-dtls --enable-aesgcm --enable-hc128 --enable-sniffer; +./configure --enable-opensslExtra --enable-fastmath --enable-dtls --enable-aesgcm --enable-hc128 --enable-sniffer --enable-psk; RESULT=$? [ $RESULT -ne 0 ] && echo -e "\n\nFull config ./configure failed" && exit 1 diff --git a/examples/server/server.c b/examples/server/server.c index 1e07fb9eb..16dd5c351 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -309,13 +309,13 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) CloseSocket(sockfd); SSL_set_fd(ssl, clientfd); -#ifdef NO_PSK - #if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA) - CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM); - #else - SetDH(ssl); /* will repick suites with DHE, higher priority than PSK */ - #endif -#endif + if (usePsk == 0) { + #if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA) + CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM); + #else + SetDH(ssl); /* repick suites with DHE, higher priority than PSK */ + #endif + } #ifndef CYASSL_CALLBACKS if (nonBlocking) { diff --git a/src/internal.c b/src/internal.c index b6bebc3cb..c60e982f6 100644 --- a/src/internal.c +++ b/src/internal.c @@ -6904,7 +6904,7 @@ int SetCipherList(Suites* s, const char* list) return SetCipherSpecs(ssl); } else { - CYASSL_MSG("Coult not verify suite validity, continue"); + CYASSL_MSG("Could not verify suite validity, continue"); } }