diff --git a/scapy/layers/l2.py b/scapy/layers/l2.py index 252d8a22c49092693b8bce794a75e47db7873fa0..d5032ef7660dece40c0d45b804faef00c3ee2b67 100644 --- a/scapy/layers/l2.py +++ b/scapy/layers/l2.py @@ -539,11 +539,12 @@ class EAP_MD5(EAP): ByteEnumField("code", 1, eap_codes), ByteField("id", 0), FieldLenField("len", None, fmt="H", length_of="optional_name", - adjust=lambda p, x: x + p.value_size + 6), + adjust=lambda p, x: (x + p.value_size + 6) if p.value_size is not None else 6), ByteEnumField("type", 4, eap_types), - FieldLenField("value_size", 0, fmt="B", length_of="value"), + FieldLenField("value_size", None, fmt="B", length_of="value"), XStrLenField("value", '', length_from=lambda p: p.value_size), - XStrLenField("optional_name", '', length_from=lambda p: p.len - p.value_size - 6) + XStrLenField("optional_name", '', + length_from=lambda p: (p.len - p.value_size - 6) if p.len is not None and p.value_size is not None else 0) ] @@ -564,7 +565,8 @@ class EAP_TLS(EAP): BitField('S', 0, 1), BitField('reserved', 0, 5), ConditionalField(IntField('tls_message_len', 0), lambda pkt: pkt.L == 1), - XStrLenField('tls_data', '', length_from=lambda pkt: pkt.len - 10 if pkt.L == 1 else pkt.len - 6) + XStrLenField('tls_data', '', + length_from=lambda pkt: pkt.len - 10 if pkt.len is not None and pkt.L == 1 else pkt.len - 6 if pkt.len is not None else 0) ] @@ -587,7 +589,8 @@ class EAP_FAST(EAP): BitField('reserved', 0, 2), BitField('version', 0, 3), ConditionalField(IntField('message_len', 0), lambda pkt: pkt.L == 1), - XStrLenField('data', '', length_from=lambda pkt: pkt.len - 10 if pkt.L == 1 else pkt.len - 6) + XStrLenField('data', '', + length_from=lambda pkt: pkt.len - 10 if pkt.len is not None and pkt.L == 1 else pkt.len - 6 if pkt.len is not None else 0) ]