Merge pull request #4131 from randombit/jack/fix-tls-cbc-iterator-debug

Fix some possible iterator debugging errors in TLS-CBC
randombit · Jun 17, 2024 · d6b35ca · d6b35ca
2 parents a629e8e + 301f2a0
commit d6b35ca
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/lib/tls/tls12/tls_cbc/tls_cbc.cpp b/src/lib/tls/tls12/tls_cbc/tls_cbc.cpp
@@ -198,7 +198,9 @@ void TLS_CBC_HMAC_AEAD_Encryption::finish_msg(secure_vector<uint8_t>& buffer, si
 
    buffer.reserve(offset + msg_size + padding_length + tag_size());
    buffer.resize(offset + msg_size);
-   copy_mem(&buffer[offset], msg().data(), msg_size);
+   if(msg_size > 0) {
+      copy_mem(&buffer[offset], msg().data(), msg_size);
+   }
 
    mac().update(assoc_data());
 
@@ -212,7 +214,9 @@ void TLS_CBC_HMAC_AEAD_Encryption::finish_msg(secure_vector<uint8_t>& buffer, si
       buffer.resize(buffer.size() + tag_size());
       mac().final(&buffer[buffer.size() - tag_size()]);
    } else {
-      mac().update(&buffer[offset], msg_size);
+      if(msg_size > 0) {
+         mac().update(&buffer[offset], msg_size);
+      }
       buffer.resize(buffer.size() + tag_size());
       mac().final(&buffer[buffer.size() - tag_size()]);
       cbc_encrypt_record(buffer, offset, padding_length);