diff options
| author | Matt Caswell <matt@openssl.org> | 2014-12-01 23:57:44 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-12-03 09:35:25 +0000 |
| commit | d68aade28a18636c815f35a8803d32b52fb3e916 (patch) | |
| tree | ce367aea58296c65da36d799fa15f332d346ac70 | |
| parent | 3242e5938be7273948ea959138b614de5e118515 (diff) | |
Updates to s_client and s_server to remove the constant 28 (for IPv4 header
and UDP header) when setting an mtu. This constant is not always correct (e.g.
if using IPv6). Use the new DTLS_CTRL functions instead.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 464ce92026bd0c79186cbefa75470f39607110be)
| -rw-r--r-- | apps/s_client.c | 16 | ||||
| -rw-r--r-- | apps/s_server.c | 18 |
2 files changed, 30 insertions, 4 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index a156e2f9ff..8b96b407d0 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1321,10 +1321,22 @@ re_start: BIO_ctrl(sbio, BIO_CTRL_DGRAM_SET_SEND_TIMEOUT, 0, &timeout); } - if (socket_mtu > 28) + if (socket_mtu) { + if(socket_mtu < DTLS_get_link_min_mtu(con)) + { + BIO_printf(bio_err,"MTU too small. Must be at least %ld\n", + DTLS_get_link_min_mtu(con)); + BIO_free(sbio); + goto shut; + } SSL_set_options(con, SSL_OP_NO_QUERY_MTU); - SSL_set_mtu(con, socket_mtu - 28); + if(!DTLS_set_link_mtu(con, socket_mtu)) + { + BIO_printf(bio_err, "Failed to set MTU\n"); + BIO_free(sbio); + goto shut; + } } else /* want to do MTU discovery */ diff --git a/apps/s_server.c b/apps/s_server.c index 4ff30d862e..f47328ab35 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2051,10 +2051,24 @@ static int sv_body(char *hostname, int s, unsigned char *context) BIO_ctrl(sbio, BIO_CTRL_DGRAM_SET_SEND_TIMEOUT, 0, &timeout); } - if (socket_mtu > 28) + if (socket_mtu) { + if(socket_mtu < DTLS_get_link_min_mtu(con)) + { + BIO_printf(bio_err,"MTU too small. Must be at least %ld\n", + DTLS_get_link_min_mtu(con)); + ret = -1; + BIO_free(sbio); + goto err; + } SSL_set_options(con, SSL_OP_NO_QUERY_MTU); - SSL_set_mtu(con, socket_mtu - 28); + if(!DTLS_set_link_mtu(con, socket_mtu)) + { + BIO_printf(bio_err, "Failed to set MTU\n"); + ret = -1; + BIO_free(sbio); + goto err; + } } else /* want to do MTU discovery */ |