Skip to content

Add support for more ISAKMP payloads #4600

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
gpotter2 merged 3 commits into from
Feb 22, 2025
+23 −1
Merged

Add support for more ISAKMP payloads #4600

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
172cd13
Add support for more ISAKMP payloads
dmaciejak Nov 29, 2024
b2345e6
Add deprecated to keep backward-compatibility
gpotter2 Feb 3, 2025
9ad2a99
Add missing blank line to pass the health check
dmaciejak Feb 12, 2025
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
24 changes: 23 additions & 1 deletion scapy/layers/isakmp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,18 @@ class ISAKMP_payload_SA(ISAKMP_payload):

class ISAKMP_payload_Nonce(ISAKMP_payload):
name = "ISAKMP Nonce"
deprecated_fields = {"load": ("nonce", "2.6.2")}
fields_desc = ISAKMP_payload.fields_desc[:3] + [
StrLenField("nonce", "", length_from=lambda x: x.length - 4)
]


class ISAKMP_payload_KE(ISAKMP_payload):
name = "ISAKMP Key Exchange"
deprecated_fields = {"load": ("ke", "2.6.2")}
fields_desc = ISAKMP_payload.fields_desc[:3] + [
StrLenField("ke", "", length_from=lambda x: x.length - 4)
]


class ISAKMP_payload_ID(ISAKMP_payload):
Expand All @@ -439,6 +447,18 @@ class ISAKMP_payload_ID(ISAKMP_payload):

class ISAKMP_payload_Hash(ISAKMP_payload):
name = "ISAKMP Hash"
deprecated_fields = {"load": ("hash", "2.6.2")}
fields_desc = ISAKMP_payload.fields_desc[:3] + [
StrLenField("hash", "", length_from=lambda x: x.length - 4)
]


class ISAKMP_payload_SIG(ISAKMP_payload):
name = "ISAKMP Signature"
deprecated_fields = {"load": ("sig", "2.6.2")}
fields_desc = ISAKMP_payload.fields_desc[:3] + [
StrLenField("sig", "", length_from=lambda x: x.length - 4)
]


NotifyMessageType = {
Expand Down Expand Up @@ -471,6 +491,8 @@ class ISAKMP_payload_Hash(ISAKMP_payload):
27: "NOTIFY-SA-LIFETIME",
28: "CERTIFICATE-UNAVAILABLE",
29: "UNSUPPORTED-EXCHANGE-TYPE",
30: "UNEQUAL-PAYLOAD-LENGTHS",
16384: "CONNECTED",
# RFC 3706
36136: "R-U-THERE",
36137: "R-U-THERE-ACK",
Expand Down Expand Up @@ -520,7 +542,7 @@ class ISAKMP_payload_Delete(ISAKMP_payload):
# bind_layers(_ISAKMP_class, ISAKMP_payload_CERT, next_payload=6)
# bind_layers(_ISAKMP_class, ISAKMP_payload_CR, next_payload=7)
bind_layers(_ISAKMP_class, ISAKMP_payload_Hash, next_payload=8)
# bind_layers(_ISAKMP_class, ISAKMP_payload_SIG, next_payload=9)
bind_layers(_ISAKMP_class, ISAKMP_payload_SIG, next_payload=9)
bind_layers(_ISAKMP_class, ISAKMP_payload_Nonce, next_payload=10)
bind_layers(_ISAKMP_class, ISAKMP_payload_Notify, next_payload=11)
bind_layers(_ISAKMP_class, ISAKMP_payload_Delete, next_payload=12)
Expand Down
Loading