From: Matt Caswell <matt@openssl.org>
Date: Tue, 22 Nov 2016 16:16:23 +0000 (+0000)
Subject: Fix a bug in TLSProxy where zero length messages were not being recorded
X-Git-Tag: OpenSSL_1_1_0d~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bc3bcb34946933bf14c7d8df3cc646f5f977160;p=thirdparty%2Fopenssl.git

Fix a bug in TLSProxy where zero length messages were not being recorded

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1983)
---

diff --git a/util/TLSProxy/Message.pm b/util/TLSProxy/Message.pm
index 1810d8c30ec..0821bdedd32 100644
--- a/util/TLSProxy/Message.pm
+++ b/util/TLSProxy/Message.pm
@@ -171,7 +171,7 @@ sub get_messages
                 $recoffset += 4;
                 $payload = "";
                 
-                if ($recoffset < $record->decrypt_len) {
+                if ($recoffset <= $record->decrypt_len) {
                     #Some payload data is present in this record
                     if ($record->decrypt_len - $recoffset >= $messlen) {
                         #We can complete the message with this record