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

allow sniffer play nice in ecc build

Browse Source
This commit is contained in:
toddouska
2015-04-01 12:14:48 -07:00
parent 11f65346bc
commit 869aeee6cb
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/client/client.c
View File

@@ -566,7 +566,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
wolfSSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack); wolfSSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack);
#endif #endif
#if defined(WOLFSSL_SNIFFER) && !defined(HAVE_NTRU) && !defined(HAVE_ECC) #if defined(WOLFSSL_SNIFFER)
if (cipherList == NULL) { if (cipherList == NULL) {
/* don't use EDH, can't sniff tmp keys */ /* don't use EDH, can't sniff tmp keys */
if (wolfSSL_CTX_set_cipher_list(ctx, "AES256-SHA256") != SSL_SUCCESS) { if (wolfSSL_CTX_set_cipher_list(ctx, "AES256-SHA256") != SSL_SUCCESS) {

2
examples/echoclient/echoclient.c
View File

@@ -130,7 +130,7 @@ void echoclient_test(void* args)
load_buffer(ctx, caCert, CYASSL_CA); load_buffer(ctx, caCert, CYASSL_CA);
#endif #endif
#if defined(CYASSL_SNIFFER) && !defined(HAVE_NTRU) && !defined(HAVE_ECC) #if defined(CYASSL_SNIFFER)
/* don't use EDH, can't sniff tmp keys */ /* don't use EDH, can't sniff tmp keys */
SSL_CTX_set_cipher_list(ctx, "AES256-SHA"); SSL_CTX_set_cipher_list(ctx, "AES256-SHA");
#endif #endif

4
examples/echoserver/echoserver.c
View File

@@ -160,7 +160,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load ntru key file, " err_sys("can't load ntru key file, "
"Please run from wolfSSL home dir"); "Please run from wolfSSL home dir");
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC) && !defined(CYASSL_SNIFFER)
/* ecc */ /* ecc */
if (CyaSSL_CTX_use_certificate_file(ctx, eccCert, SSL_FILETYPE_PEM) if (CyaSSL_CTX_use_certificate_file(ctx, eccCert, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
@@ -193,7 +193,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
} }
#endif #endif
#if defined(CYASSL_SNIFFER) && !defined(HAVE_NTRU) && !defined(HAVE_ECC) #if defined(CYASSL_SNIFFER)
/* don't use EDH, can't sniff tmp keys */ /* don't use EDH, can't sniff tmp keys */
CyaSSL_CTX_set_cipher_list(ctx, "AES256-SHA"); CyaSSL_CTX_set_cipher_list(ctx, "AES256-SHA");
#endif #endif

2
examples/server/server.c
View File

@@ -485,7 +485,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
} }
#endif #endif
#if defined(CYASSL_SNIFFER) && !defined(HAVE_NTRU) && !defined(HAVE_ECC) #if defined(CYASSL_SNIFFER)
/* don't use EDH, can't sniff tmp keys */ /* don't use EDH, can't sniff tmp keys */
if (cipherList == NULL) { if (cipherList == NULL) {
if (SSL_CTX_set_cipher_list(ctx, "AES256-SHA256") != SSL_SUCCESS) if (SSL_CTX_set_cipher_list(ctx, "AES256-SHA256") != SSL_SUCCESS)