Commit 0c0f1361 authored by Matt Caswell's avatar Matt Caswell
Browse files

Ensure the dtls1_get_*_methods work with DTLS_ANY_VERSION 



The various dtls1_get*_methods did not handle the DTLS_ANY_VERSION case,
so this needed to be added.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent ca3658e0

ssl/d1_clnt.c

+8 −6
Original line number Diff line number Diff line
@@ -133,12 +133,14 @@ static int dtls1_get_hello_verify(SSL *s); 


static const SSL_METHOD *dtls1_get_client_method(int ver)

{

    if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)

        return (DTLSv1_client_method());

    if (ver == DTLS_ANY_VERSION)

        return DTLS_client_method();

    else if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)

        return DTLSv1_client_method();

    else if (ver == DTLS1_2_VERSION)

        return (DTLSv1_2_client_method());

        return DTLSv1_2_client_method();

    else

        return (NULL);

        return NULL;

}



IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,

ssl/d1_meth.c

+8 −6
Original line number Diff line number Diff line
@@ -64,12 +64,14 @@ 
static const SSL_METHOD *dtls1_get_method(int ver);

static const SSL_METHOD *dtls1_get_method(int ver)

{

    if (ver == DTLS1_VERSION)

        return (DTLSv1_method());

    if (ver == DTLS_ANY_VERSION)

        return DTLS_method();

    else if (ver == DTLS1_VERSION)

        return DTLSv1_method();

    else if (ver == DTLS1_2_VERSION)

        return (DTLSv1_2_method());

        return DTLSv1_2_method();

    else

        return (NULL);

        return NULL;

}



IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,

ssl/d1_srvr.c

+8 −6
Original line number Diff line number Diff line
@@ -131,12 +131,14 @@ static int dtls1_send_hello_verify_request(SSL *s); 


static const SSL_METHOD *dtls1_get_server_method(int ver)

{

    if (ver == DTLS1_VERSION)

        return (DTLSv1_server_method());

    if (ver == DTLS_ANY_VERSION)

        return DTLS_server_method();

    else if (ver == DTLS1_VERSION)

        return DTLSv1_server_method();

    else if (ver == DTLS1_2_VERSION)

        return (DTLSv1_2_server_method());

        return DTLSv1_2_server_method();

    else

        return (NULL);

        return NULL;

}



IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,