diff --git a/examples/client/client.c b/examples/client/client.c index d7a5e82e9..cee776f57 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -495,9 +495,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #endif #ifdef WOLFSSL_DTLS + #ifndef NO_OLD_TLS case -1: method = wolfDTLSv1_client_method(); break; + #endif case -2: method = wolfDTLSv1_2_client_method(); diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c index ff754b7e8..594d146cf 100644 --- a/examples/echoclient/echoclient.c +++ b/examples/echoclient/echoclient.c @@ -108,7 +108,7 @@ void echoclient_test(void* args) #endif #if defined(CYASSL_DTLS) - method = DTLSv1_client_method(); + method = DTLSv1_2_client_method(); #elif !defined(NO_TLS) method = CyaSSLv23_client_method(); #else diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c index 49b3933d2..a8b1600dc 100644 --- a/examples/echoserver/echoserver.c +++ b/examples/echoserver/echoserver.c @@ -134,7 +134,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) tcp_listen(&sockfd, &port, useAnyAddr, doDTLS); #if defined(CYASSL_DTLS) - method = CyaDTLSv1_server_method(); + method = CyaDTLSv1_2_server_method(); #elif !defined(NO_TLS) method = CyaSSLv23_server_method(); #else diff --git a/examples/server/server.c b/examples/server/server.c index df248dd6e..17ad6ed48 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -379,9 +379,11 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #endif #ifdef CYASSL_DTLS + #ifndef NO_OLD_TLS case -1: method = DTLSv1_server_method(); break; + #endif case -2: method = DTLSv1_2_server_method(); diff --git a/src/ssl.c b/src/ssl.c index d907f443a..f6903707c 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -5037,6 +5037,8 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl) #endif #ifdef WOLFSSL_DTLS + + #ifndef NO_OLD_TLS WOLFSSL_METHOD* wolfDTLSv1_client_method(void) { WOLFSSL_METHOD* method = @@ -5047,6 +5049,7 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl) InitSSL_Method(method, MakeDTLSv1()); return method; } + #endif /* NO_OLD_TLS */ WOLFSSL_METHOD* wolfDTLSv1_2_client_method(void) { @@ -5315,11 +5318,13 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl) #ifdef WOLFSSL_DTLS + + #ifndef NO_OLD_TLS WOLFSSL_METHOD* wolfDTLSv1_server_method(void) { WOLFSSL_METHOD* method = - (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), 0, - DYNAMIC_TYPE_METHOD); + (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), + 0, DYNAMIC_TYPE_METHOD); WOLFSSL_ENTER("DTLSv1_server_method"); if (method) { InitSSL_Method(method, MakeDTLSv1()); @@ -5327,12 +5332,13 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl) } return method; } + #endif /* NO_OLD_TLS */ WOLFSSL_METHOD* wolfDTLSv1_2_server_method(void) { WOLFSSL_METHOD* method = - (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), 0, - DYNAMIC_TYPE_METHOD); + (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), + 0, DYNAMIC_TYPE_METHOD); WOLFSSL_ENTER("DTLSv1_2_server_method"); if (method) { InitSSL_Method(method, MakeDTLSv1_2()); diff --git a/tests/api.c b/tests/api.c index 6ccd80b7d..216a9addf 100644 --- a/tests/api.c +++ b/tests/api.c @@ -113,8 +113,10 @@ static void test_wolfSSL_Method_Allocators(void) TEST_VALID_METHOD_ALLOCATOR(wolfSSLv23_client_method); #ifdef WOLFSSL_DTLS - TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method); - TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_client_method); + #ifndef NO_OLD_TLS + TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method); + TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_client_method); + #endif TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_client_method); #endif