Fix EAPOL_KEY

Author: gpotter2

scapy/layers/eap.py

@@ -441,33 +441,30 @@ class EAPOL_KEY(Packet):
     fields_desc = [
         ByteEnumField("key_descriptor_type", 1, {1: "RC4", 2: "RSN"}),
         # Key Information
+        BitField("res2", 0, 2),
+        BitField("smk_message", 0, 1),
+        BitField("encrypted_key_data", 0, 1),
+        BitField("request", 0, 1),
+        BitField("error", 0, 1),
+        BitField("secure", 0, 1),
+        BitField("has_key_mic", 1, 1),
+        BitField("key_ack", 0, 1),
+        BitField("install", 0, 1),
+        BitField("res", 0, 2),
+        BitEnumField("key_type", 0, 1, {0: "Group/SMK", 1: "Pairwise"}),
         BitEnumField("key_descriptor_type_version", 0, 3, {
             1: "HMAC-MD5+ARC4",
             2: "HMAC-SHA1-128+AES-128",
             3: "AES-128-CMAC+AES-128",
         }),
-        BitEnumField("key_type", 0, 1, {0: "Group/SMK", 1: "Pairwise"}),
-        BitField("res", 0, 2),
-        BitField("install", 0, 1),
-        BitField("key_ack", 0, 1),
-        BitField("has_key_mic", 1, 1),
-        BitField("secure", 0, 1),
-        BitField("error", 0, 1),
-        BitField("request", 0, 1),
-        BitField("encrypted_key_data", 0, 1),
-        BitField("smk_message", 0, 1),
-        BitField("res2", 0, 2),
         #
         LenField("len", None, "H"),
         LongField("key_replay_counter", 0),
         XStrFixedLenField("key_nonce", "", 32),
         XStrFixedLenField("key_iv", "", 16),
         XStrFixedLenField("key_rsc", "", 8),
         XStrFixedLenField("key_id", "", 8),
-        ConditionalField(
-            XStrFixedLenField("key_mic", "", 16),  # XXX size can be 24
-            lambda pkt: pkt.has_key_mic
-        ),
+        XStrFixedLenField("key_mic", "", 16),  # XXX size can be 24
         LenField("key_length", None, "H"),
         XStrLenField("key", "",
                      length_from=lambda pkt: pkt.key_length)

test/scapy/layers/eap.uts

@@ -60,9 +60,10 @@ assert eapol.haslayer(EAP_FAST)
 s = b'\x08\x02:\x01\x00\xc0\xcab\xa4\xf6\x00"k\xfbI+\x00"k\xfbI+\xa0[\xaa\xaa\x03\x00\x00\x00\x88\x8e\x02\x03\x00u\x02\x00\x8a\x00\x10\x00\x00\x00\x00\x00\x00\x00\x04\x95X{I5\':3\x8f\x90\xb1I\xae\x1f\xd7-"\x82\x1e\\$\xefC=\x83\x97?M\xd6\xdf>\x9b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x16\xdd\x14\x00\x0f\xac\x04\x03\xca?d\xca\xed\xdd\xef\xf69;\xefX\xd4\x97w'
 wifi = Dot11(s)
 assert wifi[EAPOL].key_descriptor_type == 2
-assert wifi[EAPOL].key_type == 0
-assert wifi[EAPOL].has_key_mic == 1
-assert wifi[EAPOL].encrypted_key_data == 1
+assert wifi[EAPOL].encrypted_key_data == 0
+assert wifi[EAPOL].key_ack == 1
+assert wifi[EAPOL].key_type == 1
+assert wifi[EAPOL].key_descriptor_type_version == 2
 assert wifi[EAPOL].key_replay_counter == 4
 assert wifi[EAPOL].key_mic == b"\x00" * 16
 assert wifi[EAPOL].key_length == 22