Commit Graph

516 Commits

Author SHA1 Message Date
Pierre Lalet eaf9db4245
Merge pull request #1269 from karpierz/fix_tls_aead_auth_decrypt
fix SyntaxError in layers/tls/tools/_tls_aead_auth_decrypt(). [PR is ready for merge to the master]
2018-03-25 00:32:30 +01:00
Adam Karpierz c2ff43a9ed Fix SyntaxError in layers/tls/tools/_tls_aead_auth_decrypt()
All another errors in layers/tls/tools module has been fixed
Add missing imports
All code in this module has been ported to Python3
Tests are added for all functions in this module
2018-03-24 21:25:10 +01:00
Pierre Lalet 8dbc7796b5
Merge pull request #1168 from guedou/niq_fixes
NIQ fixes
2018-03-24 19:24:02 +01:00
Pierre Lalet a0ddbc3dc9
Merge pull request #1172 from guedou/ipv6_route_ll
IPv6 use conf.iface when selecting the source link-local address
2018-03-24 19:22:56 +01:00
Pierre Lalet 46bf315d7f
Merge pull request #1253 from guedou/Issue_#1242
Write a PCAP header when no packets are provided
2018-03-24 19:19:33 +01:00
Adam Karpierz 87257828a0 Fix for issue #1199 (+ some obvious code improvement in sndrcv()) 2018-03-24 06:34:49 +01:00
Adam Karpierz 0c80b90d37 fix command line parameter in test\run_tests_py2/3.bat 2018-03-21 14:27:33 +01:00
Guillaume Valadon f7e675d3ba Ack Policy field renamed 2018-03-20 14:05:25 +01:00
gpotter2 774fb290a0 Fix IPv6 multicast address record 2018-03-17 16:43:29 +01:00
Guillaume Valadon f3a856d166 IPv6 use conf.iface when selecting the source link-local address 2018-03-16 18:01:35 +01:00
Guillaume Valadon 85c73ddaca Write a PCAP header when no packets are provided 2018-03-16 17:57:50 +01:00
Guillaume Valadon d08be3be18 snmpwalk() tests commented 2018-03-16 17:23:29 +01:00
Guillaume Valadon bef68d1e45
Merge pull request #1238 from karpierz/fix_a_bug_in_snmpwalk
Scapy 2.4.0: fix a bug in 'snmpwalk()'
2018-03-15 16:32:48 +01:00
Adam Karpierz aa4ef5707d fix a bug in snmpwalk() 2018-03-14 23:49:50 +01:00
Guillaume Valadon 29b5f64e27 Node Information Query Python3 fixed 2018-03-11 22:28:24 +01:00
Pierre Lalet 89a077139b
Merge pull request #1088 from gpotter2/ipv6-fixes
SEND module fixes & Stuff
2018-03-11 14:34:48 +01:00
Pierre Lalet 1350ca2d69
Merge pull request #1212 from guedou/plist_ipv6
PacketList: sessions() and conversations() IPv6 support
2018-03-11 14:20:42 +01:00
Alexander Bluhm 438f4cee70 Add regression test for OpenBSD routing table
Parse an OpenBSD 6.3 routing table that contains a locked MTU value.
Test that the parser in read_routes() recognizes this netstart -r
output line correctly.
2018-03-10 01:21:41 +01:00
Guillaume Valadon 71c23dafef
Merge pull request #1204 from gpotter2/bind-udp
Additional Loopback bind + LLMNR bind + SNMP bind
2018-03-09 21:37:09 +01:00
Adam Karpierz f8f1d762f3 fix haslayer() bug(s) 2018-03-09 13:01:29 +01:00
Neurocinetics 617920fddb Fixed a TypeError that triggered when reading a pcap file containing a NTP packet. (#1186)
* Fixed an error (TypeError) that triggered when reading a pcap file that
contained ntp packets. The type of variable "cls" was string not a class
type (invalid argument for method: issubclass()). By importing the type
'TCP' from 'scapy.layers.inet' and by converting cls to a classtype by
reading the key from globals, the TypeError is mitigated.

* Added test to provide insight into the cls variable inconsistencies.
Fixed a small mistake

* d0a2544ae1

* Moved tests.

* fix backward incompatibility of scapy.utils.RawPcapReader.read_packet() for scapy's v2.4 againts v2.3.2 & v2.3.3
named tuple instead of tuple as result of RawPcap[Ng]Reader.read_block_???()/read_packet():

* Fixed an error (TypeError) that triggered when calling sessions() on a PacketList that
contained ntp packets. The type of variable "cls" was a string not a class
type (invalid argument for method: issubclass()).

* Added test to provide insight into the cls variable inconsistencies.
Fixed a small mistake

* d0a2544ae1

* Forgot to delete ntp.uts during rebase...
2018-03-08 12:44:44 +01:00
Alexander Bluhm 036ffa82e5
Use . instead of source shell command.
The source keyword is a bash extension that is not recognized by
every bourne shell.  The . command works everywhere.
2018-03-07 16:50:09 +01:00
Guillaume Valadon 7eebded56d PacketList: sessions() and conversations() IPv6 support 2018-03-07 11:55:17 +01:00
gpotter2 20a7d50020 Loopback binds + LLMNR bind + SNMP bind 2018-03-05 19:47:03 +01:00
gpotter2 0faa0965c5 Even more Cert/TLS tests 2018-03-03 08:52:21 +01:00
Pierre Lalet 254ab6d5ae
Merge pull request #1196 from guedou/ipv6_jumbo
Decode IPv6 Jumbograms
2018-03-01 11:31:11 +01:00
Guillaume Valadon cf3e9080e7
Merge pull request #1194 from gpotter2/tests-cert
Cert: Tests, Python 3 and Cryptography update
2018-03-01 11:09:25 +01:00
gpotter2 7f85821d9f More cert tests 2018-02-28 17:41:57 +01:00
Guillaume Valadon 44b5b63550 Decode IPv6 Jumbograms 2018-02-28 17:15:34 +01:00
gpotter2 e5a285f3b7 Unify RandString & RandBin 2018-02-28 16:35:44 +01:00
Adrian Granados e42ecdc545 Add BlockAck Request subtype for addr2 conditional field clause (#1175)
* Fixed parsing of addr2 (TA) for BlockAck Request frames.

* Unit test for addr2 dissect in BlockAck Request frames.
2018-02-28 10:11:17 +01:00
Guillaume Valadon a5a634594c
Merge pull request #1156 from gpotter2/tests-ipv6
IPv6 attack tests
2018-02-25 23:00:50 +01:00
Guillaume Valadon c80acc25e9 Fix netflowv9.pcap path 2018-02-25 22:25:55 +01:00
Pierre Lalet 9892d5471b
Merge pull request #1163 from guedou/mldv2
MLDv2 support
2018-02-25 21:56:31 +01:00
gpotter2 0c87865941 IPv6 attack tests 2018-02-25 21:50:18 +01:00
Pierre Lalet 3cd00e0c11
Merge pull request #917 from gpotter2/fix-netflowv9
Fix netflow v9
2018-02-25 21:42:20 +01:00
Guillaume Valadon 7d2bbe8b94
Merge pull request #1100 from smainand/can_layer
CAN layer progress
2018-02-24 09:50:40 +01:00
haozheng10 344797043d add support for encapsulating Ethernet frame in MPLS (#1047)
* add support for encapsulating Ethernet frame in MPLS with optional
control word per rfc 4448

* add import of ShortField in mpls.py to fix a ut failure

* add MPLS tests in test/regression.uts

* revert indentation fixes in mpls.py to perserve clean histry
2018-02-24 09:42:18 +01:00
sebastien mainand 81f8936d41 implement wireshark-like 'byte swap' option for CAN layer 2018-02-23 15:50:41 +01:00
sebastien mainand c25f7f0b57 CAN bus layer update fields descr and bind to CookedLinux 2018-02-23 15:50:41 +01:00
hecke d8b24c7138 Tazmen sniffer protocol layer (#1004)
* add TaZmen Sniffer Protocol (TZSP) layer #1000

* add tests for TZSP layer #1000

* cleanups from PR reviews #1000

* fix ranges used in state tags #1000

* add some corner case tests #1000

* add support for unknown tag type #1000

use type TZSPTagUnknown if tag type is not known.

+ related tests

* fixing a nasty grammar bug #1000

* add YesNoByteField #1000

+ tests

* use YesNoByteField instead of generated dicts for conditional tags #1000

* use orb instead of unpack for accessing payload bytes #1000
2018-02-23 12:56:46 +01:00
speakinghedge d2201f1b32 don't use underscore as dummy var in tests #957 2018-02-23 08:52:00 +01:00
speakinghedge 254975b357 test proper error handling if lo is missing or has no address #957 2018-02-23 08:52:00 +01:00
gpotter2 347aa4a9e3 Decode fields with better accuracy 2018-02-22 15:18:19 +01:00
gpotter2 a1795a6111 Add netflowv9_defragment command 2018-02-22 15:18:18 +01:00
gpotter2 22da5cf12f Fix netflow v9 2018-02-22 15:18:18 +01:00
Pierre Lalet 7a80b2f5bc
Merge pull request #1158 from guedou/Fix_1147
Fix 1147
2018-02-21 12:18:38 +01:00
Guillaume Valadon 37e8c9675d MLDv2 refactoring and tests 2018-02-20 12:06:04 +01:00
Guillaume Valadon 324d5f094b MLDv1 fixes and tests 2018-02-20 12:05:48 +01:00
Guillaume Valadon 317b0ef93b DHCP6OptRelayMsg unit tests 2018-02-16 14:42:39 +01:00