Skip to content

Fix branch 1668 #1684

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

Closed
wants to merge 3 commits into from
Closed

Fix branch 1668 #1684

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57b95cd
handle the case if in TLS, extension 'supported_versions' is malformed
vincae-dalean Nov 4, 2018
ab62292
handle the case if in TLS, extension 'supported_versions' is malformed
vincae-dalean Nov 4, 2018
9393591
Added extension supported_versions for the handshake helloserver of t…
vincae-dalean Nov 13, 2018
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
13 changes: 13 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 @@ -525,6 +525,16 @@ class TLS_Ext_SupportedVersions(TLS_Ext_Unknown):
length_from=lambda pkt: pkt.versionslen)]


class TLS_Ext_SupportedVersions_Server(TLS_Ext_Unknown):
name = "TLS Extension - Supported Versions"
fields_desc = [ShortEnumField("type", 0x2b, _tls_ext),
ShortField("len", None),
FieldListField("versions", [],
ShortEnumField("version", None,
_tls_version),
length_from=lambda pkt: 2)]


class TLS_Ext_Cookie(TLS_Ext_Unknown):
name = "TLS Extension - Cookie"
fields_desc = [ShortEnumField("type", 0x2c, _tls_ext),
Expand Down Expand Up @@ -688,12 +698,15 @@ def m2i(self, pkt, m):
t = struct.unpack("!H", m[:2])[0]
tmp_len = struct.unpack("!H", m[2:4])[0]
cls = _tls_ext_cls.get(t, TLS_Ext_Unknown)
from scapy.layers.tls.handshake import TLSServerHello
if cls is TLS_Ext_KeyShare:
from scapy.layers.tls.keyexchange_tls13 import _tls_ext_keyshare_cls # noqa: E501
cls = _tls_ext_keyshare_cls.get(pkt.msgtype, TLS_Ext_Unknown)
elif cls is TLS_Ext_PreSharedKey:
from scapy.layers.tls.keyexchange_tls13 import _tls_ext_presharedkey_cls # noqa: E501
cls = _tls_ext_presharedkey_cls.get(pkt.msgtype, TLS_Ext_Unknown) # noqa: E501
elif self.owners[0] is TLSServerHello and cls is TLS_Ext_SupportedVersions: # noqa: E501
cls = TLS_Ext_SupportedVersions_Server
res.append(cls(m[:tmp_len + 4], tls_session=pkt.tls_session))
m = m[tmp_len + 4:]
return res