diff options
| author | Michael Demeter <michael.demeter@intel.com> | 2014-01-06 15:47:34 -0800 |
|---|---|---|
| committer | Michael Demeter <michael.demeter@intel.com> | 2014-01-06 15:47:34 -0800 |
| commit | 975084c3fdbacd5f8a3c626171be8d4df27b2ac5 (patch) | |
| tree | 7f18b115ac927b799ebfe55335282130047b3ec6 /ssl/d1_both.c | |
| parent | 37a8d409f8ffc065c1b1417f0f3b5ba050e8aa95 (diff) | |
| download | openssl-975084c3fdbacd5f8a3c626171be8d4df27b2ac5.tar.gz openssl-975084c3fdbacd5f8a3c626171be8d4df27b2ac5.tar.bz2 openssl-975084c3fdbacd5f8a3c626171be8d4df27b2ac5.zip | |
Imported Upstream version 1.0.1fupstream/1.0.1f
Diffstat (limited to 'ssl/d1_both.c')
| -rw-r--r-- | ssl/d1_both.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index de8bab8..7a5596a 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -214,6 +214,12 @@ dtls1_hm_fragment_new(unsigned long frag_len, int reassembly) static void dtls1_hm_fragment_free(hm_fragment *frag) { + + if (frag->msg_header.is_ccs) + { + EVP_CIPHER_CTX_free(frag->msg_header.saved_retransmit_state.enc_write_ctx); + EVP_MD_CTX_destroy(frag->msg_header.saved_retransmit_state.write_hash); + } if (frag->fragment) OPENSSL_free(frag->fragment); if (frag->reassembly) OPENSSL_free(frag->reassembly); OPENSSL_free(frag); @@ -313,9 +319,10 @@ int dtls1_do_write(SSL *s, int type) s->init_off -= DTLS1_HM_HEADER_LENGTH; s->init_num += DTLS1_HM_HEADER_LENGTH; - /* write atleast DTLS1_HM_HEADER_LENGTH bytes */ - if ( len <= DTLS1_HM_HEADER_LENGTH) - len += DTLS1_HM_HEADER_LENGTH; + if ( s->init_num > curr_mtu) + len = curr_mtu; + else + len = s->init_num; } dtls1_fix_message_header(s, frag_off, |