diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c index 1629b4d..bb34272 100644 --- a/lib/gnutls_cipher.c +++ b/lib/gnutls_cipher.c @@ -87,16 +87,11 @@ _gnutls_encrypt (gnutls_session_t session, const opaque * headers, gnutls_datum_t comp; int ret; int free_comp = 1; - record_parameters_st *cur_record_params; - - ret = _gnutls_epoch_get (session, EPOCH_WRITE_CURRENT, &cur_record_params); - if (ret < 0) - return gnutls_assert_val(ret); plain.data = (opaque *) data; plain.size = data_size; - if (plain.size == 0 || is_write_comp_null (cur_record_params) == 0) + if (plain.size == 0 || is_write_comp_null (params) == 0) { comp = plain; free_comp = 0; @@ -145,11 +140,6 @@ _gnutls_decrypt (gnutls_session_t session, opaque * ciphertext, gnutls_datum_t gtxt; gnutls_datum_t gcipher; int ret; - record_parameters_st *cur_record_params; - - ret = _gnutls_epoch_get (session, EPOCH_READ_CURRENT, &cur_record_params); - if (ret < 0) - return gnutls_assert_val(ret); if (ciphertext_size == 0) return 0; @@ -165,7 +155,7 @@ _gnutls_decrypt (gnutls_session_t session, opaque * ciphertext, return ret; } - if (ret == 0 || is_read_comp_null (cur_record_params) == 0) + if (ret == 0 || is_read_comp_null (params) == 0) { /* ret == ret */ @@ -195,7 +185,7 @@ _gnutls_decrypt (gnutls_session_t session, opaque * ciphertext, } /* This check is not really needed */ - if (max_data_size < MAX_RECORD_RECV_SIZE(session)) + if (max_data_size < ciphertext_size + EXTRA_COMP_SIZE) { _gnutls_free_datum (>xt); return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);