提交 cf0113eb 编写于 作者: M Matt Caswell

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: NTim Hudson <tjh@openssl.org>
上级 3d866ea6
...@@ -258,12 +258,14 @@ IMPLEMENT_ssl3_meth_func(SSLv3_client_method, ...@@ -258,12 +258,14 @@ IMPLEMENT_ssl3_meth_func(SSLv3_client_method,
*/ */
static const SSL_METHOD *dtls1_get_method(int ver) static const SSL_METHOD *dtls1_get_method(int ver)
{ {
if (ver == DTLS1_VERSION) if (ver == DTLS_ANY_VERSION)
return (DTLSv1_method()); return DTLS_method();
else if (ver == DTLS1_VERSION)
return DTLSv1_method();
else if (ver == DTLS1_2_VERSION) else if (ver == DTLS1_2_VERSION)
return (DTLSv1_2_method()); return DTLSv1_2_method();
else else
return (NULL); return NULL;
} }
IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
...@@ -291,12 +293,14 @@ IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, ...@@ -291,12 +293,14 @@ IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
static const SSL_METHOD *dtls1_get_server_method(int ver) static const SSL_METHOD *dtls1_get_server_method(int ver)
{ {
if (ver == DTLS1_VERSION) if (ver == DTLS_ANY_VERSION)
return (DTLSv1_server_method()); return DTLS_server_method();
else if (ver == DTLS1_VERSION)
return DTLSv1_server_method();
else if (ver == DTLS1_2_VERSION) else if (ver == DTLS1_2_VERSION)
return (DTLSv1_2_server_method()); return DTLSv1_2_server_method();
else else
return (NULL); return NULL;
} }
IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
...@@ -324,12 +328,14 @@ IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, ...@@ -324,12 +328,14 @@ IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
static const SSL_METHOD *dtls1_get_client_method(int ver) static const SSL_METHOD *dtls1_get_client_method(int ver)
{ {
if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER) if (ver == DTLS_ANY_VERSION)
return (DTLSv1_client_method()); return DTLS_client_method();
else if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)
return DTLSv1_client_method();
else if (ver == DTLS1_2_VERSION) else if (ver == DTLS1_2_VERSION)
return (DTLSv1_2_client_method()); return DTLSv1_2_client_method();
else else
return (NULL); return NULL;
} }
IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册