From 59b60ae600df11a374abc15d8cd5b3b3c270a646 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Sat, 29 Jun 2019 12:29:33 +0200 Subject: [PATCH] Revert small part of #1986 --- scapy/layers/tls/record.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scapy/layers/tls/record.py b/scapy/layers/tls/record.py index 758c2e8f689..9a4925900b9 100644 --- a/scapy/layers/tls/record.py +++ b/scapy/layers/tls/record.py @@ -485,7 +485,8 @@ def pre_dissect(self, s): frag = self._tls_decompress(cfrag) - if decryption_success: + if (decryption_success and + not isinstance(self.tls_session.rcs.cipher, Cipher_NULL)): self.deciphered_len = len(frag) else: self.deciphered_len = None