fixup! IKEv2: improve dissection of IKEv2 redirect notifications

secdev · Mar 5, 2023 · eb97f7b · eb97f7b
1 parent 1fd673b
commit eb97f7b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/scapy/contrib/ikev2.py b/scapy/contrib/ikev2.py
@@ -744,7 +744,10 @@ class IKEv2_Notify(IKEv2_Payload):
         FieldLenField("SPIsize", None, "SPI", "B"),
         ShortEnumField("type", 0, IKEv2NotifyMessageTypes),
         XStrLenField("SPI", "", length_from=lambda pkt: pkt.SPIsize),
-        XStrLenField("notify", "", length_from=lambda pkt: pkt.length - 8),
+        ConditionalField(
+            XStrLenField("notify", "", length_from=lambda pkt: pkt.length - 8),
+            lambda pkt: pkt.type not in (16407, 16408)
+        ),
         ConditionalField(
             # REDIRECT, REDIRECTED_FROM  (RFC 5685)
             ByteEnumField("gw_id_type", 1, IKEv2GatewayIDTypes),