diff options
Diffstat (limited to 'test/patches/scapy-2.4')
| -rw-r--r-- | test/patches/scapy-2.4/ipsec.patch | 52 |
1 files changed, 38 insertions, 14 deletions
diff --git a/test/patches/scapy-2.4/ipsec.patch b/test/patches/scapy-2.4/ipsec.patch index 083b0b94961..7eb0123a211 100644 --- a/test/patches/scapy-2.4/ipsec.patch +++ b/test/patches/scapy-2.4/ipsec.patch @@ -1,5 +1,5 @@ diff --git a/scapy/layers/ipsec.py b/scapy/layers/ipsec.py -index 69e7ae3b..3a1724b2 100644 +index 69e7ae3b..d9c1705b 100644 --- a/scapy/layers/ipsec.py +++ b/scapy/layers/ipsec.py @@ -344,8 +344,7 @@ class CryptAlgo(object): @@ -24,7 +24,31 @@ index 69e7ae3b..3a1724b2 100644 try: data = decryptor.update(data) + decryptor.finalize() except InvalidTag as err: -@@ -518,12 +514,16 @@ class AuthAlgo(object): +@@ -422,6 +418,7 @@ if algorithms: + CRYPT_ALGOS['AES-CTR'] = CryptAlgo('AES-CTR', + cipher=algorithms.AES, + mode=modes.CTR, ++ block_size=1, + iv_size=8, + salt_size=4, + format_mode_iv=_aes_ctr_format_mode_iv) +@@ -429,6 +426,7 @@ if algorithms: + CRYPT_ALGOS['AES-GCM'] = CryptAlgo('AES-GCM', + cipher=algorithms.AES, + mode=modes.GCM, ++ block_size=1, + salt_size=4, + iv_size=8, + icv_size=16, +@@ -437,6 +435,7 @@ if algorithms: + CRYPT_ALGOS['AES-CCM'] = CryptAlgo('AES-CCM', + cipher=algorithms.AES, + mode=modes.CCM, ++ block_size=1, + iv_size=8, + salt_size=3, + icv_size=16, +@@ -518,12 +517,16 @@ class AuthAlgo(object): else: return self.mac(key, self.digestmod(), default_backend()) @@ -42,7 +66,7 @@ index 69e7ae3b..3a1724b2 100644 @return: the signed packet """ -@@ -534,16 +534,20 @@ class AuthAlgo(object): +@@ -534,16 +537,20 @@ class AuthAlgo(object): if pkt.haslayer(ESP): mac.update(raw(pkt[ESP])) @@ -64,7 +88,7 @@ index 69e7ae3b..3a1724b2 100644 """ Check that the integrity check value (icv) of a packet is valid. -@@ -574,6 +578,8 @@ class AuthAlgo(object): +@@ -574,6 +581,8 @@ class AuthAlgo(object): clone = zero_mutable_fields(pkt.copy(), sending=False) mac.update(raw(clone)) @@ -73,7 +97,7 @@ index 69e7ae3b..3a1724b2 100644 computed_icv = mac.finalize()[:self.icv_size] # XXX: Cannot use mac.verify because the ICV can be truncated -@@ -757,7 +763,8 @@ class SecurityAssociation(object): +@@ -757,7 +766,8 @@ class SecurityAssociation(object): SUPPORTED_PROTOS = (IP, IPv6) def __init__(self, proto, spi, seq_num=1, crypt_algo=None, crypt_key=None, @@ -83,7 +107,7 @@ index 69e7ae3b..3a1724b2 100644 """ @param proto: the IPsec proto to use (ESP or AH) @param spi: the Security Parameters Index of this SA -@@ -771,6 +778,7 @@ class SecurityAssociation(object): +@@ -771,6 +781,7 @@ class SecurityAssociation(object): to encapsulate the encrypted packets. @param nat_t_header: an instance of a UDP header that will be used for NAT-Traversal. @@ -91,7 +115,7 @@ index 69e7ae3b..3a1724b2 100644 """ if proto not in (ESP, AH, ESP.name, AH.name): -@@ -782,6 +790,7 @@ class SecurityAssociation(object): +@@ -782,6 +793,7 @@ class SecurityAssociation(object): self.spi = spi self.seq_num = seq_num @@ -99,7 +123,7 @@ index 69e7ae3b..3a1724b2 100644 if crypt_algo: if crypt_algo not in CRYPT_ALGOS: -@@ -827,6 +836,23 @@ class SecurityAssociation(object): +@@ -827,6 +839,23 @@ class SecurityAssociation(object): raise TypeError('packet spi=0x%x does not match the SA spi=0x%x' % (pkt.spi, self.spi)) @@ -123,7 +147,7 @@ index 69e7ae3b..3a1724b2 100644 def _encrypt_esp(self, pkt, seq_num=None, iv=None): if iv is None: -@@ -835,7 +861,8 @@ class SecurityAssociation(object): +@@ -835,7 +864,8 @@ class SecurityAssociation(object): if len(iv) != self.crypt_algo.iv_size: raise TypeError('iv length must be %s' % self.crypt_algo.iv_size) @@ -133,7 +157,7 @@ index 69e7ae3b..3a1724b2 100644 if self.tunnel_header: tunnel = self.tunnel_header.copy() -@@ -857,7 +884,7 @@ class SecurityAssociation(object): +@@ -857,7 +887,7 @@ class SecurityAssociation(object): esp = self.crypt_algo.pad(esp) esp = self.crypt_algo.encrypt(self, esp, self.crypt_key) @@ -142,7 +166,7 @@ index 69e7ae3b..3a1724b2 100644 if self.nat_t_header: nat_t_header = self.nat_t_header.copy() -@@ -884,7 +911,8 @@ class SecurityAssociation(object): +@@ -884,7 +914,8 @@ class SecurityAssociation(object): def _encrypt_ah(self, pkt, seq_num=None): @@ -152,7 +176,7 @@ index 69e7ae3b..3a1724b2 100644 icv = b"\x00" * self.auth_algo.icv_size) if self.tunnel_header: -@@ -924,7 +952,8 @@ class SecurityAssociation(object): +@@ -924,7 +955,8 @@ class SecurityAssociation(object): else: ip_header.plen = len(ip_header.payload) + len(ah) + len(payload) @@ -162,7 +186,7 @@ index 69e7ae3b..3a1724b2 100644 # sequence number must always change, unless specified by the user if seq_num is None: -@@ -955,11 +984,12 @@ class SecurityAssociation(object): +@@ -955,11 +987,12 @@ class SecurityAssociation(object): def _decrypt_esp(self, pkt, verify=True): @@ -176,7 +200,7 @@ index 69e7ae3b..3a1724b2 100644 esp = self.crypt_algo.decrypt(self, encrypted, self.crypt_key, self.crypt_algo.icv_size or -@@ -998,9 +1028,11 @@ class SecurityAssociation(object): +@@ -998,9 +1031,11 @@ class SecurityAssociation(object): def _decrypt_ah(self, pkt, verify=True): |