build: remove MAX_RECORD_SEND_SIZE in favor of max_record_send_size

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/cipher.c b/lib/cipher.c
index 28eafbe1883cb91d7b052bbff277bfcbd543b96b..3cbf63841bfef5210938bfa393eb3632778f7470 100644 (file)
--- a/lib/cipher.c
+++ b/lib/cipher.c
@@ -460,7 +460,8 @@ encrypt_packet_tls13(gnutls_session_t session,
        _gnutls_write_uint64(params->write.sequence_number, &nonce[iv_size-8]);
        memxor(nonce, params->write.iv, iv_size);
 
-       max = MAX_RECORD_SEND_SIZE(session);
+       max = max_record_send_size(session) +
+               MAX_RECORD_SEND_OVERHEAD(session);
 
        /* make TLS 1.3 form of data */
        total = plain->size + 1 + pad_size;

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 19da7fcee8dc042dbe45c1b59f827e8c6d69938e..8ebf6b8e3565f35f4623cce18944ec83730fa987 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -197,9 +197,6 @@ typedef enum record_send_state_t {
  * store more data than allowed.
  */
 #define MAX_RECORD_SEND_OVERHEAD(session) (MAX_CIPHER_BLOCK_SIZE/*iv*/+MAX_PAD_SIZE+MAX_HASH_SIZE/*MAC*/)
-#define MAX_RECORD_SEND_SIZE(session) (IS_DTLS(session)? \
-       (MIN((size_t)gnutls_dtls_get_mtu(session), (size_t)session->security_parameters.max_record_send_size+MAX_RECORD_SEND_OVERHEAD(session))): \
-       ((size_t)session->security_parameters.max_record_send_size+MAX_RECORD_SEND_OVERHEAD(session)))
 #define MAX_PAD_SIZE 255
 #define EXTRA_COMP_SIZE 2048
 
@@ -1600,9 +1597,7 @@ inline static int _gnutls_set_current_version(gnutls_session_t s, unsigned v)
 /* Returns the maximum amount of the plaintext to be sent, considering
  * both user-specified/negotiated maximum values.
  */
-inline static size_t max_record_send_size(gnutls_session_t session,
-                                         record_parameters_st *
-                                         record_params)
+inline static size_t max_record_send_size(gnutls_session_t session)
 {
        size_t max;
 

diff --git a/lib/range.c b/lib/range.c
index 041578c48ba45328c5b8cd1fe36704b11dcd1088..2b478da459e8fb983c4e4678a0cfb12293dbbbf6 100644 (file)
--- a/lib/range.c
+++ b/lib/range.c
@@ -66,7 +66,7 @@ _gnutls_range_max_lh_pad(gnutls_session_t session, ssize_t data_length,
                return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
        if (vers->tls13_sem) {
-               max_pad = max_record_send_size(session, record_params);
+               max_pad = max_record_send_size(session);
                fixed_pad = 2;
        } else {
                max_pad = MAX_PAD_SIZE;
@@ -182,7 +182,7 @@ gnutls_range_split(gnutls_session_t session,
        if (ret < 0)
                return gnutls_assert_val(ret);
 
-       max_frag = max_record_send_size(session, record_params);
+       max_frag = max_record_send_size(session);
 
        if (orig_high == orig_low) {
                int length = MIN(orig_high, max_frag);

diff --git a/lib/record.c b/lib/record.c
index 53adc830760ba1445c905381006891d724b01360..e5a630ed0d62c2e908e4e9655fa55dc412b69f11 100644 (file)
--- a/lib/record.c
+++ b/lib/record.c
@@ -494,7 +494,7 @@ _gnutls_send_tlen_int(gnutls_session_t session, content_type_t type,
                        return GNUTLS_E_INVALID_SESSION;
                }
 
-       max_send_size = max_record_send_size(session, record_params);
+       max_send_size = max_record_send_size(session);
 
        if (data_size > max_send_size) {
                if (IS_DTLS(session))
@@ -522,7 +522,8 @@ _gnutls_send_tlen_int(gnutls_session_t session, content_type_t type,
 
                /* now proceed to packet encryption
                 */
-               cipher_size = MAX_RECORD_SEND_SIZE(session);
+               cipher_size = max_record_send_size(session) +
+                       MAX_RECORD_SEND_OVERHEAD(session);
 
                bufel = _mbuffer_alloc_align16(cipher_size + CIPHER_SLACK_SIZE,
                        get_total_headers2(session, record_params));
@@ -2202,7 +2203,7 @@ ssize_t gnutls_record_send_file(gnutls_session_t session, int fd,
                }
        }
 
-       buf_len = MIN(count, MAX(max_record_send_size(session, NULL), 512));
+       buf_len = MIN(count, MAX(max_record_send_size(session), 512));
 
        buf = gnutls_malloc(buf_len);
        if (buf == NULL) {