Skip to content

Fix corruption of certain packets containing invalid TLS extension fields #4554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Fix corruption of certain packets containing invalid TLS extension fields #4554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40c824e
Fix corruption of certain packets with invalid TLS extension fields
arjunbhat1 Oct 3, 2024
6cc0246
Use idioms
gpotter2 Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions scapy/layers/tls/extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,4 +843,6 @@ def m2i(self, pkt, m):
cls = _tls_ext_early_data_cls.get(pkt.msgtype, TLS_Ext_Unknown)
res.append(cls(m[:tmp_len + 4], tls_session=pkt.tls_session))
m = m[tmp_len + 4:]
if m:
res.append(conf.raw_layer(m))
return res
5 changes: 5 additions & 0 deletions test/scapy/layers/tls/tls.uts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,6 +1561,11 @@ data = '1603031616020000660303602161b58e22f4966f18f9aa6afd5759f343935ed437cf09c5
pkt = TLS(bytes.fromhex(data))
assert [type(x) for x in pkt.msg] == [TLSServerHello, TLSCertificate, TLSCertificateStatus, TLSServerKeyExchange, TLSServerHelloDone]

= Issue 3853
data = hex_bytes("16030300360200002e030342615f0b32366c85b5de265ec99fd68c59079d9783dc2f547592fe12f4ab3fde00c02c000015ff01000100000e000000")
tls_packet = TLS(data)
assert raw(tls_packet) == data

###############################################################################
############################ Automaton behaviour ##############################
###############################################################################
Expand Down