diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-11-22 22:28:38 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-11-22 22:32:43 +0100 |
| commit | 172ae00887559fa5ba9a3bdc41d9eccb4844b077 (patch) | |
| tree | 80ce59a46a2c06f9e5fce5db5f44229cb10de465 /lib/gnutls_record.c | |
| parent | 9e8f30bc0d2f2a8a20ef3bd93af1220e0b176a57 (diff) | |
| download | gnutls-172ae00887559fa5ba9a3bdc41d9eccb4844b077.tar.gz | |
Corrected bug which affected compressed records.
Less space was provided for decryption than the required
causing disconnection issues when compression was used.
The issue was pointed by Frank Zschockelt.
Also replaced the macros MAX_RECORD_RECV_SIZE and MAX_RECV_SIZE
with max_decrypted_size() and max_record_recv_size().
Diffstat (limited to 'lib/gnutls_record.c')
| -rw-r--r-- | lib/gnutls_record.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c index b597637884..68d868abad 100644 --- a/lib/gnutls_record.c +++ b/lib/gnutls_record.c @@ -1088,7 +1088,7 @@ static int recv_headers(gnutls_session_t session, content_type_t type, record_check_version(session, htype, record->version)) < 0) return gnutls_assert_val(ret); - if (record->length > MAX_RECV_SIZE(session)) { + if (record->length > max_record_recv_size(session)) { _gnutls_audit_log (session, "Received packet with illegal length: %u\n", (unsigned int) record->length); @@ -1195,9 +1195,11 @@ _gnutls_recv_in_buffers(gnutls_session_t session, content_type_t type, return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); /* We allocate the maximum possible to allow few compressed bytes to expand to a - * full record. + * full record. Moreover we add space for any pad and the MAC (in case + * they are encrypted). */ - decrypted = _mbuffer_alloc(record.length, record.length); + ret = max_decrypted_size(session) + MAX_PAD_SIZE + MAX_HASH_SIZE; + decrypted = _mbuffer_alloc(ret, ret); if (decrypted == NULL) return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); |