Commit Graph

2269 Commits

Author SHA1 Message Date
gpotter2 7c41c9ae65 Updated scripts 2016-12-12 22:07:50 +01:00
Pierre Lalet b6c976b9a7 Merge pull request #372 from guedou/utscapy_exit
Return a correct exit code
2016-12-10 12:04:48 +00:00
Guillaume Valadon d3d79785f6 Merge pull request #376 from bluhm/sndrcv-promisc
Allow to set promisc mode in sndrcv().
2016-12-09 09:51:28 +01:00
Guillaume Valadon 6bec097643 Merge pull request #375 from bluhm/sndrcv-openbsd
Use special code path for OpenBSD in sndrcv.
2016-12-09 09:45:45 +01:00
Alexander Bluhm e41627769f Allow to set promisc mode in sndrcv().
In the pcapdnet() backend it was not possible to run the
L{2,3}{pcap,dnet}Socket in promiscuous mode.  Add a promisc option
to sr(), sr1(), srp(), srp1(), srflood(), srpflood() so that the
user can choose the behavior.

Keep the default non-promiscuous as in most cases sndrcv() sniffs
an answer that is directed to the sender.
2016-12-08 00:54:14 +01:00
Alexander Bluhm 3983433a3b Use special code path for OpenBSD in sndrcv.
On OpenBSD use the non-blocking recv() after select() in sndrcv().
That was already done for FreeBSD and Darwin.  This fixes sniffing
on real hardware with libdnet backend.
2016-12-07 23:20:44 +01:00
Robin Jarry 9d6409e75c fix version when installing from git archive
When installing from a git archive downloaded from github, the file
scapy/VERSION is not present since it is generated when building a
source archive with:

    ./setup.py sdist

To work around the problem, use the export-subst git attribute to make
git archive write the current revison information in scapy/__init__.py.

Signed-off-by: Robin Jarry <robin.jarry@6wind.com>
2016-12-06 17:42:10 +01:00
Guillaume Valadon 04b26acd74 Return a correct exit code 2016-12-06 17:07:25 +01:00
Pierre Lalet cbcb87b29f Merge pull request #361 from guedou/travis_osx_sudo
OS X Travis tests fixed
2016-12-05 21:58:00 +00:00
Guillaume Valadon ceac80c337 Merge pull request #370 from p-l-/fix-setup
setup: add scapy.arch.bpf module
2016-12-05 22:03:02 +01:00
Pierre LALET 0e1b920682 setup: add scapy.arch.bpf module 2016-12-03 17:25:59 +01:00
Pierre Lalet b88fece5c2 Merge pull request #363 from guedou/Issue_#359
Use socket.pton & socket.ntop is available
2016-12-03 15:58:07 +00:00
Pierre Lalet 77739c1562 Merge pull request #364 from guedou/Issue_#350
UDP checksum computation fixed
2016-12-03 15:57:10 +00:00
Pierre Lalet 1cc73cbf4e Merge pull request #366 from guedou/UTScapy_typos
Typo fixed
2016-12-03 15:56:27 +00:00
Pierre Lalet c3d2de9123 Merge pull request #369 from guedou/bpf_windows_broken
Fix broken import on Windows
2016-12-03 15:56:03 +00:00
Guillaume Valadon fc53ffddeb Fix broken import on Windows 2016-12-02 10:29:56 +01:00
Guillaume Valadon 35f97efc53 Native Mac OS X and *BSD support (#221) 2016-12-02 07:07:09 +00:00
Guillaume Valadon b0aa4acd5e Typo fixed 2016-12-01 09:45:45 +01:00
Guillaume Valadon 3a51db1066 UDP checksum computation fixed 2016-11-25 17:41:02 +01:00
Guillaume Valadon a63c3774be Merge pull request #249 from X-Cli/SSLStreamSocket
Add SSLStreamSocket
2016-11-25 11:04:03 +01:00
Guillaume Valadon af6e161108 Merge pull request #349 from smainand/master
Add dump option to [line|c]hexdump to get the result in a variable
2016-11-25 10:58:31 +01:00
Guillaume Valadon 47fca06543 Use socket.pton & socket.ntop is available 2016-11-25 09:13:39 +01:00
Guillaume Valadon 37997002bd OS X Travis tests fixed 2016-11-24 12:59:34 +01:00
Guillaume Valadon 155d5d2976 Merge pull request #356 from p-l-/fix-353
Fix .trace3D()
2016-11-21 15:54:28 +01:00
Sebastien Mainand 9fab5d4d8d Add dump option to [line|c]hexdump to get the result in a variable 2016-11-21 15:50:47 +01:00
Pierre LALET 56079017c3 Fix .trace3D() 2016-11-20 20:20:22 +01:00
Guillaume Valadon a7a85a2639 Merge pull request #330 from danieljakots/master
improve installation doc regarding OpenBSD
2016-11-20 20:01:08 +01:00
Pierre Lalet c6e1e6ccd2 Merge pull request #348 from guedou/typos
Python files spell checked
2016-11-16 12:03:17 +00:00
Guillaume Valadon ed95a6a3ce Python files spell checked 2016-11-15 17:06:50 +01:00
Guillaume Valadon a6e4ab2a45 Merge pull request #320 from mtury/master
ASN.1 enhancements
2016-11-15 10:12:46 +01:00
Pierre Lalet c751e92f96 Merge pull request #346 from guedou/ipsec_typo
Replace IPSec with IPsec
2016-11-14 11:24:21 +00:00
Guillaume Valadon c83c34a574 Merge pull request #335 from p-l-/fix-334
Fix ICMPv6MLQuery().hashret()
2016-11-14 11:46:22 +01:00
Guillaume Valadon 584b649e11 Replace IPSec with IPsec 2016-11-14 11:37:17 +01:00
Gabriel Potter 32d71796e8 Fixed priting bug (Windows) (#344)
Fixed priting tiny bug
2016-11-11 23:13:13 +00:00
Gabriel Potter c4e038a2ce Modified start script (windows) (#345)
Added PAUSE when scapy crashes (to see error code), so the cmd won't
close itself
2016-11-11 13:28:36 +00:00
Pierre LALET a1880b5ccf Fix ICMPv6MLQuery().hashret() 2016-11-10 17:10:12 +01:00
Pierre Lalet a49473c783 Merge pull request #342 from p-l-/fix-tests
Travis CI: fix install & tests
2016-11-10 16:08:50 +00:00
Pierre LALET a9937bef6d Travis CI: fix install & tests 2016-11-10 08:23:37 +01:00
Daniel Jakots a98984b88f improve installation doc regarding OpenBSD 2016-11-04 10:46:41 +01:00
Guillaume Valadon 35145f8c87 Fixed the invalid copy_flag in some ip options
- original patch from Yitai Schwartz, https://bitbucket.org/secdev/scapy/pull-requests/62/
2016-11-03 14:44:03 +01:00
Pierre Lalet 6831cab8ae Merge pull request #328 from guedou/PR#200_improved
Stop sniff() on empty s.recv()
2016-11-03 10:45:04 +00:00
Guillaume Valadon d4a09f4ca9 top sniff() on empty s.recv()
- improved from Mattias Ahlbäck original patch
2016-11-03 10:39:22 +01:00
Guillaume Valadon 7f45014629 Merge pull request #327 from dark-lbp/add-asn.1-Gauge32
Add ASN.1 Gauge32 support
2016-11-03 10:33:33 +01:00
DARK_LBP 7f9d095b4c Add ASN.1 Gauge32 support 2016-11-03 17:00:22 +08:00
Gabriel Potter f82deeff78 Missing windows imports (#322)
* Some new Windows links

Replaced links for PyWin32, Winpcap, pyreadline

* Update compatibility.py
2016-11-02 20:57:14 +01:00
mtu 36bbb8ff44 ASN.1 enhancements 2016-10-31 11:15:13 +01:00
Anastasia Aizman 870770bc0f Fixed invalid link (#316) 2016-10-27 10:25:07 +02:00
Florian Maury bf1c3ee866 Add SSLStreamSocket 2016-10-26 17:53:20 +02:00
Daniel Collins 620f195c65 Corrected ICV length for AES-GCM and AES-CCM in IPSec layer. Added un… (#269)
* Corrected ICV length for AES-GCM and AES-CCM in IPSec layer. Added unit tests to the ipsec campaign.

* Added travis support for pycrypto 2.7a1 combined modes.

* Updated documentation for pycrypto installation.
2016-10-26 10:03:37 +02:00
Gabriel Potter 3390149230 Update some Windows links (#310)
Replaced links for PyWin32, Winpcap, pyreadline
2016-10-24 17:40:17 +00:00