wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:wolfSSL/wolfssl

Browse Source
This commit is contained in:
John Safranek
2015-04-01 13:39:30 -07:00
parent 3039d16e09 8dd1afb49c
commit b5a1cd186f
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -327,6 +327,12 @@ AC_ARG_ENABLE([sniffer],
[ ENABLED_SNIFFER=no ] [ ENABLED_SNIFFER=no ]
) )
# sniffer does't work in maxstrength mode
if test "$ENABLED_SNIFFER" = "yes" && test "$ENABLED_MAXSTRENGTH" = "yes"
then
AC_MSG_ERROR([cannot enable maxstrength in sniffer mode.])
fi
ENABLED_SNIFFTEST=no ENABLED_SNIFFTEST=no
AS_IF([ test "x$ENABLED_SNIFFER" = "xyes" ], AS_IF([ test "x$ENABLED_SNIFFER" = "xyes" ],
[ [

9
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) {
@@ -609,8 +609,13 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
if (!usePsk && !useAnon) { if (!usePsk && !useAnon) {
if (wolfSSL_CTX_load_verify_locations(ctx, verifyCert,0) != SSL_SUCCESS) if (wolfSSL_CTX_load_verify_locations(ctx, verifyCert,0) != SSL_SUCCESS)
err_sys("can't load ca file, Please run from wolfSSL home dir"); err_sys("can't load ca file, Please run from wolfSSL home dir");
#ifdef HAVE_ECC
/* load ecc verify too, echoserver uses it by default w/ ecc */
if (wolfSSL_CTX_load_verify_locations(ctx, eccCert, 0) != SSL_SUCCESS)
err_sys("can't load ecc ca file, Please run from wolfSSL home dir");
#endif /* HAVE_ECC */
} }
#endif #endif /* !NO_FILESYSTEM && !NO_CERTS */
#if !defined(NO_CERTS) #if !defined(NO_CERTS)
if (!usePsk && !useAnon && doPeerCheck == 0) if (!usePsk && !useAnon && doPeerCheck == 0)
wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0); wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);

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)