diff options
| author | jkim <jkim@FreeBSD.org> | 2014-01-22 19:57:11 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-01-22 19:57:11 +0000 |
| commit | a8c44ea5cfb6806cb801d126e1ff9c11bdc9a006 (patch) | |
| tree | 4c8798ce163b45133d4f5fb5c859c7235ff5efea /crypto/openssl/ssl/d1_both.c | |
| parent | cc5aa413b410def9b593403149c8a185bc8008b1 (diff) | |
| download | FreeBSD-src-a8c44ea5cfb6806cb801d126e1ff9c11bdc9a006.zip FreeBSD-src-a8c44ea5cfb6806cb801d126e1ff9c11bdc9a006.tar.gz | |
Merge OpenSSL 1.0.1f.
Approved by: so (delphij), benl (silence)
Diffstat (limited to 'crypto/openssl/ssl/d1_both.c')
| -rw-r--r-- | crypto/openssl/ssl/d1_both.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssl/ssl/d1_both.c b/crypto/openssl/ssl/d1_both.c index 4c8c77f..7a5596a 100644 --- a/crypto/openssl/ssl/d1_both.c +++ b/crypto/openssl/ssl/d1_both.c @@ -319,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, |
