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

turn off DTLSv1 functions for disable old tls

Browse Source
This commit is contained in:
toddouska
2015-04-08 13:29:25 -07:00
parent 0722e79627
commit 86f2b9a98f
6 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/client/client.c
View File

@@ -495,9 +495,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif #endif
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
#ifndef NO_OLD_TLS
case -1: case -1:
method = wolfDTLSv1_client_method(); method = wolfDTLSv1_client_method();
break; break;
#endif
case -2: case -2:
method = wolfDTLSv1_2_client_method(); method = wolfDTLSv1_2_client_method();

2
examples/echoclient/echoclient.c
View File

@@ -108,7 +108,7 @@ void echoclient_test(void* args)
#endif #endif
#if defined(CYASSL_DTLS) #if defined(CYASSL_DTLS)
method = DTLSv1_client_method(); method = DTLSv1_2_client_method();
#elif !defined(NO_TLS) #elif !defined(NO_TLS)
method = CyaSSLv23_client_method(); method = CyaSSLv23_client_method();
#else #else

2
examples/echoserver/echoserver.c
View File

@@ -134,7 +134,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
tcp_listen(&sockfd, &port, useAnyAddr, doDTLS); tcp_listen(&sockfd, &port, useAnyAddr, doDTLS);
#if defined(CYASSL_DTLS) #if defined(CYASSL_DTLS)
method = CyaDTLSv1_server_method(); method = CyaDTLSv1_2_server_method();
#elif !defined(NO_TLS) #elif !defined(NO_TLS)
method = CyaSSLv23_server_method(); method = CyaSSLv23_server_method();
#else #else

2
examples/server/server.c
View File

@@ -379,9 +379,11 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
#endif #endif
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS
#ifndef NO_OLD_TLS
case -1: case -1:
method = DTLSv1_server_method(); method = DTLSv1_server_method();
break; break;
#endif
case -2: case -2:
method = DTLSv1_2_server_method(); method = DTLSv1_2_server_method();

14
src/ssl.c
View File

@@ -5037,6 +5037,8 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl)
#endif #endif
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
#ifndef NO_OLD_TLS
WOLFSSL_METHOD* wolfDTLSv1_client_method(void) WOLFSSL_METHOD* wolfDTLSv1_client_method(void)
{ {
WOLFSSL_METHOD* method = WOLFSSL_METHOD* method =
@@ -5047,6 +5049,7 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl)
InitSSL_Method(method, MakeDTLSv1()); InitSSL_Method(method, MakeDTLSv1());
return method; return method;
} }
#endif /* NO_OLD_TLS */
WOLFSSL_METHOD* wolfDTLSv1_2_client_method(void) WOLFSSL_METHOD* wolfDTLSv1_2_client_method(void)
{ {
@@ -5315,11 +5318,13 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl)
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
#ifndef NO_OLD_TLS
WOLFSSL_METHOD* wolfDTLSv1_server_method(void) WOLFSSL_METHOD* wolfDTLSv1_server_method(void)
{ {
WOLFSSL_METHOD* method = WOLFSSL_METHOD* method =
(WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), 0, (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD),
DYNAMIC_TYPE_METHOD); 0, DYNAMIC_TYPE_METHOD);
WOLFSSL_ENTER("DTLSv1_server_method"); WOLFSSL_ENTER("DTLSv1_server_method");
if (method) { if (method) {
InitSSL_Method(method, MakeDTLSv1()); InitSSL_Method(method, MakeDTLSv1());
@@ -5327,12 +5332,13 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl)
} }
return method; return method;
} }
#endif /* NO_OLD_TLS */
WOLFSSL_METHOD* wolfDTLSv1_2_server_method(void) WOLFSSL_METHOD* wolfDTLSv1_2_server_method(void)
{ {
WOLFSSL_METHOD* method = WOLFSSL_METHOD* method =
(WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), 0, (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD),
DYNAMIC_TYPE_METHOD); 0, DYNAMIC_TYPE_METHOD);
WOLFSSL_ENTER("DTLSv1_2_server_method"); WOLFSSL_ENTER("DTLSv1_2_server_method");
if (method) { if (method) {
InitSSL_Method(method, MakeDTLSv1_2()); InitSSL_Method(method, MakeDTLSv1_2());

2
tests/api.c
View File

@@ -113,8 +113,10 @@ static void test_wolfSSL_Method_Allocators(void)
TEST_VALID_METHOD_ALLOCATOR(wolfSSLv23_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfSSLv23_client_method);
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
#ifndef NO_OLD_TLS
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method);
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_client_method);
#endif
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_server_method);
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_client_method);
#endif #endif