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

fix opensslExtra with psk server example, add psk to commit tests

Browse Source
This commit is contained in:
toddouska
2012-10-19 12:54:15 -07:00
parent c974d77213
commit a5d7a3ea8f
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commit-tests.sh
View File

@@ -23,7 +23,7 @@ RESULT=$?
# make sure full config is ok # make sure full config is ok
echo -e "\n\nTesting full config as well...\n\n" 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=$?
[ $RESULT -ne 0 ] && echo -e "\n\nFull config ./configure failed" && exit 1 [ $RESULT -ne 0 ] && echo -e "\n\nFull config ./configure failed" && exit 1

14
examples/server/server.c
View File

@@ -309,13 +309,13 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
CloseSocket(sockfd); CloseSocket(sockfd);
SSL_set_fd(ssl, clientfd); SSL_set_fd(ssl, clientfd);
#ifdef NO_PSK if (usePsk == 0) {
#if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA) #if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA)
CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM); CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM);
#else #else
SetDH(ssl); /* will repick suites with DHE, higher priority than PSK */ SetDH(ssl); /* repick suites with DHE, higher priority than PSK */
#endif #endif
#endif }
#ifndef CYASSL_CALLBACKS #ifndef CYASSL_CALLBACKS
if (nonBlocking) { if (nonBlocking) {

2
src/internal.c
View File

@@ -6904,7 +6904,7 @@ int SetCipherList(Suites* s, const char* list)
return SetCipherSpecs(ssl); return SetCipherSpecs(ssl);
} }
else { else {
CYASSL_MSG("Coult not verify suite validity, continue"); CYASSL_MSG("Could not verify suite validity, continue");
} }
} }