Merge branch 'master' into ti

2014-05-30 16:57:15 -07:00
parent 086b987efe 5b7a5fe0bb
commit a920795665
10 changed files with 1029 additions and 8 deletions
@@ -484,7 +484,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
        CloseSocket(sockfd);

    SSL_set_fd(ssl, clientfd);
-    if (usePsk == 0) {
+    if (usePsk == 0 || cipherList != NULL) {
        #if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA)
            CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM);
        #elif !defined(NO_CERTS)