generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 2089

Browse Source 
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Approved by: steve@openssl.org

DTLS Fragment size bug fix.
This commit is contained in:
Dr. Stephen Henson 2009-11-02 13:36:56 +00:00
parent 8164930816
commit 9f81ffe433
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssl/d1_both.c
View File

@ -177,7 +177,7 @@ int dtls1_do_write(SSL *s, int type)
{ {
int ret; int ret;
int curr_mtu; int curr_mtu;
unsigned int len, frag_off; unsigned int len, frag_off, mac_size, blocksize;
/* AHA! Figure out the MTU, and stick to the right size */ /* AHA! Figure out the MTU, and stick to the right size */
if ( ! (SSL_get_options(s) & SSL_OP_NO_QUERY_MTU)) if ( ! (SSL_get_options(s) & SSL_OP_NO_QUERY_MTU))
@ -225,11 +225,22 @@ int dtls1_do_write(SSL *s, int type)
OPENSSL_assert(s->init_num == OPENSSL_assert(s->init_num ==
(int)s->d1->w_msg_hdr.msg_len + DTLS1_HM_HEADER_LENGTH); (int)s->d1->w_msg_hdr.msg_len + DTLS1_HM_HEADER_LENGTH);
if (s->write_hash)
mac_size = EVP_MD_CTX_size(s->write_hash);
else
mac_size = 0;
if (s->enc_write_ctx &&
(EVP_CIPHER_mode( s->enc_write_ctx->cipher) & EVP_CIPH_CBC_MODE))
blocksize = 2 * EVP_CIPHER_block_size(s->enc_write_ctx->cipher);
else
blocksize = 0;
frag_off = 0; frag_off = 0;
while( s->init_num) while( s->init_num)
{ {
curr_mtu = s->d1->mtu - BIO_wpending(SSL_get_wbio(s)) - curr_mtu = s->d1->mtu - BIO_wpending(SSL_get_wbio(s)) -
DTLS1_RT_HEADER_LENGTH; DTLS1_RT_HEADER_LENGTH - mac_size - blocksize;
if ( curr_mtu <= DTLS1_HM_HEADER_LENGTH) if ( curr_mtu <= DTLS1_HM_HEADER_LENGTH)
{ {
@ -237,7 +248,8 @@ int dtls1_do_write(SSL *s, int type)
ret = BIO_flush(SSL_get_wbio(s)); ret = BIO_flush(SSL_get_wbio(s));
if ( ret <= 0) if ( ret <= 0)
return ret; return ret;
curr_mtu = s->d1->mtu - DTLS1_RT_HEADER_LENGTH; curr_mtu = s->d1->mtu - DTLS1_RT_HEADER_LENGTH -
mac_size - blocksize;
} }
if ( s->init_num > curr_mtu) if ( s->init_num > curr_mtu)