Merge pull request #1010 from gpotter2/doc-py3
[Python 3] Update doc
diff --git a/.travis.yml b/.travis.yml
index b86490a..69ef2aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,30 +5,72 @@
# Run as a regular user
- os: linux
python: 2.7
+ env:
+ - SCAPY_COVERAGE=yes
+
+ - os: linux
+ python: 3.3
+ env:
+ - SCAPY_COVERAGE=yes
+
+ - os: linux
+ python: 3.4
+ env:
+ - SCAPY_COVERAGE=yes
+
+ - os: linux
+ python: 3.5
+ env:
+ - SCAPY_COVERAGE=yes
+
+ - os: linux
+ python: 3.6
+ env:
+ - SCAPY_COVERAGE=yes
- os: linux
python: pypy
-
- - os: osx
- language: generic
- osx_image: xcode7.3
-
- - os: osx
- language: generic
- osx_image: xcode7.3
env:
- - SCAPY_SUDO=false SCAPY_USE_PCAPDNET=yes
+ - SCAPY_COVERAGE=yes
+
+ - os: osx
+ language: generic
+ env:
+ - SCAPY_COVERAGE=yes
+
+ - os: osx
+ language: generic
+ env:
+ - SCAPY_USE_PCAPDNET=yes SCAPY_COVERAGE=yes
# Run as root
- os: linux
sudo: required
python: 2.7
env:
- - SCAPY_SUDO=sudo
+ - SCAPY_SUDO=sudo SCAPY_COVERAGE=yes
- os: linux
sudo: required
- python: 2.7
+ python: 3.3
+ env:
+ - SCAPY_SUDO=sudo SCAPY_COVERAGE=yes
+
+ - os: linux
+ sudo: required
+ python: 3.4
+ env:
+ - SCAPY_SUDO=sudo SCAPY_COVERAGE=yes
+
+ - os: linux
+ sudo: required
+ python: 3.5
+ env:
+ - SCAPY_SUDO=sudo SCAPY_COVERAGE=yes
+
+ - os: linux
+ sudo: required
+ python: 3.6
env:
- SCAPY_SUDO=sudo SCAPY_COVERAGE=yes
@@ -38,26 +80,18 @@
virtualenv:
system_site_packages: true
env:
- - SCAPY_SUDO=sudo SCAPY_USE_PCAPDNET=yes SCAPY_COVERAGE=yes
+ - SCAPY_SUDO=sudo SCAPY_USE_PCAPDNET=yes SCAPY_COVERAGE=yes
- os: osx
language: generic
- osx_image: xcode7.3
env:
- SCAPY_SUDO=sudo SCAPY_COVERAGE=yes
- os: osx
language: generic
- osx_image: xcode7.3
env:
- SCAPY_SUDO=sudo SCAPY_USE_PCAPDNET=yes SCAPY_COVERAGE=yes
install: bash .travis/install.sh
script: bash .travis/test.sh
-
-after_success:
- - if [ "$SCAPY_COVERAGE" = "yes" ]; then pip install codecov; fi
- # With UTScapy, the coverage dot file is located in the test directory
- - if [ "$SCAPY_COVERAGE" = "yes" ]; then coverage combine ./test; fi
- - if [ "$SCAPY_COVERAGE" = "yes" ]; then codecov; fi
diff --git a/.travis/install.sh b/.travis/install.sh
index a6796ab..f5e8430 100644
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -1,3 +1,5 @@
+PIP=`which pip || (python --version 2>&1 | grep -q 'Python 2' && which pip2) || (python --version 2>&1 | grep -q 'Python 3' && which pip3)`
+
# Install dependencies using pip
if [ -z "$SCAPY_SUDO" -o "$SCAPY_SUDO" = "false" ]
then
@@ -6,20 +8,29 @@
then
PIP_INSTALL_FLAGS="--user"
fi
+else
+ SCAPY_SUDO="$SCAPY_SUDO -H"
fi
-if python --version 2>&1 | grep -q PyPy; then
+$SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U mock
+
+if python --version 2>&1 | grep -q '^Python 3\.[0123]'
+then
+ # cryptography with Python 3 < 3.4 requires enum34
+ $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U enum34
+fi
+
+if ! python --version 2>&1 | grep -q PyPy; then
# cryptography requires PyPy >= 2.6, Travis CI uses 2.5.0
- $SCAPY_SUDO pip install $PIP_INSTALL_FLAGS -U mock
-else
- $SCAPY_SUDO pip install $PIP_INSTALL_FLAGS -U cryptography mock
+ $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U cryptography
fi
# Install coverage
if [ "$SCAPY_COVERAGE" = "yes" ]
then
- $SCAPY_SUDO pip install $PIP_INSTALL_FLAGS coverage
- $SCAPY_SUDO apt-get install python-pyx
+ $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U coverage
+ $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U PyX
+ $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U codecov
fi
# Install pcap & dnet
@@ -27,7 +38,19 @@
then
if [ "$TRAVIS_OS_NAME" = "linux" ]
then
- $SCAPY_SUDO apt-get install python-libpcap python-dumbnet openssl
+ $SCAPY_SUDO apt-get -qy install libdumbnet-dev libpcap-dev
+ # $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U pypcap ## sr(timeout) HS
+ # $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U pcapy ## sniff HS
+ # $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U pylibpcap ## won't install
+ $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U http://http.debian.net/debian/pool/main/p/python-libpcap/python-libpcap_0.6.4.orig.tar.gz
+ $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U pydumbnet
+ # wget https://pypi.python.org/packages/71/60/15b9e0005bf9062bdc04fc8129b4cdb01cc4189a75719441ff2e23e55b15/dnet-real-1.12.tar.gz
+ # tar zxf dnet-real-1.12.tar.gz
+ # cd dnet-real-1.12
+ # sed -i 's/dnet\.h/dumbnet.h/; s/|Py_TPFLAGS_CHECKTYPES//g' dnet.c
+ # sed -i 's#dnet_extobj = \[\]#dnet_extobj = \["/usr/lib/libdumbnet.so"\]#' setup.py
+ # $SCAPY_SUDO $PIP install $PIP_INSTALL_FLAGS -U .
+ # cd ../
elif [ "$TRAVIS_OS_NAME" = "osx" ]
then
mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages
@@ -42,5 +65,5 @@
# Install wireshark data
if [ ! -z "$SCAPY_SUDO" ] && [ "$TRAVIS_OS_NAME" = "linux" ]
then
- $SCAPY_SUDO apt-get install libwireshark-data
+ $SCAPY_SUDO apt-get -qy install openssl libwireshark-data
fi
diff --git a/.travis/test.sh b/.travis/test.sh
index 0648555..bbcc2e6 100644
--- a/.travis/test.sh
+++ b/.travis/test.sh
@@ -1,7 +1,7 @@
# Report installed versions
echo "### INSTALLED VERSIONS ###"
python -c 'import sys; print("sys.path:" , sys.path)'
-for DEPENDENCY in "six" "cryptography" "mock" "pcap" "dumbnet" "coverage"
+for DEPENDENCY in "six" "cryptography" "mock" "pcap" "dnet" "coverage"
do
python -c 'import '$DEPENDENCY'; print("'$DEPENDENCY': "+str(getattr('$DEPENDENCY', "__version__", "no __version__ attribute")))'
echo "----"
@@ -13,13 +13,15 @@
# Dump Scapy config
python --version
-python -c "from scapy.all import *; print conf"
+python -c "from scapy.all import *; print(conf)"
# Don't run tests that require root privileges
if [ -z "$SCAPY_SUDO" -o "$SCAPY_SUDO" = "false" ]
then
UT_FLAGS="-K netaccess -K needs_root -K manufdb"
SCAPY_SUDO=""
+else
+ SCAPY_SUDO="$SCAPY_SUDO -H"
fi
if [ "$SCAPY_USE_PCAPDNET" = "yes" ]
@@ -39,8 +41,28 @@
UT_FLAGS+=" -K crypto -K not_pypy"
fi
+if python --version 2>&1 | grep -q '^Python 3\.'
+then
+ # Some Python 3 tests currently fail. They should be tracked and
+ # fixed.
+ UT_FLAGS+=" -K FIXME_py3"
+fi
+
+if python --version 2>&1 | grep -q '^Python 3\.[012345]'
+then
+ # Python 3 < 3.6 has weird behavior with random.seed()
+ UT_FLAGS+=" -K random_weird_py3"
+fi
+
+if python --version 2>&1 | grep -q '^Python 3\.[0123]'
+then
+ # cryptography with Python 3 < 3.4 requires 3.3.7, Travis provides 3.3.6
+ UT_FLAGS+=" -K crypto"
+fi
+
# Set PATH
-for _path in /sbin /usr/sbin /usr/local/sbin; do
+## /Users/travis/Library/Python/2.7/bin: pip when non-root on osx
+for _path in /sbin /usr/sbin /usr/local/sbin /Users/travis/Library/Python/2.7/bin; do
[ -d "$_path" ] && echo "$PATH" | grep -qvE "(^|:)$_path(:|$)" && export PATH="$PATH:$_path"
done
@@ -48,22 +70,32 @@
if [ "$SCAPY_COVERAGE" = "yes" ]
then
echo '#!/bin/bash' > test/python
- echo '[ "$*" = "--version" ] && echo "Python 2 - fake version string"' >> test/python
- echo '[ "$*" != "--version" ] && coverage run --concurrency=multiprocessing -a $*' >> test/python
+ echo "[ \"\$*\" = \"--version\" ] && echo \"`python --version`\" && exit 0" >> test/python
+ echo "`which coverage` run --concurrency=multiprocessing -a \$*" >> test/python
chmod +x test/python
- PATH=.:$PATH
# Copy the fake Python interpreter to bypass /etc/sudoers rules on Ubuntu
- if [ "$SCAPY_SUDO" = "sudo" ]
+ if [ -n "$SCAPY_SUDO" ]
then
$SCAPY_SUDO cp test/python /usr/local/sbin/
+ PYTHON=/usr/local/sbin/python
+ else
+ PATH="`pwd`/test":$PATH
+ PYTHON="`pwd`/test/python"
fi
+else
+ PYTHON="`which python`"
fi
# Do we have tcpdump or thsark?
which tcpdump >/dev/null 2>&1 || UT_FLAGS+=" -K tcpdump"
which tshark >/dev/null 2>&1 || UT_FLAGS+=" -K tshark"
+if [ -n "$SCAPY_SUDO" ]
+then
+ SCAPY_SUDO="$SCAPY_SUDO --preserve-env"
+fi
+
# Dump Environment (so that we can check PATH, UT_FLAGS, etc.)
set
@@ -72,9 +104,9 @@
if [ "$TRAVIS_OS_NAME" = "osx" ]
then
- if [ -z $SCAPY_USE_PCAPDNET ]
+ if [ -z "$SCAPY_USE_PCAPDNET" ]
then
- $SCAPY_SUDO ./run_tests -q -F -t bpf.uts $UT_FLAGS || exit $?
+ PYTHON="$PYTHON" $SCAPY_SUDO ./run_tests -q -F -t bpf.uts $UT_FLAGS || exit $?
fi
UT_FLAGS+=" -K manufdb -K linux"
fi
@@ -85,11 +117,19 @@
fi
# Run all normal and contrib tests
-$SCAPY_SUDO ./run_tests -c ./configs/travis.utsc -T "bpf.uts" -T "mock_windows.uts" $UT_FLAGS || exit $?
+PYTHON="$PYTHON" $SCAPY_SUDO ./run_tests -c ./configs/travis.utsc -T "bpf.uts" -T "mock_windows.uts" $UT_FLAGS || exit $?
# Run unit tests with openssl if we have root privileges
-if [ "$TRAVIS_OS_NAME" = "linux" ] && [ ! -z $SCAPY_USE_PCAPDNET ] && [ ! -z $SCAPY_SUDO ]
+if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -n "$SCAPY_SUDO" ] && \
+ ! python --version 2>&1 | grep -q '^Python 3\.'
then
- $SCAPY_SUDO ./run_tests -q -F -t tls/tests_tls_netaccess.uts $UT_FLAGS || exit $?
+ echo "Running TLS netaccess tests"
+ PYTHON="$PYTHON" $SCAPY_SUDO ./run_tests -q -F -t tls/tests_tls_netaccess.uts $UT_FLAGS || exit $?
+else
+ echo "NOT running TLS netaccess tests"
fi
+if [ "$SCAPY_COVERAGE" = "yes" ]; then
+ coverage combine ./
+ codecov
+fi
diff --git a/README.md b/README.md
index d3a76c2..3127ce2 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,9 @@
techniques (VLAN hopping+ARP cache poisoning, VoIP decoding on WEP protected
channel, ...), etc.
-Latest version of scapy now supports both Python 2.7 and Python 3. It's intended to
-be cross platform, and supports many different platforms such as Linux, OSX, Windows...
+Scapy supports Python 2.7 and Python 3 (3.3 to 3.6). It's intended to
+be cross platform, and runs on many different platforms (Linux, OSX,
+*BSD, and Windows).
[Documentation](http://scapy.readthedocs.io/en/latest/)
diff --git a/doc/scapy/advanced_usage.rst b/doc/scapy/advanced_usage.rst
index 5a059f9..531d4a8 100644
--- a/doc/scapy/advanced_usage.rst
+++ b/doc/scapy/advanced_usage.rst
@@ -115,13 +115,13 @@
>>> BERcodec_Object.dec('\x03\x03egg')
(<ASN1_BIT_STRING['egg']>, '')
-ASN.1 objects are encoded using their ``.enc()`` method. This method must be called with the codec we want to use. All codecs are referenced in the ASN1_Codecs object. ``str()`` can also be used. In this case, the default codec (``conf.ASN1_default_codec``) will be used.
+ASN.1 objects are encoded using their ``.enc()`` method. This method must be called with the codec we want to use. All codecs are referenced in the ASN1_Codecs object. ``raw()`` can also be used. In this case, the default codec (``conf.ASN1_default_codec``) will be used.
::
>>> x.enc(ASN1_Codecs.BER)
'0\r\x02\x01\x07\x04\x03egg0\x03\x01\x01\x00'
- >>> str(x)
+ >>> raw(x)
'0\r\x02\x01\x07\x04\x03egg0\x03\x01\x01\x00'
>>> xx,remain = BERcodec_Object.dec(_)
>>> xx.show()
@@ -426,7 +426,7 @@
>>> send(IP(dst="1.2.3.4")/UDP()/SNMP())
.
Sent 1 packets.
- >>> SNMP(str(a)).show()
+ >>> SNMP(raw(a)).show()
###[ SNMP ]###
version= <ASN1_INTEGER[3L]>
community= <ASN1_STRING['public']>
@@ -816,9 +816,9 @@
To instanciate one of these packets with its configuration, the ``config`` argument must be given. It is a ``dict()`` which contains all the required piece of configuration::
>>> load_contrib('pnio_rtc')
- >>> str(PNIORealTimeRawData(load='AAA', config={'length': 4}))
+ >>> raw(PNIORealTimeRawData(load='AAA', config={'length': 4}))
'AAA\x00'
- >>> str(Profisafe(load='AAA', Control_Status=0x20, CRC=0x424242, config={'length': 8, 'CRC': 3}))
+ >>> raw(Profisafe(load='AAA', Control_Status=0x20, CRC=0x424242, config={'length': 8, 'CRC': 3}))
'AAA\x00 BBB'
>>> hexdump(PNIORealTimeIOxS())
0000 80 .
@@ -1047,16 +1047,16 @@
In addition, one can see, when displaying a ``PNIORealTime`` packet, the field ``len``. This is a computed field which is not added in the final packet build. It is mainly useful for dissection and reconstruction, but it can also be used to modify the behaviour of the packet. In fact, RTC packet must always be long enough for an Ethernet frame and to do so, a padding must be added right after the ``data`` buffer. The default behaviour is to add ``padding`` whose size is computed during the ``build`` process::
- >>> str(PNIORealTime(cycleCounter=0x4242, data=[PNIORealTimeIOxS()]))
+ >>> raw(PNIORealTime(cycleCounter=0x4242, data=[PNIORealTimeIOxS()]))
'\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00BB5\x00'
However, one can set ``len`` to modify this behaviour. ``len`` controls the length of the whole ``PNIORealTime`` packet. Then, to shorten the length of the padding, ``len`` can be set to a lower value::
- >>> str(PNIORealTime(cycleCounter=0x4242, data=[PNIORealTimeIOxS()], len=50))
+ >>> raw(PNIORealTime(cycleCounter=0x4242, data=[PNIORealTimeIOxS()], len=50))
'\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00BB5\x00'
- >>> str(PNIORealTime(cycleCounter=0x4242, data=[PNIORealTimeIOxS()]))
+ >>> raw(PNIORealTime(cycleCounter=0x4242, data=[PNIORealTimeIOxS()]))
'\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00BB5\x00'
- >>> str(PNIORealTime(cycleCounter=0x4242, data=[PNIORealTimeIOxS()], len=30))
+ >>> raw(PNIORealTime(cycleCounter=0x4242, data=[PNIORealTimeIOxS()], len=30))
'\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00BB5\x00'
diff --git a/doc/scapy/build_dissect.rst b/doc/scapy/build_dissect.rst
index 9356601..6469b73 100644
--- a/doc/scapy/build_dissect.rst
+++ b/doc/scapy/build_dissect.rst
@@ -47,7 +47,7 @@
minnie= 0x3
donald= happy
>>> d.donald="cool"
- >>> str(d)
+ >>> raw(d)
’\x00\x01\x03\x00\x00\x00\x02’
>>> Disney( )
<Disney mickey=1 minnie=0x3 donald=cool |>
@@ -193,7 +193,7 @@
s.append( hex(0x80 | (l & 0x7F) ) )
l = l >> 7
s.reverse()
- return "".join(map( lambda(x) : chr(int(x, 16)) , s))
+ return "".join(chr(int(x, 16)) for x in s)
def str2vlenq(s=""):
i = l = 0
@@ -223,7 +223,7 @@
f = pkt.get_field(self.fld)
x = f.i2len(pkt, pkt.getfieldval(self.fld))
x = vlenq2str(x)
- return str(x)
+ return raw(x)
def m2i(self, pkt, x):
if s is None:
@@ -262,7 +262,7 @@
be sent to the network, but in a human readable way, so we see ``len=129``.
Last but not least, let us look now at the machine representation::
- >>> str(f)
+ >>> raw(f)
'\x81\x01AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
The first 2 bytes are ``\x81\x01``, which is 129 in this encoding.
@@ -518,15 +518,16 @@
0010 7F 00 00 01 00 14 00 50 00 00 00 00 00 00 00 00 .......P........
0020 50 02 20 00 91 7C 00 00 P. ..|..
-Calling ``str()`` builds the packet:
+Calling ``raw()`` builds the packet:
- non instanced fields are set to their default value
- lengths are updated automatically
- checksums are computed
- and so on.
-In fact, using ``str()`` rather than ``show2()`` or any other method is not a
-random choice as all the functions building the packet calls
-``Packet.__str__()``. However, ``__str__()`` calls another method: ``build()``::
+In fact, using ``raw()`` rather than ``show2()`` or any other method
+is not a random choice as all the functions building the packet calls
+``Packet.__str__()`` (or ``Packet.__bytes__()`` under Python
+3). However, ``__str__()`` calls another method: ``build()``::
def __str__(self):
return next(iter(self)).build()
@@ -668,7 +669,7 @@
``len`` is correctly computed now::
- >>> hexdump(str(p))
+ >>> hexdump(raw(p))
0000 00 32 30 0D 0A 58 58 58 58 58 58 58 58 58 58 58 .20..XXXXXXXXXXX
0010 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 XXXXXXXXXXXXXXXX
0020 58 58 58 58 58 XXXXX
@@ -826,7 +827,7 @@
Last but not least, it is very useful to understand when each function
is called when a packet is built::
- >>> hexdump(str(p))
+ >>> hexdump(raw(p))
Packet.str=Foo
Packet.iter=Foo
Packet.iter=Bar1
diff --git a/doc/scapy/functions.rst b/doc/scapy/functions.rst
index 4a76fe7..136ce54 100644
--- a/doc/scapy/functions.rst
+++ b/doc/scapy/functions.rst
@@ -28,12 +28,12 @@
# Get the UDP checksum computed by Scapy
packet = IP(dst="10.11.12.13", src="10.11.12.14")/UDP()/DNS()
- packet_raw = str(packet)
+ packet_raw = raw(packet)
checksum_scapy = IP(packet_raw)[UDP].chksum
# Set the UDP checksum to 0 and compute the checksum 'manually'
packet = IP(dst="10.11.12.13", src="10.11.12.14")/UDP(chksum=0)/DNS()
- packet_raw = str(packet)
+ packet_raw = raw(packet)
udp_raw = packet_raw[20:]
phdr = pseudo_header(packet.src, packet.dst, socket.IPPROTO_UDP, len(udp_raw))
diff --git a/doc/scapy/usage.rst b/doc/scapy/usage.rst
index 7db3ff4..cee2395 100644
--- a/doc/scapy/usage.rst
+++ b/doc/scapy/usage.rst
@@ -92,7 +92,7 @@
Each packet can be build or dissected (note: in Python ``_`` (underscore) is the latest result)::
- >>> str(IP())
+ >>> raw(IP())
'E\x00\x00\x14\x00\x01\x00\x00@\x00|\xe7\x7f\x00\x00\x01\x7f\x00\x00\x01'
>>> IP(_)
<IP version=4L ihl=5L tos=0x0 len=20 id=1 flags= frag=0L ttl=64 proto=IP
@@ -105,7 +105,7 @@
20 00 BB 39 00 00 47 45 54 20 2F 69 6E 64 65 78 ..9..GET /index
2E 68 74 6D 6C 20 48 54 54 50 2F 31 2E 30 20 0A .html HTTP/1.0 .
0A .
- >>> b=str(a)
+ >>> b=raw(a)
>>> b
'\x00\x02\x157\xa2D\x00\xae\xf3R\xaa\xd1\x08\x00E\x00\x00C\x00\x01\x00\x00@\x06x<\xc0
\xa8\x05\x15B#\xfa\x97\x00\x14\x00P\x00\x00\x00\x00\x00\x00\x00\x00P\x02 \x00
@@ -156,7 +156,7 @@
======================= ====================================================
Command Effect
======================= ====================================================
-str(pkt) assemble the packet
+raw(pkt) assemble the packet
hexdump(pkt) have an hexadecimal dump
ls(pkt) have the list of fields values
pkt.summary() for a one-line summary
@@ -768,10 +768,10 @@
\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e
\x1f !"#$%&\'()*+,-./01234567' |>>>>
-Hex string
-^^^^^^^^^^
+Binary string
+^^^^^^^^^^^^^
-You can also convert entire packet into a hex string using the ``str()`` function::
+You can also convert entire packet into a binary string using the ``raw()`` function::
>>> pkts = sniff(count = 1)
>>> pkt = pkts[0]
@@ -782,16 +782,16 @@
chksum=0x9c90 id=0x5a61 seq=0x1 |<Raw load='\xe6\xdapI\xb6\xe5\x08\x00\x08\t\n
\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e
\x1f !"#$%&\'()*+,-./01234567' |>>>>
- >>> pkt_str = str(pkt)
- >>> pkt_str
+ >>> pkt_raw = raw(pkt)
+ >>> pkt_raw
'\x00PV\xfc\xceP\x00\x0c)+S\x19\x08\x00E\x00\x00T\x00\x00@\x00@\x01Z|\xc0\xa8
\x19\x82\x04\x02\x02\x01\x08\x00\x9c\x90Za\x00\x01\xe6\xdapI\xb6\xe5\x08\x00
\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b
\x1c\x1d\x1e\x1f !"#$%&\'()*+,-./01234567'
-We can reimport the produced hex string by selecting the appropriate starting layer (e.g. ``Ether()``).
+We can reimport the produced binary string by selecting the appropriate first layer (e.g. ``Ether()``).
- >>> new_pkt = Ether(pkt_str)
+ >>> new_pkt = Ether(pkt_raw)
>>> new_pkt
<Ether dst=00:50:56:fc:ce:50 src=00:0c:29:2b:53:19 type=0x800 |<IP version=4L
ihl=5L tos=0x0 len=84 id=0 flags=DF frag=0L ttl=64 proto=icmp chksum=0x5a7c
@@ -841,7 +841,7 @@
At last Scapy is capable of saving all session variables using the ``save_session()`` function:
>>> dir()
-['__builtins__', 'conf', 'new_pkt', 'pkt', 'pkt_export', 'pkt_hex', 'pkt_str', 'pkts']
+['__builtins__', 'conf', 'new_pkt', 'pkt', 'pkt_export', 'pkt_hex', 'pkt_raw', 'pkts']
>>> save_session("session.scapy")
Next time you start Scapy you can load the previous saved session using the ``load_session()`` command::
@@ -850,7 +850,7 @@
['__builtins__', 'conf']
>>> load_session("session.scapy")
>>> dir()
- ['__builtins__', 'conf', 'new_pkt', 'pkt', 'pkt_export', 'pkt_hex', 'pkt_str', 'pkts']
+ ['__builtins__', 'conf', 'new_pkt', 'pkt', 'pkt_export', 'pkt_hex', 'pkt_raw', 'pkts']
Making tables
@@ -1097,12 +1097,12 @@
>>> for s,r in ans:
... if s[TCP].dport == r[TCP].sport:
- ... print str(s[TCP].dport) + " is unfiltered"
+ ... print("%d is unfiltered" % s[TCP].dport)
Similarly, filtered ports can be found with unanswered packets::
>>> for s in unans:
- ... print str(s[TCP].dport) + " is filtered"
+ ... print("%d is filtered" % s[TCP].dport)
Xmas Scan
@@ -1500,9 +1500,9 @@
Once we obtain a reasonable number of responses we can start analyzing collected data with something like this:
>>> temp = 0
- >>> for s,r in ans:
+ >>> for s, r in ans:
... temp = r[TCP].seq - temp
- ... print str(r[TCP].seq) + "\t+" + str(temp)
+ ... print("%d\t+%d" % (r[TCP].seq, temp))
...
4278709328 +4275758673
4279655607 +3896934
diff --git a/scapy/arch/__init__.py b/scapy/arch/__init__.py
index 7095283..ef6fbb2 100644
--- a/scapy/arch/__init__.py
+++ b/scapy/arch/__init__.py
@@ -12,7 +12,7 @@
from scapy.consts import LINUX, OPENBSD, FREEBSD, NETBSD, DARWIN, \
SOLARIS, WINDOWS, BSD, IS_64BITS, LOOPBACK_NAME, plt, MATPLOTLIB_INLINED, \
- MATPLOTLIB_DEFAULT_PLOT_KARGS, PYX, parent_function
+ MATPLOTLIB_DEFAULT_PLOT_KARGS, PYX
from scapy.error import *
import scapy.config
from scapy.pton_ntop import inet_pton
diff --git a/scapy/arch/linux.py b/scapy/arch/linux.py
index 71de862..b451fd1 100644
--- a/scapy/arch/linux.py
+++ b/scapy/arch/linux.py
@@ -8,10 +8,18 @@
"""
from __future__ import absolute_import
-import sys, os, struct, socket, time
-from select import select
+
+
+import array
+import ctypes
from fcntl import ioctl
-import array, ctypes
+import os
+from select import select
+import socket
+import struct
+import sys
+import time
+
from scapy.compat import *
from scapy.consts import LOOPBACK_NAME, IS_64BITS
@@ -66,7 +74,6 @@
SOL_PACKET = 263
# From asm/socket.h
SO_ATTACH_FILTER = 26
-SOL_SOCKET = 1
# From net/route.h
RTF_UP = 0x0001 # Route usable
@@ -155,7 +162,7 @@
return
bp = get_bpf_pointer(lines)
- s.setsockopt(SOL_SOCKET, SO_ATTACH_FILTER, bp)
+ s.setsockopt(socket.SOL_SOCKET, SO_ATTACH_FILTER, bp)
def set_promisc(s,iff,val=1):
mreq = struct.pack("IHH8s", get_if_index(iff), PACKET_MR_PROMISC, 0, b"")
@@ -201,8 +208,9 @@
msk = struct.unpack(">I", ifreq[20:24])[0]
# Get the full interface name
- if b':' in ifname:
- ifname = ifname[:ifname.index(b':')]
+ ifname = plain_str(ifname)
+ if ':' in ifname:
+ ifname = ifname[:ifname.index(':')]
else:
continue
@@ -290,18 +298,19 @@
"""
ret = []
try:
- f = open("/proc/net/if_inet6", "rb")
+ fdesc = open("/proc/net/if_inet6", "rb")
except IOError as err:
return ret
- l = f.readlines()
- for i in l:
- l = plain_str(l)
+ for line in fdesc:
# addr, index, plen, scope, flags, ifname
- tmp = i.split()
- addr = struct.unpack('4s4s4s4s4s4s4s4s', tmp[0])
- addr = scapy.utils6.in6_ptop(b':'.join(addr).decode())
+ tmp = plain_str(line).split()
+ addr = scapy.utils6.in6_ptop(
+ b':'.join(
+ struct.unpack('4s4s4s4s4s4s4s4s', tmp[0].encode())
+ ).decode()
+ )
# (addr, scope, iface)
- ret.append((addr, int(tmp[3], 16), tmp[5].decode()))
+ ret.append((addr, int(tmp[3], 16), tmp[5]))
return ret
def read_routes6():
@@ -409,11 +418,10 @@
if self.promisc:
if iface is None:
self.iff = get_if_list()
+ elif isinstance(iface, list):
+ self.iff = iface
else:
- if iface.__class__ is list:
- self.iff = iface
- else:
- self.iff = [iface]
+ self.iff = [iface]
for i in self.iff:
set_promisc(self.ins, i)
def close(self):
@@ -567,11 +575,10 @@
self.promisc = promisc
if iface is None:
self.iff = get_if_list()
+ elif isinstance(iface, list):
+ self.iff = iface
else:
- if iface.__class__ is list:
- self.iff = iface
- else:
- self.iff = [iface]
+ self.iff = [iface]
if self.promisc:
for i in self.iff:
set_promisc(self.ins, i)
diff --git a/scapy/arch/pcapdnet.py b/scapy/arch/pcapdnet.py
index b261d8c..5293734 100644
--- a/scapy/arch/pcapdnet.py
+++ b/scapy/arch/pcapdnet.py
@@ -101,6 +101,9 @@
iflist = winpcapy_get_if_list()
conf.cache_iflist = iflist
return iflist
+ else:
+ get_if_list = winpcapy_get_if_list
+
def in6_getifaddr_raw():
"""Returns all available IPv6 on the computer, read from winpcap."""
err = create_string_buffer(PCAP_ERRBUF_SIZE)
diff --git a/scapy/as_resolvers.py b/scapy/as_resolvers.py
index 61a032d..fa33a6f 100644
--- a/scapy/as_resolvers.py
+++ b/scapy/as_resolvers.py
@@ -100,7 +100,7 @@
asn, ip, desc = [elt.strip() for elt in l.split('|')]
if asn == "NA":
continue
- asn = "AS" + str(int(asn))
+ asn = "AS%s" % asn
ASNlist.append((ip, asn, desc))
return ASNlist
diff --git a/scapy/asn1/asn1.py b/scapy/asn1/asn1.py
index 7443447..28f5d02 100644
--- a/scapy/asn1/asn1.py
+++ b/scapy/asn1/asn1.py
@@ -234,7 +234,7 @@
ASN1_Object.__init__(self, val)
self.exc = exc
def __repr__(self):
- return "<%s[%r]{{%s}}>" % (self.__dict__.get("name", self.__class__.__name__),
+ return "<%s[%r]{{%r}}>" % (self.__dict__.get("name", self.__class__.__name__),
self.val, self.exc.args[0])
def enc(self, codec):
if isinstance(self.val, ASN1_Object):
@@ -265,12 +265,14 @@
r = r[:10] + "..." + r[-10:]
return h + " <%s[%s]>" % (self.__dict__.get("name", self.__class__.__name__), r)
+
class ASN1_BOOLEAN(ASN1_INTEGER):
tag = ASN1_Class_UNIVERSAL.BOOLEAN
# BER: 0 means False, anything else means True
def __repr__(self):
- return str((not (self.val==0))) + " " + ASN1_Object.__repr__(self)
-
+ return '%s %s' % (not (self.val==0), ASN1_Object.__repr__(self))
+
+
class ASN1_BIT_STRING(ASN1_Object):
"""
/!\ ASN1_BIT_STRING values are bit strings like "011101".
@@ -323,12 +325,12 @@
super(ASN1_Object, self).__setattr__(name, value)
def __repr__(self):
if len(self.val) <= 16:
- return "<%s[%r] (%d unused bit%s)>" % (self.__dict__.get("name", self.__class__.__name__), self.val, self.unused_bits, "s" if self.unused_bits>1 else "")
+ return "<%s[%s] (%d unused bit%s)>" % (self.__dict__.get("name", self.__class__.__name__), self.val.decode(), self.unused_bits, "s" if self.unused_bits>1 else "")
else:
s = self.val_readable
if len(s) > 20:
s = s[:10] + b"..." + s[-10:]
- return "<%s[%r] (%d unused bit%s)>" % (self.__dict__.get("name", self.__class__.__name__), s, self.unused_bits, "s" if self.unused_bits>1 else "")
+ return "<%s[%s] (%d unused bit%s)>" % (self.__dict__.get("name", self.__class__.__name__), s.decode(), self.unused_bits, "s" if self.unused_bits>1 else "")
def __str__(self):
return self.val_readable
def __bytes__(self):
diff --git a/scapy/compat.py b/scapy/compat.py
index b38219b..1737c04 100644
--- a/scapy/compat.py
+++ b/scapy/compat.py
@@ -9,7 +9,8 @@
"""
from __future__ import absolute_import
-import codecs
+import base64
+import binascii
import scapy.modules.six as six
@@ -47,15 +48,20 @@
"""Old Python 2 function"""
return (a > b) - (a < b)
-def orb(x):
- """Return ord(x) when necessary.
- Python 3 compatible.
-
- """
- if isinstance(x, (str, bytes)):
- return ord(x)
- else:
+
+if six.PY2:
+ def orb(x):
+ """Return ord(x) when necessary."""
+ if isinstance(x, basestring):
+ return ord(x)
return x
+else:
+ def orb(x):
+ """Return ord(x) when necessary."""
+ if isinstance(x, (bytes, str)):
+ return ord(x)
+ return x
+
if six.PY2:
def raw(x):
@@ -108,31 +114,22 @@
return bytes([int(x)])
return bytes([x])
-def bytes_codec(x, codec, force_str=False):
- """Encode a str or a bytes object with a codec"""
- if six.PY2:
- return str(x).encode(codec)
- else:
- hex_ = codecs.getencoder(codec)(raw(x))[0]
- if force_str:
- hex_ = hex_.decode('utf8')
- return hex_
-
-def codec_bytes(x, codec):
- """Decode a str or a byte object with a codec"""
- if six.PY2:
- return str(x).decode(codec)
- else:
- return codecs.getdecoder(codec)(x)[0]
-
-def bytes_hex(x, force_str=False):
+def bytes_hex(x):
"""Hexify a str or a bytes object"""
- return bytes_codec(x, "hex", force_str)
+ return binascii.b2a_hex(raw(x))
def hex_bytes(x):
"""De-hexify a str or a byte object"""
- return codec_bytes(x, "hex")
+ return binascii.a2b_hex(raw(x))
def base64_bytes(x):
"""Turn base64 into bytes"""
- return codec_bytes(raw(x), "base64")
+ if six.PY2:
+ return base64.decodestring(x)
+ return base64.decodebytes(raw(x))
+
+def bytes_base64(x):
+ """Turn bytes into base64"""
+ if six.PY2:
+ return base64.encodestring(x).replace('\n', '')
+ return base64.encodebytes(raw(x)).replace(b'\n', b'')
diff --git a/scapy/consts.py b/scapy/consts.py
index 8d33cfa..2eeb849 100644
--- a/scapy/consts.py
+++ b/scapy/consts.py
@@ -74,6 +74,3 @@
uname = os.uname()
LOOPBACK_NAME = "lo" if LINUX else "lo0"
LOOPBACK_INTERFACE = LOOPBACK_NAME
-
-def parent_function():
- return inspect.getouterframes(inspect.currentframe())
diff --git a/scapy/contrib/gtp.py b/scapy/contrib/gtp.py
index 80101fb..963f31c 100644
--- a/scapy/contrib/gtp.py
+++ b/scapy/contrib/gtp.py
@@ -20,7 +20,7 @@
from scapy.layers.inet6 import IP6Field
from scapy.error import warning
from scapy.modules.six.moves import range
-from scapy.compat import orb, plain_str
+from scapy.compat import chb, orb, plain_str
# GTP Data types
@@ -151,9 +151,6 @@
def i2h(self, pkt, val):
return val
- def i2repr(self, pkt, x):
- return repr(self.i2h(pkt,x))
-
def m2i(self, pkt, val):
ret = []
for v in val:
@@ -161,10 +158,10 @@
left = byte >> 4
right = byte & 0xf
if left == 0xf:
- ret += [TBCD_TO_ASCII[right]]
+ ret.append(TBCD_TO_ASCII[right:right + 1])
else:
- ret += [TBCD_TO_ASCII[right], TBCD_TO_ASCII[left]]
- return "".join(ret)
+ ret += [TBCD_TO_ASCII[right:right + 1], TBCD_TO_ASCII[left:left + 1]]
+ return b"".join(ret)
def i2m(self, pkt, val):
val = str(val)
@@ -178,7 +175,7 @@
return ret_string
-TBCD_TO_ASCII = "0123456789*#abc"
+TBCD_TO_ASCII = b"0123456789*#abc"
class GTP_ExtensionHeader(Packet):
@classmethod
@@ -405,8 +402,8 @@
class APNStrLenField(StrLenField):
# Inspired by DNSStrField
def m2i(self, pkt, s):
- ret_s = ""
- tmp_s = plain_str(s)
+ ret_s = b""
+ tmp_s = s
while tmp_s:
tmp_len = orb(tmp_s[0]) + 1
if tmp_len > len(tmp_s):
@@ -414,11 +411,11 @@
ret_s += tmp_s[1:tmp_len]
tmp_s = tmp_s[tmp_len:]
if len(tmp_s) :
- ret_s += "."
+ ret_s += b"."
s = ret_s
return s
def i2m(self, pkt, s):
- s = "".join((chr(len(x))+x for x in s.split(".")))
+ s = b"".join(chb(len(x)) + x for x in s.split("."))
return s
diff --git a/scapy/contrib/gtp.uts b/scapy/contrib/gtp.uts
index db2aab1..d1de5eb 100644
--- a/scapy/contrib/gtp.uts
+++ b/scapy/contrib/gtp.uts
@@ -21,6 +21,7 @@
gtp.dport == 2123 and gtp.teid == 2807 and len(gtp.IE_list) == 5
= GTPCreatePDPContextRequest(), basic dissection
+~ random_weird_py3
random.seed(0x2807)
assert raw(gtp) in [b"E\x00\x00K\x00\x01\x00\x00@\x11|\x9f\x7f\x00\x00\x01\x7f\x00\x00\x01\x08K\x08K\x007\x1c\xdb0\x10\x00'\x00\x00\n\xf7\x10A\xb77-\x14\x0f\x85\x00\x04\xd6!-b\x85\x00\x04\xbf\xf8\xc9Z\x87\x00\x0faWdWRWX0qEAXLPE",
b"E\x00\x00K\x00\x01\x00\x00@\x11|\x9f\x7f\x00\x00\x01\x7f\x00\x00\x01\x08K\x08K\x007J\r0\x10\x00'\x00\x00\n\xf7\x10\xab\xec\x14Y\x14\n\x85\x00\x04\xbb((,\x85\x00\x04V*\xe0\xff\x87\x00\x0f0eQSJUqm06eIP1Q"]
@@ -50,21 +51,21 @@
h = "333333333333222222222222810083840800458800ba00000000fc1185060a2a00010a2a00024ace084b00a68204321000960eeec43e99ae00000202081132547600000332f42004d27b0ffc102c0787b611b2f9023914051a0400800002f1218300070661616161616184001480802110010100108106000000008306000000008500040a2a00018500040a2a00018600079111111111111187000d0213621f7396737374f2ffff0094000120970001029800080032f42004d204d299000240009a00081111111111110000d111193b"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[0]
-ie.ietype == 2 and ie.imsi == '2080112345670000'
+ie.ietype == 2 and ie.imsi == b'2080112345670000'
= IE_IMSI(), basic instantiation
ie = IE_IMSI(imsi='208103397660354')
-ie.ietype == 2 and ie.imsi == '208103397660354'
+ie.ietype == 2 and ie.imsi == b'208103397660354'
= IE_Routing(), dissect
h = "33333333333322222222222281008384080045880072647100003e11dcf60a2a00010a2a0002084b084b005e78d93212004ef51a4ac3a291ff000332f42004d27b10eb3981b414058500040a2a00018500040a2a000187000f0213921f7396d1fe7482ffff004a0094000110970001019800080132f42004d204d299000240fcb60001015bf2090f"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[0]
-ie.ietype == 3 and ie.MCC == '234' and ie.MNC == '02' and ie.LAC == 1234 and ie.RAC == 123
+ie.ietype == 3 and ie.MCC == b'234' and ie.MNC == b'02' and ie.LAC == 1234 and ie.RAC == 123
= IE_Routing(), basic instantiation
ie = IE_Routing(MCC='234', MNC='02', LAC=1234, RAC=123)
-ie.ietype == 3 and ie.MCC == '234' and ie.MNC == '02' and ie.LAC == 1234 and ie.RAC == 123
+ie.ietype == 3 and ie.MCC == b'234' and ie.MNC == b'02' and ie.LAC == 1234 and ie.RAC == 123
= IE_Recovery(), dissect
h = "3333333333332222222222228100038408004500002ac6e60000fd11ccbc0a2a00010a2a0002084b084b001659db32020006c192a26c8cb400000e0e00000000f4b40b31"
@@ -170,11 +171,11 @@
h = "333333333333222222222222810083840800458800bc00000000fc1184c90a2a00010a2a00024acf084b00a87bbb3210009867fe972185e800000202081132547600000332f42004d27b0ffc1093b20c3f11940eb2bf14051a0400800002f1218300070661616161616184001480802110010000108106000000008306000000008500040a2a00018500040a2a00018600079111111111111187000f0213921f7396d3fe74f2ffff004a0094000120970001019800080132f42004d204d299000240009a000811111111111100001b1212951c5bbe"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[8]
-ie.ietype == 131 and ie.APN == 'aaaaaa'
+ie.ietype == 131 and ie.APN == b'aaaaaa'
= IE_AccessPointName(), basic instantiation
ie = IE_AccessPointName(APN='aaaaaa')
-ie.ietype == 131 and ie.APN == 'aaaaaa'
+ie.ietype == 131 and ie.APN == b'aaaaaa'
= IE_ProtocolConfigurationOptions(), dissect
h = "333333333333222222222222810083840800458800c300000000fc1184e50a2a00010a2a00024a4d084b00af41993210009fdef90e15440900000202081132547600000332f42004d27b0ffc10c29998b81145c6c9ee14051a0a00800002f1218300070661616161616184001d80c02306010100060000802110010100108106000000008306000000008500040a2a00018500040a2a00018600079111111111111187000d0213621f73967373741affff0094000120970001029800080032f42004d204d299000240009a0008111111111111000081182fb2"
@@ -201,11 +202,11 @@
h = "333333333333222222222222810083840800458800c300000000fc1184e50a2a00010a2a00024a4d084b00af41993210009f79504a3e048e00000202081132547600000332f42004d27b0ffc10a692773d1158da9e2214051a0a00800002f1218300070661616161616184001d80c02306010100060000802110010100108106000000008306000000008500040a2a00018500040a2a00018600079111111111111187000d0213621f73967373741affff0094000120970001029800080032f42004d204d299000240009a0008111111111111000081182fb2"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[12]
-ie.ietype == 134 and ie.flags == 145 and ie.digits == '111111111111'
+ie.ietype == 134 and ie.flags == 145 and ie.digits == b'111111111111'
= IE_MSInternationalNumber(), basic instantiation
ie = IE_MSInternationalNumber(flags=145, digits='111111111111')
-ie.ietype == 134 and ie.flags == 145 and ie.digits == '111111111111'
+ie.ietype == 134 and ie.flags == 145 and ie.digits == b'111111111111'
= IE_QoS(), dissect
h = "3333333333332222222222228100838408004588005400000000fd1182850a2a00010a2a0002084b084b00406b4632130030afe9d3a3317e0000018010bd82f3997f9febcaf58500040a2a00018500040a2a000187000f0213921f7396d1fe7482ffff004a00f7a71e0a"
@@ -246,11 +247,11 @@
h = "3333333333332222222222228100a38408004588006800000000fd1134820a2a00010a2a00024aa5084b005408bb32120044981eb5dcb29400001016e85d9f14058500040a2a00018500040a2a000187000c0213921f739680fe74f2ffff94000130970001019800080132f42004d204d29900024000b6000101"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[7]
-ie.MCC == '234' and ie.MNC == '02' and ie.LAC == 1234 and ie.SAC == 1234
+ie.MCC == b'234' and ie.MNC == b'02' and ie.LAC == 1234 and ie.SAC == 1234
= IE_UserLocationInformation(), basic instantiation
ie = IE_UserLocationInformation(MCC='234', MNC='02', LAC=1234, SAC=1234)
-ie.ietype == 152 and ie.MCC == '234' and ie.MNC == '02' and ie.LAC == 1234 and ie.SAC == 1234
+ie.ietype == 152 and ie.MCC == b'234' and ie.MNC == b'02' and ie.LAC == 1234 and ie.SAC == 1234
= IE_MSTimeZone(), dissect
h = "3333333333332222222222228100a38408004588006800000000fd1134820a2a00010a2a00024aa5084b005408bb32120044f24a4d5825290000102ca9c8c314058500040a2a00018500040a2a000187000c0213921f739680fe74f2ffff94000130970001019800080132f42004d204d29900024000b6000101"
@@ -265,11 +266,11 @@
= IE_IMEI(), dissect
h = "333333333333222222222222810083840800458800c300000000fc1184e50a2a00010a2a00024a4d084b00af41993210009f2f3ae0eb7b9c00000202081132547600000332f42004d27b0ffc10424a10c8117ca21aba14051a0a00800002f1218300070661616161616184001d80c02306010100060000802110010100108106000000008306000000008500040a2a00018500040a2a00018600079111111111111187000d0213621f73967373741affff0094000120970001029800080032f42004d204d299000240009a0008111111111111000081182fb2"
gtp = Ether(hex_bytes(h))
-ie = gtp.IE_list[18] and ie.ietype == 154 and ie.IMEI == '0132750094080322'
+ie = gtp.IE_list[18] and ie.ietype == 154 and ie.IMEI == b'0132750094080322'
= IE_IMEI(), basic instantiation
ie = IE_IMEI(IMEI='0132750094080322')
-ie.ietype == 154 and ie.IMEI == '0132750094080322'
+ie.ietype == 154 and ie.IMEI == b'0132750094080322'
= IE_MSInfoChangeReportingAction(), basic instantiation
ie = IE_MSInfoChangeReportingAction(Action=12)
@@ -299,4 +300,4 @@
= IE_PrivateExtension(), basic instantiation
ie = IE_PrivateExtension(extention_value='hello')
-ie.ietype == 255 and ie.extention_value == 'hello'
+ie.ietype == 255 and ie.extention_value == b'hello'
diff --git a/scapy/contrib/gtp_v2.py b/scapy/contrib/gtp_v2.py
index e16f83c..c132753 100755
--- a/scapy/contrib/gtp_v2.py
+++ b/scapy/contrib/gtp_v2.py
@@ -308,7 +308,7 @@
ShortField("length", None),
BitField("CR_flag", 0, 4),
BitField("instance", 0, 4),
- gtp.APNStrLenField("APN", "nternet",
+ gtp.APNStrLenField("APN", "internet",
length_from=lambda x: x.length)]
diff --git a/scapy/contrib/gtp_v2.uts b/scapy/contrib/gtp_v2.uts
index 0f3e270..5488578 100644
--- a/scapy/contrib/gtp_v2.uts
+++ b/scapy/contrib/gtp_v2.uts
@@ -38,11 +38,11 @@
h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd00000000661759000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100235700090385000010927f00000250001600580700000000000000000000000000000000000000007200020040005311004c"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[0]
-ie.IMSI == "2080112345670000"
+ie.IMSI == b"2080112345670000"
= IE_IMSI, basic instantiation
ie = IE_IMSI(ietype='IMSI', length=8, IMSI='2080112345670000')
-ie.ietype == 1 and ie.IMSI == '2080112345670000'
+ie.ietype == 1 and ie.IMSI == b'2080112345670000'
= IE_Cause, dissection
h = "3333333333332222222222228100838408004588004a00000000fd1193160a2a00010a2a0002084b824600366a744823002a45e679235ea151000200020010005d001800490001006c0200020010005700090081000010927f000002558d3b69"
@@ -80,11 +80,11 @@
h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[7]
-ie.APN == 'aaaaaaaaaaaaaaaaaaaaaaaaa'
+ie.APN == b'aaaaaaaaaaaaaaaaaaaaaaaaa'
= IE_APN, basic instantiation
ie = IE_APN(ietype='APN', length=26, APN='aaaaaaaaaaaaaaaaaaaaaaaaa')
-ie.ietype == 71 and ie.APN == 'aaaaaaaaaaaaaaaaaaaaaaaaa'
+ie.ietype == 71 and ie.APN == b'aaaaaaaaaaaaaaaaaaaaaaaaa'
= IE_AMBR, dissection
h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
@@ -131,11 +131,11 @@
h = "3333333333332222222222228100838408004580006d00000000f31180d20a2a00010a2a0002084b85930059e49a4823004d55819f6500ede7000200020010004c000600111111111111490001003248000800000061a8000249f07f000100005d001300490001000b0200020010005e00040039004f454a0004007f00000436f73a63"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[1]
-ie.digits == '111111111111'
+ie.digits == b'111111111111'
= IE_MSISDN, basic instantiation
ie = IE_MSISDN(ietype='MSISDN', length=6, digits='111111111111')
-ie.ietype == 76 and ie.digits == '111111111111'
+ie.ietype == 76 and ie.digits == b'111111111111'
= IE_Indication, dissection
h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
@@ -197,23 +197,23 @@
h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[3]
-ie.MCC == '234' and ie.MNC == '02'
+ie.MCC == b'234' and ie.MNC == b'02'
= IE_ServingNetwork, basic instantiation
ie = IE_ServingNetwork(
ietype='Serving Network', length=3, MCC='234', MNC='02')
-ie.ietype == 83 and ie.MCC == '234' and ie.MNC == '02'
+ie.ietype == 83 and ie.MCC == b'234' and ie.MNC == b'02'
= IE_ULI, dissection
h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
gtp = Ether(hex_bytes(h))
ie = gtp.IE_list[2]
-ie.TAI_Present == 1 and ie.ECGI_Present == 1 and ie.TAI.MCC == '234' and ie.TAI.MNC == '02' and ie.TAI.TAC == 12345 and ie.ECGI.MCC == '234' and ie.ECGI.MNC == '02' and ie.ECGI.ECI == 123456
+ie.TAI_Present == 1 and ie.ECGI_Present == 1 and ie.TAI.MCC == b'234' and ie.TAI.MNC == b'02' and ie.TAI.TAC == 12345 and ie.ECGI.MCC == b'234' and ie.ECGI.MNC == b'02' and ie.ECGI.ECI == 123456
= IE_ULI, basic instantiation
ie = IE_ULI(ietype='ULI', length=13, LAI_Present=0, ECGI_Present=1, TAI_Present=1, RAI_Present=0, SAI_Present=0,
CGI_Present=0, TAI=ULI_TAI(MCC='234', MNC='02', TAC=12345), ECGI=ULI_ECGI(MCC='234', MNC='02', ECI=123456))
-ie.ietype == 86 and ie.LAI_Present == 0 and ie.ECGI_Present == 1 and ie.TAI_Present == 1 and ie.RAI_Present == 0 and ie.SAI_Present == 0 and ie.CGI_Present == 0 and ie.TAI.MCC == '234' and ie.TAI.MNC == '02' and ie.TAI.TAC == 12345 and ie.ECGI.MCC == '234' and ie.ECGI.MNC == '02' and ie.ECGI.ECI == 123456
+ie.ietype == 86 and ie.LAI_Present == 0 and ie.ECGI_Present == 1 and ie.TAI_Present == 1 and ie.RAI_Present == 0 and ie.SAI_Present == 0 and ie.CGI_Present == 0 and ie.TAI.MCC == b'234' and ie.TAI.MNC == b'02' and ie.TAI.TAC == 12345 and ie.ECGI.MCC == b'234' and ie.ECGI.MNC == b'02' and ie.ECGI.ECI == 123456
= IE_FTEID, dissection
h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
diff --git a/scapy/contrib/ikev2.uts b/scapy/contrib/ikev2.uts
index 106e6fb..331bdcd 100644
--- a/scapy/contrib/ikev2.uts
+++ b/scapy/contrib/ikev2.uts
@@ -83,7 +83,7 @@
= IKEv2_payload_Encrypted_Fragment, simple tests
s = b"\x00\x00\x00\x08\x00\x01\x00\x01"
-assert str(IKEv2_payload_Encrypted_Fragment()) == s
+assert raw(IKEv2_payload_Encrypted_Fragment()) == s
p = IKEv2_payload_Encrypted_Fragment(s)
assert p.length == 8 and p.frag_number == 1
diff --git a/scapy/contrib/isis.py b/scapy/contrib/isis.py
index e3a0122..877e280 100644
--- a/scapy/contrib/isis.py
+++ b/scapy/contrib/isis.py
@@ -105,7 +105,7 @@
def isis_nodeid2str(nodeid):
- return b"%s%s" % (isis_sysid2str(nodeid[:-3]), hex_bytes(nodeid[-2:]))
+ return isis_sysid2str(nodeid[:-3]) + hex_bytes(nodeid[-2:])
def isis_str2nodeid(s):
@@ -113,7 +113,7 @@
def isis_lspid2str(lspid):
- return b"%s%s" % (isis_nodeid2str(lspid[:-3]), hex_bytes(lspid[-2:]))
+ return isis_nodeid2str(lspid[:-3]) + hex_bytes(lspid[-2:])
def isis_str2lspid(s):
diff --git a/scapy/contrib/lldp.py b/scapy/contrib/lldp.py
index b733a60..09c3b18 100644
--- a/scapy/contrib/lldp.py
+++ b/scapy/contrib/lldp.py
@@ -44,12 +44,12 @@
from scapy.config import conf
from scapy.layers.dot11 import Packet
from scapy.layers.l2 import Ether, Dot1Q, bind_layers, \
- struct, BitField, StrLenField, ByteEnumField, BitEnumField, \
+ BitField, StrLenField, ByteEnumField, BitEnumField, \
BitFieldLenField, ShortField, Padding, Scapy_Exception, \
XStrLenField
from scapy.modules.six.moves import range
from scapy.data import ETHER_TYPES
-from scapy.compat import raw
+from scapy.compat import orb, raw
LLDP_NEAREST_BRIDGE_MAC = '01:80:c2:00:00:0e'
LLDP_NEAREST_NON_TPMR_BRIDGE_MAC = '01:80:c2:00:00:03'
@@ -145,7 +145,7 @@
def post_build(self, pkt, pay):
- last_layer = not len(pay)
+ last_layer = not pay
if last_layer and conf.contribs['LLDP'].strict_mode() and \
type(self).__name__ != LLDPDUEndOfLLDPDU.__name__:
raise LLDPInvalidLastLayerException('Last layer must be instance '
@@ -162,8 +162,7 @@
else:
return pkt + pay
- not_lowest_lldpdu = under_layer.__class__.__base__.__name__ is 'LLDPDU'
- if not_lowest_lldpdu:
+ if isinstance(under_layer, LLDPDU):
return pkt + pay
frame_size, under_layer = LLDPDU._dot1q_headers_size(under_layer)
@@ -177,11 +176,8 @@
frame_size += LLDPDU.ETHER_HEADER_LEN
frame_size += len(pkt) + len(pay) + LLDPDU.ETHER_FSC_LEN
if frame_size < LLDPDU.ETHER_FRAME_MIN_LEN:
- pad = Padding()
- pad.load = b'\x00' * (LLDPDU.ETHER_FRAME_MIN_LEN - frame_size)
- return pkt + pay + raw(pad)
- else:
- return pkt + pay
+ return pkt + pay + b'\x00' * (LLDPDU.ETHER_FRAME_MIN_LEN - frame_size)
+ return pkt + pay
@staticmethod
def _frame_structure_check(structure_description):
@@ -255,7 +251,7 @@
standard_tlv_multiplicity,
tlv_type_count[tlv_type_name]))
- except KeyError as err:
+ except KeyError:
raise LLDPInvalidTLVCount('Missing TLV layer of type '
'{}.'.format(tlv_type_name))
@@ -269,7 +265,7 @@
LLDPDU.LAYER_STACK.append(self.__class__.__name__)
try:
LLDPDU.LAYER_MULTIPLICITIES[self.__class__.__name__] += 1
- except KeyError as err:
+ except KeyError:
LLDPDU.LAYER_MULTIPLICITIES[self.__class__.__name__] = 1
return s
@@ -321,7 +317,7 @@
"""
run layer specific checks
"""
- if conf.contribs['LLDP'].strict_mode() and len(self.id) == 0:
+ if conf.contribs['LLDP'].strict_mode() and not self.id:
raise LLDPInvalidLengthField('id must be >= 1 characters long')
def post_dissect(self, s):
@@ -370,7 +366,7 @@
"""
run layer specific checks
"""
- if conf.contribs['LLDP'].strict_mode() and len(self.id) == 0:
+ if conf.contribs['LLDP'].strict_mode() and not self.id:
raise LLDPInvalidLengthField('id must be >= 1 characters long')
def post_dissect(self, s):
diff --git a/scapy/contrib/lldp.uts b/scapy/contrib/lldp.uts
index 32326f9..19d6c06 100644
--- a/scapy/contrib/lldp.uts
+++ b/scapy/contrib/lldp.uts
@@ -223,8 +223,8 @@
assert sys_capabilities.mac_bridge_enabled == 0
assert sys_capabilities.repeater_enabled == 0
assert sys_capabilities.other_enabled == 0
-assert frm[LLDPDUManagementAddress].management_address == '1.2.3.4'
-assert frm[LLDPDUSystemName].system_name == 'things will'
-assert frm[LLDPDUManagementAddress].object_id == 'burn'
-assert frm[LLDPDUSystemDescription].description == 'without tests.'
-assert frm[LLDPDUPortDescription].description == 'always!'
+assert frm[LLDPDUManagementAddress].management_address == b'1.2.3.4'
+assert frm[LLDPDUSystemName].system_name == b'things will'
+assert frm[LLDPDUManagementAddress].object_id == b'burn'
+assert frm[LLDPDUSystemDescription].description == b'without tests.'
+assert frm[LLDPDUPortDescription].description == b'always!'
diff --git a/scapy/contrib/mqtt.uts b/scapy/contrib/mqtt.uts
index 5d2c914..26aa712 100644
--- a/scapy/contrib/mqtt.uts
+++ b/scapy/contrib/mqtt.uts
@@ -14,8 +14,8 @@
= MQTTPublish, packet instanciation
p = MQTT()/MQTTPublish(topic='test1',value='test2')
assert(p.type == 3)
-assert(p.topic == 'test1')
-assert(p.value == 'test2')
+assert(p.topic == b'test1')
+assert(p.value == b'test2')
assert(p.len == None)
assert(p.length == None)
@@ -35,7 +35,7 @@
= MQTTConnect, packet instanciation
c = MQTT()/MQTTConnect(clientIdlen=5, clientId='newid')
assert(c.type == 1)
-assert(c.clientId == 'newid')
+assert(c.clientId == b'newid')
assert(c.clientIdlen == 5)
= MQTTConnect, packet dissection
@@ -73,7 +73,7 @@
sb = MQTT()/MQTTSubscribe(msgid=1,topic='newtopic',QOS=0,length=0)
assert(sb.type == 8)
assert(sb.msgid == 1)
-assert(sb.topic == 'newtopic')
+assert(sb.topic == b'newtopic')
assert(sb.length == 0)
assert(sb[MQTTSubscribe].QOS == 0)
diff --git a/scapy/contrib/tacacs.py b/scapy/contrib/tacacs.py
index ee2cac6..9f7e1f3 100755
--- a/scapy/contrib/tacacs.py
+++ b/scapy/contrib/tacacs.py
@@ -27,8 +27,8 @@
from scapy.fields import FieldListField
from scapy.fields import FieldLenField, ConditionalField, StrLenField
from scapy.layers.inet import TCP
+from scapy.compat import chb, orb
from scapy.config import conf
-from scapy.consts import *
from scapy.modules.six.moves import range
SECRET = 'test'
diff --git a/scapy/contrib/tacacs.uts b/scapy/contrib/tacacs.uts
index 441cd51..c25a608 100644
--- a/scapy/contrib/tacacs.uts
+++ b/scapy/contrib/tacacs.uts
@@ -2,6 +2,7 @@
= default instanciation
+from scapy.consts import WINDOWS
if WINDOWS:
route_add_loopback()
@@ -77,7 +78,7 @@
= default values build
pkt = TacacsAuthenticationContinue()
-TacacsAuthenticationContinue in pkt and pkt.data == '' and pkt.user_msg == '' and pkt.data_len is None and pkt.user_msg_len is None
+TacacsAuthenticationContinue in pkt and pkt.data == b'' and pkt.user_msg == b'' and pkt.data_len is None and pkt.user_msg_len is None
= filled values build -- SSH connection sample secret = test, password = pass
@@ -165,7 +166,7 @@
= default values build
pkt = IP()/TCP(dport=49)/TacacsHeader(seq=2, type=3)/TacacsAccountingReply()
-TacacsAccountingReply in pkt and pkt.server_msg == '' and pkt.server_msg_len is None and pkt.status is None
+TacacsAccountingReply in pkt and pkt.server_msg == b'' and pkt.server_msg_len is None and pkt.status is None
= filled values build -- SSH connection sample secret = test
diff --git a/scapy/fields.py b/scapy/fields.py
index 66a55b2..d0d5034 100644
--- a/scapy/fields.py
+++ b/scapy/fields.py
@@ -389,11 +389,20 @@
self.remain = remain
def i2len(self, pkt, i):
return len(i)
+ def any2i(self, pkt, x):
+ if isinstance(x, str if six.PY3 else unicode):
+ x = raw(x)
+ return super(StrField, self).any2i(pkt, x)
+ def i2repr(self, pkt, x):
+ val = super(StrField, self).i2repr(pkt, x)
+ if val[:2] in ['b"', "b'"]:
+ return val[1:]
+ return val
def i2m(self, pkt, x):
if x is None:
- x = b""
- elif not isinstance(x, bytes):
- x = raw(x)
+ return b""
+ if not isinstance(x, bytes):
+ return raw(x)
return x
def addfield(self, pkt, s, val):
return s + self.i2m(pkt, val)
@@ -585,7 +594,7 @@
def i2repr(self, pkt, v):
if isinstance(v, bytes):
v = v.rstrip(b"\0")
- return repr(v)
+ return super(StrFixedLenField, self).i2repr(pkt, v)
def getfield(self, pkt, s):
l = self.length_from(pkt)
return s[l:], self.m2i(pkt,s[:l])
@@ -644,7 +653,7 @@
"""
def i2repr(self, pkt, x):
- if not x:
+ if x is None:
return repr(x)
return bytes_hex(x).decode()
diff --git a/scapy/layers/dhcp6.py b/scapy/layers/dhcp6.py
index 3e3bf93..fa58ccc 100644
--- a/scapy/layers/dhcp6.py
+++ b/scapy/layers/dhcp6.py
@@ -739,13 +739,12 @@
l = orb(x[0])
cur.append(x[1:1+l])
x = x[l+1:]
- ret_str = b".".join(cur)
- return plain_str(ret_str)
+ return b".".join(cur)
def i2m(self, pkt, x):
if not x:
return b""
- return b"".join(chb(len(z)) + z.encode("utf8") for z in x.split('.'))
+ return b"".join(chb(len(z)) + z for z in x.split(b'.'))
class DHCP6OptNISDomain(_DHCP6OptGuessPayload): #RFC3898
name = "DHCP6 Option - NIS Domain Name"
diff --git a/scapy/layers/dns.py b/scapy/layers/dns.py
index b73156c..a5312e4 100644
--- a/scapy/layers/dns.py
+++ b/scapy/layers/dns.py
@@ -33,24 +33,24 @@
class DNSStrField(StrField):
def h2i(self, pkt, x):
- if x == "":
- return "."
+ if not x:
+ return b"."
return x
def i2m(self, pkt, x):
- if x == ".":
+ if x == b".":
return b"\x00"
# Truncate chunks that cannot be encoded (more than 63 bytes..)
- x = b"".join(chb(len(y)) + y.encode("utf8") for y in (k[:63] for k in x.split(".")))
+ x = b"".join(chb(len(y)) + y for y in (k[:63] for k in x.split(b".")))
if orb(x[-1]) != 0:
x += b"\x00"
return x
def getfield(self, pkt, s):
- n = ""
+ n = b""
if orb(s[0]) == 0:
- return s[1:], "."
+ return s[1:], b"."
while True:
l = orb(s[0])
s = s[1:]
@@ -67,7 +67,7 @@
else:
raise Scapy_Exception("DNS message can't be compressed at this point!")
else:
- n += plain_str(s[:l])+"."
+ n += s[:l] + b"."
s = s[l:]
return s, n
@@ -118,13 +118,13 @@
jpath.append(p)
continue
elif l > 0: # Label
- name += s[p:p+l]+b"."
+ name += s[p:p+l] + b"."
p += l
continue
break
if q:
p = q
- return plain_str(name),p
+ return name, p
class DNSRRField(StrField):
@@ -153,8 +153,8 @@
p += rdlen
- rr.rrname = plain_str(name)
- return rr,p
+ rr.rrname = name
+ return rr, p
def getfield(self, pkt, s):
if isinstance(s, tuple) :
s,p = s
@@ -184,7 +184,7 @@
ret = s[p:p+4]
p += 4
rr = DNSQR(b"\x00"+ret, _orig_s=s, _orig_p=p)
- rr.qname = plain_str(name)
+ rr.qname = name
return rr, p
@@ -226,7 +226,7 @@
if s:
s = inet_aton(s)
elif pkt.type in [2, 3, 4, 5, 12]: # NS, MD, MF, CNAME, PTR
- s = b"".join(chb(len(x)) + x.encode() for x in s.split('.'))
+ s = b"".join(chb(len(x)) + x for x in s.split(b'.'))
if orb(s[-1]):
s += b"\x00"
elif pkt.type == 16: # TXT
diff --git a/scapy/layers/inet.py b/scapy/layers/inet.py
index 7e1a470..1f5cd28 100644
--- a/scapy/layers/inet.py
+++ b/scapy/layers/inet.py
@@ -1502,7 +1502,7 @@
self.src = self.l4.src
self.swin=self.l4[TCP].window
self.dwin=1
- self.rcvbuf=""
+ self.rcvbuf = b""
bpf = "host %s and host %s and port %i and port %i" % (self.src,
self.dst,
self.sport,
@@ -1576,7 +1576,7 @@
self.l4[TCP].flags = "A"
self.send(self.l4)
self.rcvbuf += data
- if pkt[TCP].flags & 8 != 0: #PUSH
+ if pkt[TCP].flags.P:
self.oi.tcp.send(self.rcvbuf)
self.rcvbuf = b""
diff --git a/scapy/layers/inet6.py b/scapy/layers/inet6.py
index f884c35..87e5746 100644
--- a/scapy/layers/inet6.py
+++ b/scapy/layers/inet6.py
@@ -26,11 +26,16 @@
from __future__ import absolute_import
from __future__ import print_function
+
+from hashlib import md5
import random
+import re
import socket
-import sys
+import struct
+from time import gmtime, strftime
+
import scapy.modules.six as six
-from scapy.modules.six.moves import range
+from scapy.modules.six.moves import range, zip
if not socket.has_ipv6:
raise socket.error("can't use AF_INET6, IPv6 is disabled")
if not hasattr(socket, "IPPROTO_IPV6"):
@@ -40,22 +45,31 @@
# Workaround for https://bitbucket.org/secdev/scapy/issue/5119
socket.IPPROTO_IPIP = 4
+from scapy.arch import get_if_hwaddr
from scapy.config import conf
-from scapy.base_classes import *
-from scapy.data import *
-from scapy.compat import *
+from scapy.base_classes import Gen
+from scapy.data import DLT_IPV6, DLT_RAW, DLT_RAW_ALT, ETHER_ANY, ETH_P_IPV6, \
+ MTU
+from scapy.compat import chb, orb, raw, plain_str
import scapy.consts
-from scapy.fields import *
-from scapy.packet import *
-from scapy.volatile import *
-from scapy.sendrecv import sr,sr1,srp1
+from scapy.fields import BitEnumField, BitField, ByteEnumField, ByteField, \
+ DestField, Field, FieldLenField, FlagsField, IntField, LongField, \
+ MACField, PacketLenField, PacketListField, ShortEnumField, ShortField, \
+ StrField, StrFixedLenField, StrLenField, X3BytesField, XBitField, \
+ XIntField, XShortField
+from scapy.packet import bind_layers, Packet, Raw
+from scapy.volatile import RandInt, RandIP6, RandShort
+from scapy.sendrecv import sendp, sniff, sr, srp1
from scapy.as_resolvers import AS_resolver_riswhois
-from scapy.supersocket import SuperSocket,L3RawSocket
-from scapy.arch import *
-from scapy.utils6 import *
-from scapy.layers.l2 import *
-from scapy.layers.inet import *
-from scapy.utils import inet_pton, inet_ntop, strxor
+from scapy.supersocket import SuperSocket, L3RawSocket
+from scapy.utils6 import in6_6to4ExtractAddr, in6_and, in6_cidr2mask, \
+ in6_getnsma, in6_getnsmac, in6_isaddr6to4, in6_isaddrllallnodes, \
+ in6_isaddrllallservers, in6_isaddrTeredo, in6_isllsnmaddr, in6_ismaddr, \
+ in6_ptop, teredoAddrExtractInfo
+from scapy.layers.l2 import CookedLinux, Ether, GRE, Loopback, SNAP
+from scapy.layers.inet import IP, IPTools, TCP, TCPerror, TracerouteResult, \
+ UDP, UDPerror
+from scapy.utils import checksum, inet_pton, inet_ntop, strxor
from scapy.error import warning
if conf.route6 is None:
# unused import, only to initialize conf.route6
@@ -165,33 +179,28 @@
self.plen = netmask
def __iter__(self):
- def m8(i):
- if i % 8 == 0:
- return i
- tuple = [x for x in range(8, 129) if m8(x)]
- a = in6_and(self.net, self.mask)
- tmp = [x for x in struct.unpack("16B", a)]
+ def parse_digit(value, netmask):
+ netmask = min(8, max(netmask, 0))
+ value = int(value)
+ return (value & (0xff << netmask),
+ (value | (0xff >> (8 - netmask))) + 1)
- def parse_digit(a, netmask):
- netmask = min(8,max(netmask,0))
- a = (int(a) & (0xff<<netmask),(int(a) | (0xff>>(8-netmask)))+1)
- return a
- self.parsed = list(map(lambda x,y: parse_digit(x,y), tmp, map(lambda x,nm=self.plen: x-nm, tuple)))
+ self.parsed = [
+ parse_digit(x, y) for x, y in zip(
+ struct.unpack("16B", in6_and(self.net, self.mask)),
+ (x - self.plen for x in range(8, 129, 8)),
+ )
+ ]
def rec(n, l):
- if n and n % 2 == 0:
- sep = ':'
- else:
- sep = ''
+ sep = ':' if n and n % 2 == 0 else ''
if n == 16:
return l
- else:
- ll = []
- for i in range(*self.parsed[n]):
- for y in l:
- ll += [y+sep+'%.2x'%i]
- return rec(n+1, ll)
+ return rec(n + 1, [y + sep + '%.2x' % i
+ # faster than '%s%s%.2x' % (y, sep, i)
+ for i in range(*self.parsed[n])
+ for y in l])
return iter(rec(0, ['']))
@@ -244,7 +253,7 @@
return self.i2h(pkt,x)
elif not isinstance(x, Net6) and not isinstance(x, list):
if in6_isaddrTeredo(x): # print Teredo info
- server, flag, maddr, mport = teredoAddrExtractInfo(x)
+ server, _, maddr, mport = teredoAddrExtractInfo(x)
return "%s [Teredo srv: %s cli: %s:%s]" % (self.i2h(pkt, x), server, maddr,mport)
elif in6_isaddr6to4(x): # print encapsulated address
vaddr = in6_6to4ExtractAddr(x)
@@ -498,7 +507,7 @@
if not isinstance(other, IPv6): # self is reply, other is request
return False
if conf.checkIPaddr:
- ss = inet_pton(socket.AF_INET6, self.src)
+ # ss = inet_pton(socket.AF_INET6, self.src)
sd = inet_pton(socket.AF_INET6, self.dst)
os = inet_pton(socket.AF_INET6, other.src)
od = inet_pton(socket.AF_INET6, other.dst)
@@ -1121,7 +1130,6 @@
llen = len(l)
# reorder fragments
- i = 0
res = []
while l:
min_pos = 0
@@ -2132,10 +2140,9 @@
@conf.commands.register
def computeNIGroupAddr(name):
"""Compute the NI group Address. Can take a FQDN as input parameter"""
- import hashlib
name = name.lower().split(".")[0]
record = chr(len(name))+name
- h = hashlib.md5(record.encode("utf8"))
+ h = md5(record.encode("utf8"))
h = h.digest()
addr = "ff02::2:%2x%2x:%2x%2x" % struct.unpack("BBBB", h[:4])
return addr
@@ -2174,18 +2181,18 @@
!!! At the moment, compression is not implemented !!!
"""
- if isinstance(x, str):
- if x and x[-1] == '\x00': # stupid heuristic
- return x.encode("utf8")
+ if isinstance(x, bytes):
+ if x and x[-1:] == b'\x00': # stupid heuristic
+ return x
x = [x]
res = []
for n in x:
- termin = "\x00"
- if n.count('.') == 0: # single-component gets one more
- termin += '\x00'
- n = "".join(chr(len(y)) + y for y in n.split('.')) + termin
- res.append(n.encode("utf8"))
+ termin = b"\x00"
+ if n.count(b'.') == 0: # single-component gets one more
+ termin += b'\x00'
+ n = b"".join(chb(len(y)) + y for y in n.split(b'.')) + termin
+ res.append(n)
return b"".join(res)
@@ -2197,25 +2204,23 @@
(does not end with a null character, a one element list
is returned). Result is a list.
"""
- x = plain_str(x)
res = []
- cur = ""
+ cur = b""
while x:
l = orb(x[0])
x = x[1:]
- if l == 0:
- if cur and cur[-1] == '.':
+ if not l:
+ if cur and cur[-1:] == b'.':
cur = cur[:-1]
res.append(cur)
- cur = ""
+ cur = b""
if x and orb(x[0]) == 0: # single component
x = x[1:]
continue
if l & 0xc0: # XXX TODO : work on that -- arno
raise Exception("DNS message can't be compressed at this point!")
- else:
- cur += x[:l]+"."
- x = x[l:]
+ cur += x[:l] + b"."
+ x = x[l:]
return res
@@ -2235,20 +2240,23 @@
if x is tuple and isinstance(x[0], int):
return x
- val = None
- try: # Try IPv6
- inet_pton(socket.AF_INET6, x)
- val = (0, x)
+ # Try IPv6
+ try:
+ inet_pton(socket.AF_INET6, x.decode())
+ return (0, x.decode())
except:
- try: # Try IPv4
- inet_pton(socket.AF_INET, x)
- val = (2, x)
- except: # Try DNS
- if x is None:
- x = ""
- x = names2dnsrepr(x)
- val = (1, x)
- return val
+ pass
+ # Try IPv4
+ try:
+ inet_pton(socket.AF_INET, x.decode())
+ return (2, x.decode())
+ except:
+ pass
+ # Try DNS
+ if x is None:
+ x = b""
+ x = names2dnsrepr(x)
+ return (1, x)
def i2repr(self, pkt, x):
x = plain_str(x)
@@ -2257,15 +2265,10 @@
# we don't use dnsrepr2names() to deal with
# possible weird data extracted info
res = []
- weird = None
while val:
l = orb(val[0])
val = val[1:]
if l == 0:
- if (len(res) > 1 and val): # fqdn with data behind
- weird = val
- elif len(val) > 1: # single label with data behind
- weird = val[1:]
break
res.append(val[:l]+".")
val = val[l:]
@@ -2389,7 +2392,7 @@
# No user hint, let's use 'qtype' value for that purpose
if not isinstance(x, tuple):
if pkt is not None:
- qtype = getattr(pkt, "qtype")
+ qtype = pkt.qtype
else:
qtype = x[0]
x = x[1]
@@ -2397,26 +2400,33 @@
# From that point on, x is the value (second element of the tuple)
if qtype == 2: # DNS name
- if isinstance(x, str): # listify the string
+ if isinstance(x, (str, bytes)): # listify the string
x = [x]
- if isinstance(x, list) and x and not isinstance(x[0], int): # ttl was omitted : use 0
- x = [0] + x
- ttl = x[0]
- names = x[1:]
+ if isinstance(x, list):
+ x = [val.encode() if isinstance(val, str) else val for val in x]
+ if x and isinstance(x[0], six.integer_types):
+ ttl = x[0]
+ names = x[1:]
+ else:
+ ttl = 0
+ names = x
return (2, [ttl, names2dnsrepr(names)])
elif qtype in [3, 4]: # IPv4 or IPv6 addr
- if isinstance(x, str):
+ if not isinstance(x, list):
x = [x] # User directly provided an IP, instead of list
- # List elements are not tuples, user probably
- # omitted ttl value : we will use 0 instead
- def addttl(x):
- if isinstance(x, str):
- return (0, x)
+ def fixvalue(x):
+ # List elements are not tuples, user probably
+ # omitted ttl value : we will use 0 instead
+ if not isinstance(x, tuple):
+ x = (0, x)
+ # Decode bytes
+ if six.PY3 and isinstance(x[1], bytes):
+ x = (x[0], x[1].decode())
return x
- return (qtype, [addttl(d) for d in x])
+ return (qtype, [fixvalue(d) for d in x])
return (qtype, x)
@@ -2727,8 +2737,7 @@
i = int(x >> 32)
j = float(x & 0xffffffff) * 2.0**-32
res = i + j + delta
- from time import strftime
- t = time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime(res))
+ t = strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime(res))
return "%s (%d)" % (t, x)
@@ -3025,7 +3034,7 @@
def hashret(self):
return raw(self.cookie)
- def answers(self):
+ def answers(self, other):
if (isinstance(other, MIP6MH_CoTI) and
self.cookie == other.cookie):
return 1
diff --git a/scapy/layers/tls/automaton.py b/scapy/layers/tls/automaton.py
index db18bd2..c9f2329 100644
--- a/scapy/layers/tls/automaton.py
+++ b/scapy/layers/tls/automaton.py
@@ -54,7 +54,7 @@
super(_TLSAutomaton, self).parse_args(**kargs)
self.socket = None
- self.remain_in = ""
+ self.remain_in = b""
self.buffer_in = [] # these are 'fragments' inside records
self.buffer_out = [] # these are records
@@ -103,8 +103,8 @@
grablen = struct.unpack('!H', self.remain_in[3:5])[0] + 5
still_getting_len = False
elif grablen == 2 and len(self.remain_in) >= 2:
- byte0 = struct.unpack("B", self.remain_in[0])[0]
- byte1 = struct.unpack("B", self.remain_in[1])[0]
+ byte0 = struct.unpack("B", self.remain_in[:1])[0]
+ byte1 = struct.unpack("B", self.remain_in[1:2])[0]
if (byte0 in _tls_type) and (byte1 == 3):
# Retry following TLS scheme. This will cause failure
# for SSLv2 packets with length 0x1{4-7}03.
@@ -132,16 +132,17 @@
except:
retry -= 1
- if self.remain_in < 2 or len(self.remain_in) != grablen:
+ if len(self.remain_in) < 2 or len(self.remain_in) != grablen:
# Remote peer is not willing to respond
return
p = TLS(self.remain_in, tls_session=self.cur_session)
self.cur_session = p.tls_session
- self.remain_in = ""
+ self.remain_in = b""
if isinstance(p, SSLv2) and not p.msg:
p.msg = Raw("")
- if self.cur_session.tls_version < 0x0304:
+ if self.cur_session.tls_version is None or \
+ self.cur_session.tls_version < 0x0304:
self.buffer_in += p.msg
else:
if isinstance(p, TLS13):
@@ -156,7 +157,8 @@
p = p.payload
elif isinstance(p.payload, TLS):
p = p.payload
- if self.cur_session.tls_version < 0x0304:
+ if self.cur_session.tls_version is None or \
+ self.cur_session.tls_version < 0x0304:
self.buffer_in += p.msg
else:
self.buffer_in += p.inner.msg
@@ -213,7 +215,7 @@
"""
Send all buffered records and update the session accordingly.
"""
- s = "".join([p.str_stateful() for p in self.buffer_out])
+ s = b"".join(p.raw_stateful() for p in self.buffer_out)
self.socket.send(s)
self.buffer_out = []
diff --git a/scapy/layers/tls/automaton_cli.py b/scapy/layers/tls/automaton_cli.py
index 0a4bb80..d58a6b2 100644
--- a/scapy/layers/tls/automaton_cli.py
+++ b/scapy/layers/tls/automaton_cli.py
@@ -35,6 +35,7 @@
KeyShareEntry)
from scapy.layers.tls.record import (TLS, TLSAlert, TLSChangeCipherSpec,
TLSApplicationData)
+from scapy.modules import six
class TLSClientAutomaton(_TLSAutomaton):
@@ -96,13 +97,12 @@
self.advertised_tls_version = v
self.linebreak = False
- if isinstance(data, str):
+ if isinstance(data, bytes):
self.data_to_send = [data]
+ elif isinstance(data, six.string_types):
+ self.data_to_send = [raw(data)]
elif isinstance(data, list):
- # parse_args is called two times, this is why we have to copy
- # the data list for reversing it afterwards...
- self.data_to_send = list(data)
- self.data_to_send.reverse()
+ self.data_to_send = list(raw(d) for d in reversed(data))
else:
self.data_to_send = []
@@ -445,15 +445,13 @@
Special characters are handled so that it becomes a valid HTTP request.
"""
if not self.data_to_send:
- data = raw_input()
- data = data.replace("\\r", "\r")
- data = data.replace("\\n", "\n")
+ data = six.moves.input().replace('\\r', '\r').replace('\\n', '\n').encode()
else:
data = self.data_to_send.pop()
- if data == "quit":
+ if data == b"quit":
return
if self.linebreak:
- data += "\n"
+ data += b"\n"
self.add_record()
self.add_msg(TLSApplicationData(data=data))
raise self.ADDED_CLIENTDATA()
@@ -490,7 +488,7 @@
raise self.WAIT_CLIENTDATA()
p = self.buffer_in[0]
if isinstance(p, TLSApplicationData):
- print("> Received: %s" % p.data)
+ print("> Received: %r" % p.data)
elif isinstance(p, TLSAlert):
print("> Received: %r" % p)
raise self.CLOSE_NOTIFY()
@@ -735,9 +733,7 @@
@ATMT.condition(SSLv2_WAITING_CLIENTDATA, prio=1)
def sslv2_add_ClientData(self):
if not self.data_to_send:
- data = raw_input()
- data = data.replace("\\r", "\r")
- data = data.replace("\\n", "\n")
+ data = six.moves.input().replace('\\r', '\r').replace('\\n', '\n').encode()
else:
data = self.data_to_send.pop()
self.vprint("> Read from list: %s" % data)
@@ -780,8 +776,8 @@
if not self.buffer_in:
raise self.SSLv2_WAITING_CLIENTDATA()
p = self.buffer_in[0]
- print("> Received: %s" % p.load)
- if p.load.startswith("goodbye"):
+ print("> Received: %r" % p.load)
+ if p.load.startswith(b"goodbye"):
raise self.SSLv2_CLOSE_NOTIFY()
self.buffer_in = self.buffer_in[1:]
raise self.SSLv2_HANDLED_SERVERDATA()
diff --git a/scapy/layers/tls/automaton_srv.py b/scapy/layers/tls/automaton_srv.py
index 852f4bd..9f76df4 100644
--- a/scapy/layers/tls/automaton_srv.py
+++ b/scapy/layers/tls/automaton_srv.py
@@ -487,14 +487,14 @@
p = self.buffer_in[0]
self.buffer_in = self.buffer_in[1:]
- recv_data = ""
+ recv_data = b""
if isinstance(p, TLSApplicationData):
- print("> Received: %s" % p.data)
+ print("> Received: %r" % p.data)
recv_data = p.data
- lines = recv_data.split("\n")
+ lines = recv_data.split(b"\n")
stop = False
for l in lines:
- if l.startswith("stop_server"):
+ if l.startswith(b"stop_server"):
stop = True
break
if stop:
@@ -505,10 +505,10 @@
else:
print("> Received: %r" % p)
- if recv_data.startswith("GET / HTTP/1.1"):
+ if recv_data.startswith(b"GET / HTTP/1.1"):
p = TLSApplicationData(data=self.http_sessioninfo())
- if self.is_echo_server or recv_data.startswith("GET / HTTP/1.1"):
+ if self.is_echo_server or recv_data.startswith(b"GET / HTTP/1.1"):
self.add_record()
self.add_msg(p)
raise self.ADDED_SERVERDATA()
@@ -788,8 +788,8 @@
self.buffer_in = self.buffer_in[1:]
if hasattr(p, "load"):
cli_data = p.load
- print("> Received: %s" % cli_data)
- if cli_data.startswith("goodbye"):
+ print("> Received: %r" % cli_data)
+ if cli_data.startswith(b"goodbye"):
self.vprint()
self.vprint("Seems like the client left...")
raise self.WAITING_CLIENT()
@@ -797,20 +797,20 @@
cli_data = str(p)
print("> Received: %r" % p)
- lines = cli_data.split("\n")
+ lines = cli_data.split(b"\n")
stop = False
for l in lines:
- if l.startswith("stop_server"):
+ if l.startswith(b"stop_server"):
stop = True
break
if stop:
raise self.SSLv2_CLOSE_NOTIFY_FINAL()
- answer = ""
- if cli_data.startswith("GET / HTTP/1.1"):
+ answer = b""
+ if cli_data.startswith(b"GET / HTTP/1.1"):
p = Raw(self.http_sessioninfo())
- if self.is_echo_server or recv_data.startswith("GET / HTTP/1.1"):
+ if self.is_echo_server or recv_data.startswith(b"GET / HTTP/1.1"):
self.add_record(is_sslv2=True)
self.add_msg(p)
raise self.SSLv2_ADDED_SERVERDATA()
diff --git a/scapy/layers/tls/cert.py b/scapy/layers/tls/cert.py
index 5abf7ee..735e63a 100644
--- a/scapy/layers/tls/cert.py
+++ b/scapy/layers/tls/cert.py
@@ -68,12 +68,11 @@
def der2pem(der_string, obj="UNKNOWN"):
"""Convert DER octet string to PEM format (with optional header)"""
# Encode a byte string in PEM format. Header advertizes <obj> type.
- obj = raw(obj)
- pem_string = b"-----BEGIN %s-----\n" % obj
+ pem_string = ("-----BEGIN %s-----\n" % obj).encode()
base64_string = base64.b64encode(der_string)
chunks = [base64_string[i:i+64] for i in range(0, len(base64_string), 64)]
pem_string += b'\n'.join(chunks)
- pem_string += b"\n-----END %s-----\n" % obj
+ pem_string += ("\n-----END %s-----\n" % obj).encode()
return pem_string
@conf.commands.register
@@ -219,13 +218,13 @@
pass
else:
raise
- marker = "PUBLIC KEY"
+ marker = b"PUBLIC KEY"
except:
try:
pubkey = RSAPublicKey(obj.der)
obj.__class__ = PubKeyRSA
obj.import_from_asn1pkt(pubkey)
- marker = "RSA PUBLIC KEY"
+ marker = b"RSA PUBLIC KEY"
except:
# We cannot import an ECDSA public key without curve knowledge
raise Exception("Unable to import public key")
@@ -258,7 +257,7 @@
@crypto_validator
def fill_and_store(self, modulus=None, modulusLen=None, pubExp=None):
pubExp = pubExp or 65537
- if modulus is None:
+ if not modulus:
real_modulusLen = modulusLen or 2048
private_key = rsa.generate_private_key(public_exponent=pubExp,
key_size=real_modulusLen,
@@ -364,24 +363,24 @@
privkey = RSAPrivateKey_OpenSSL(obj.der)
privkey = privkey.privateKey
obj.__class__ = PrivKeyRSA
- marker = "PRIVATE KEY"
+ marker = b"PRIVATE KEY"
except:
try:
privkey = ECDSAPrivateKey_OpenSSL(obj.der)
privkey = privkey.privateKey
obj.__class__ = PrivKeyECDSA
- marker = "EC PRIVATE KEY"
+ marker = b"EC PRIVATE KEY"
multiPEM = True
except:
try:
privkey = RSAPrivateKey(obj.der)
obj.__class__ = PrivKeyRSA
- marker = "RSA PRIVATE KEY"
+ marker = b"RSA PRIVATE KEY"
except:
try:
privkey = ECDSAPrivateKey(obj.der)
obj.__class__ = PrivKeyECDSA
- marker = "EC PRIVATE KEY"
+ marker = b"EC PRIVATE KEY"
except:
raise Exception("Unable to import private key")
try:
diff --git a/scapy/layers/tls/crypto/prf.py b/scapy/layers/tls/crypto/prf.py
index ebd8407..e899ba3 100644
--- a/scapy/layers/tls/crypto/prf.py
+++ b/scapy/layers/tls/crypto/prf.py
@@ -239,9 +239,9 @@
elif self.tls_version == 0x0300:
if read_or_write == "write":
- d = {"client": "CLNT", "server": "SRVR"}
+ d = {"client": b"CLNT", "server": b"SRVR"}
else:
- d = {"client": "SRVR", "server": "CLNT"}
+ d = {"client": b"SRVR", "server": b"CLNT"}
label = d[con_end]
sslv3_md5_pad1 = b"\x36"*48
@@ -266,7 +266,7 @@
d = {"client": "client", "server": "server"}
else:
d = {"client": "server", "server": "client"}
- label = d[con_end] + " finished"
+ label = ("%s finished" % d[con_end]).encode()
if self.tls_version <= 0x0302:
s1 = _tls_hash_algs["MD5"]().digest(handshake_msg)
@@ -302,9 +302,9 @@
export_key = _tls_hash_algs["MD5"]().digest(tbh)[:req_len]
else:
if s:
- tag = "client write key"
+ tag = b"client write key"
else:
- tag = "server write key"
+ tag = b"server write key"
export_key = self.prf(key,
tag,
client_random + server_random,
@@ -331,7 +331,7 @@
iv = _tls_hash_algs["MD5"]().digest(tbh)[:req_len]
else:
iv_block = self.prf("",
- "IV block",
+ b"IV block",
client_random + server_random,
2*req_len)
if s:
diff --git a/scapy/layers/tls/extensions.py b/scapy/layers/tls/extensions.py
index cc72d0e..171127e 100644
--- a/scapy/layers/tls/extensions.py
+++ b/scapy/layers/tls/extensions.py
@@ -582,7 +582,7 @@
l = ext.length_from(pkt)
if l is None or l <= 0:
v = pkt.tls_session.tls_version
- if v < 0x0304:
+ if v is None or v < 0x0304:
return s, None
return super(_ExtensionsLenField, self).getfield(pkt, s)
@@ -634,7 +634,7 @@
for ext in i:
if isinstance(ext, _GenericTLSSessionInheritance):
ext.tls_session = pkt.tls_session
- s += ext.str_stateful()
+ s += ext.raw_stateful()
else:
s += raw(ext)
return s
diff --git a/scapy/layers/tls/keyexchange.py b/scapy/layers/tls/keyexchange.py
index ee2b650..386a9bb 100644
--- a/scapy/layers/tls/keyexchange.py
+++ b/scapy/layers/tls/keyexchange.py
@@ -895,10 +895,10 @@
else:
warning("No material to encrypt Pre Master Secret")
- l = ""
+ l = b""
if s.tls_version >= 0x0301:
l = struct.pack("!H", len(enc))
- return "%s%s%s" % (l, enc, pay)
+ return l + enc + pay
def guess_payload_class(self, p):
return Padding
diff --git a/scapy/layers/tls/record.py b/scapy/layers/tls/record.py
index 8b9e892..55a3c08 100644
--- a/scapy/layers/tls/record.py
+++ b/scapy/layers/tls/record.py
@@ -171,7 +171,7 @@
pkt.type = 23
p.tls_session = pkt.tls_session
if not pkt.tls_session.frozen:
- cur = p.str_stateful()
+ cur = p.raw_stateful()
p.post_build_tls_session_update(cur)
else:
cur = raw(p)
@@ -249,7 +249,7 @@
if a PFS ciphersuite was used. However, if you got a master_secret somehow,
use it with tls_session.(w|r)cs.derive_keys() and leave the rest to Scapy.
- When building a TLS message with str_stateful, we expect the tls_session to
+ When building a TLS message with raw_stateful, we expect the tls_session to
have the right parameters for ciphering. Else, .post_build() might fail.
"""
__slots__ = ["deciphered_len"]
@@ -563,7 +563,7 @@
if version > 0x300:
h = alg.digest(write_seq_num + hdr + msg)
elif version == 0x300:
- h = alg.digest_sslv3(write_seq_num + hdr[0] + hdr[3:5] + msg)
+ h = alg.digest_sslv3(write_seq_num + hdr[:1] + hdr[3:5] + msg)
else:
raise Exception("Unrecognized version.")
return msg + h
@@ -746,5 +746,5 @@
### Bindings ###
###############################################################################
-bind_bottom_up(TCP, TLS, {"dport": 443})
-bind_bottom_up(TCP, TLS, {"sport": 443})
+bind_layers(TCP, TLS, sport=443)
+bind_layers(TCP, TLS, dport=443)
diff --git a/scapy/layers/tls/record_sslv2.py b/scapy/layers/tls/record_sslv2.py
index ba160f8..e285279 100644
--- a/scapy/layers/tls/record_sslv2.py
+++ b/scapy/layers/tls/record_sslv2.py
@@ -48,7 +48,7 @@
if isinstance(p, _GenericTLSSessionInheritance):
p.tls_session = pkt.tls_session
if not pkt.tls_session.frozen:
- cur = p.str_stateful()
+ cur = p.raw_stateful()
p.post_build_tls_session_update(cur)
else:
cur = raw(p)
diff --git a/scapy/layers/tls/record_tls13.py b/scapy/layers/tls/record_tls13.py
index 6630816..a4bc5f3 100644
--- a/scapy/layers/tls/record_tls13.py
+++ b/scapy/layers/tls/record_tls13.py
@@ -81,7 +81,7 @@
if isinstance(p, _GenericTLSSessionInheritance):
p.tls_session = pkt.tls_session
if not pkt.tls_session.frozen:
- return p.str_stateful()
+ return p.raw_stateful()
return raw(p)
diff --git a/scapy/layers/tls/session.py b/scapy/layers/tls/session.py
index 80787ef..aaf8387 100644
--- a/scapy/layers/tls/session.py
+++ b/scapy/layers/tls/session.py
@@ -864,9 +864,12 @@
pkt.tls_session = self.tls_session
return pkt
- def str_stateful(self):
+ def raw_stateful(self):
return super(_GenericTLSSessionInheritance, self).__bytes__()
+ def str_stateful(self):
+ return self.raw_stateful()
+
def __bytes__(self):
"""
The __bytes__ call has to leave the connection states unchanged.
diff --git a/scapy/packet.py b/scapy/packet.py
index eed3f64..50f0901 100644
--- a/scapy/packet.py
+++ b/scapy/packet.py
@@ -498,7 +498,7 @@
fname = get_temp_file(autoext=".eps")
canvas.writeEPSfile(fname)
with ContextManagerSubprocess("psdump()"):
- subprocess.Popen([conf.prog.psreader, fname+".eps"])
+ subprocess.Popen([conf.prog.psreader, fname])
else:
canvas.writeEPSfile(filename)
@@ -516,7 +516,7 @@
fname = get_temp_file(autoext=".pdf")
canvas.writePDFfile(fname)
with ContextManagerSubprocess("pdfdump()"):
- subprocess.Popen([conf.prog.pdfreader, fname+".pdf"])
+ subprocess.Popen([conf.prog.pdfreader, fname])
else:
canvas.writePDFfile(filename)
diff --git a/scapy/pipetool.py b/scapy/pipetool.py
index 2e8b123..d756ae2 100644
--- a/scapy/pipetool.py
+++ b/scapy/pipetool.py
@@ -517,23 +517,23 @@
self.name = "Scapy" if self.name is None else self.name
# Start a powershell in a new window and print the PID
cmd = "$app = Start-Process PowerShell -ArgumentList '-command &{$host.ui.RawUI.WindowTitle=\\\"%s\\\";Get-Content \\\"%s\\\" -wait}' -passthru; echo $app.Id" % (self.name, self.__f.replace("\\", "\\\\"))
- _p = subprocess.Popen([conf.prog.powershell, cmd], stdout=subprocess.PIPE)
- _output, _stderr = _p.communicate()
+ proc = subprocess.Popen([conf.prog.powershell, cmd], stdout=subprocess.PIPE)
+ output, _ = proc.communicate()
# This is the process PID
- self.__p = int(_output)
- print(("PID:" + str(self.__p)))
+ self.pid = int(output)
+ print("PID: %d" % self.pid)
def _start_unix(self):
if not self.opened:
self.opened = True
- self.__r,self.__w = os.pipe()
+ rdesc, self.wdesc = os.pipe()
cmd = ["xterm"]
if self.name is not None:
cmd.extend(["-title",self.name])
if self.keepterm:
cmd.append("-hold")
- cmd.extend(["-e", "cat 0<&%i" % self.__r])
- self.__p = subprocess.Popen(cmd, shell=True, executable="/bin/bash")
- os.close(self.__r)
+ cmd.extend(["-e", "cat <&%d" % rdesc])
+ self.proc = subprocess.Popen(cmd, close_fds=False)
+ os.close(rdesc)
def start(self):
if WINDOWS:
return self._start_windows()
@@ -546,15 +546,14 @@
# http://code.activestate.com/recipes/347462-terminating-a-subprocess-on-windows/
import ctypes
PROCESS_TERMINATE = 1
- handle = ctypes.windll.kernel32.OpenProcess(PROCESS_TERMINATE, False, self.__p)
+ handle = ctypes.windll.kernel32.OpenProcess(PROCESS_TERMINATE, False, self.pid)
ctypes.windll.kernel32.TerminateProcess(handle, -1)
ctypes.windll.kernel32.CloseHandle(handle)
def _stop_unix(self):
if not self.keepterm:
self.opened = False
- os.close(self.__w)
- self.__p.kill()
- self.__p.wait()
+ self.proc.kill()
+ self.proc.wait()
def stop(self):
if WINDOWS:
return self._stop_windows()
@@ -564,11 +563,11 @@
if self.newlines:
s+="\n"
if WINDOWS:
- self.__w = open(self.__f, "a")
- self.__w.write(s)
- self.__w.close()
+ wdesc = open(self.__f, "a")
+ wdesc.write(s)
+ wdesc.close()
else:
- os.write(self.__w, s.encode())
+ os.write(self.wdesc, s.encode())
def push(self, msg):
self._print(str(msg))
def high_push(self, msg):
diff --git a/scapy/pton_ntop.py b/scapy/pton_ntop.py
index f7d3e52..0779336 100644
--- a/scapy/pton_ntop.py
+++ b/scapy/pton_ntop.py
@@ -103,7 +103,7 @@
raise ValueError("invalid length of packed IP address string")
# Decode to hex representation
- address = ":".join(bytes_hex(addr[idx:idx + 2], force_str=True).lstrip('0') or '0'
+ address = ":".join(bytes_hex(addr[idx:idx + 2]).decode().lstrip('0') or '0'
for idx in range(0, 16, 2))
try:
diff --git a/scapy/route.py b/scapy/route.py
index 30af57d..ca1ca3d 100644
--- a/scapy/route.py
+++ b/scapy/route.py
@@ -7,14 +7,16 @@
Routing and handling of network interfaces.
"""
+
from __future__ import absolute_import
-from scapy.utils import atol, ltoa, itom, pretty_list
+
+
from scapy.config import conf
+from scapy.consts import WINDOWS, LOOPBACK_INTERFACE
from scapy.error import Scapy_Exception, warning
-from scapy.arch import get_working_if
-from scapy.consts import WINDOWS
-import scapy.consts
-import scapy.modules.six as six
+from scapy.modules import six
+from scapy.utils import atol, ltoa, itom, pretty_list
+
##############################
## Routing/Interfaces stuff ##
@@ -62,7 +64,7 @@
nhop = gw
else:
nhop = thenet
- dev,ifaddr,x = self.route(nhop)
+ dev, ifaddr, _ = self.route(nhop)
else:
ifaddr = get_if_addr(dev)
return (atol(thenet), itom(msk), gw, dev, ifaddr, metric)
@@ -154,13 +156,15 @@
continue
aa = atol(a)
if aa == dst:
- pathes.append((0xffffffff, 1, (scapy.consts.LOOPBACK_INTERFACE,a,"0.0.0.0")))
+ pathes.append(
+ (0xffffffff, 1, (LOOPBACK_INTERFACE, a, "0.0.0.0"))
+ )
if (dst & m) == (d & m):
pathes.append((m, me, (i,a,gw)))
if not pathes:
if verbose:
warning("No route found (no default route?)")
- return scapy.consts.LOOPBACK_INTERFACE,"0.0.0.0","0.0.0.0"
+ return LOOPBACK_INTERFACE, "0.0.0.0", "0.0.0.0"
# Choose the more specific route
# Sort by greatest netmask
pathes.sort(key=lambda x: x[0], reverse=True)
@@ -188,10 +192,12 @@
conf.route=Route()
-#XXX use "with"
-_betteriface = conf.route.route("0.0.0.0", verbose=0)[0]
-if ((_betteriface if (isinstance(_betteriface, six.string_types) or _betteriface is None) else _betteriface.name) != scapy.consts.LOOPBACK_NAME):
- conf.iface = _betteriface
-else:
+iface = conf.route.route("0.0.0.0", verbose=0)[0]
+
+if (iface.name if hasattr(iface, "name") else iface) == LOOPBACK_INTERFACE:
+ from scapy.arch import get_working_if
conf.iface = get_working_if()
-del(_betteriface)
+else:
+ conf.iface = iface
+
+del iface
diff --git a/scapy/supersocket.py b/scapy/supersocket.py
index f00e72e..8903595 100644
--- a/scapy/supersocket.py
+++ b/scapy/supersocket.py
@@ -8,6 +8,7 @@
"""
from __future__ import absolute_import
+import os
import socket
import subprocess
import struct
@@ -247,6 +248,7 @@
return
self.outs = self.ins = open(
"/dev/net/tun" if LINUX else ("/dev/%s" % self.iface), "r+b",
+ buffering=0
)
if LINUX:
from fcntl import ioctl
@@ -255,7 +257,7 @@
# IFF_TAP = 0x0002
# IFF_NO_PI = 0x1000
ioctl(self.ins, 0x400454ca, struct.pack(
- "16sH", self.iface, 0x0001 if self.mode_tun else 0x1002,
+ "16sH", raw(self.iface), 0x0001 if self.mode_tun else 0x1002,
))
self.closed = False
@@ -276,7 +278,7 @@
)
def send(self, x):
- sx = str(x)
+ sx = raw(x)
if hasattr(x, "sent_time"):
x.sent_time = time.time()
if self.mode_tun:
diff --git a/scapy/utils.py b/scapy/utils.py
index db328b2..2f36319 100644
--- a/scapy/utils.py
+++ b/scapy/utils.py
@@ -501,14 +501,21 @@
start_viewer = True
else:
with ContextManagerSubprocess("do_graph()"):
- target = subprocess.Popen([conf.prog.display], stdin=subprocess.PIPE).stdin
+ target = subprocess.Popen([conf.prog.display],
+ stdin=subprocess.PIPE).stdin
if format is not None:
format = "-T%s" % format
if isinstance(target, str):
- target = open(os.path.abspath(target), "wb")
+ if target.startswith('|'):
+ target = subprocess.Popen(target[1:].lstrip(), shell=True,
+ stdin=subprocess.PIPE).stdin
+ elif target.startswith('>'):
+ target = open(target[1:].lstrip(), "wb")
+ else:
+ target = open(os.path.abspath(target), "wb")
proc = subprocess.Popen("\"%s\" %s %s" % (prog, options or "", format or ""),
shell=True, stdin=subprocess.PIPE, stdout=target)
- proc.communicate(input=raw(graph))
+ proc.stdin.write(raw(graph))
try:
target.close()
except:
@@ -630,7 +637,7 @@
def export_object(obj):
- print(bytes_codec(gzip.zlib.compress(six.moves.cPickle.dumps(obj,2),9), "base64"))
+ print(bytes_base64(gzip.zlib.compress(six.moves.cPickle.dumps(obj, 2), 9)))
def import_object(obj=None):
if obj is None:
diff --git a/setup.py b/setup.py
index e1be3bc..0818edc 100755
--- a/setup.py
+++ b/setup.py
@@ -71,6 +71,7 @@
# Metadata
author='Philippe BIONDI',
author_email='phil(at)secdev.org',
+ maintainer='Pierre LALET, Guillaume VALADON',
description='Scapy: interactive packet manipulation tool',
license='GPLv2',
url='http://www.secdev.org/projects/scapy',
@@ -87,6 +88,11 @@
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.3",
+ "Programming Language :: Python :: 3.4",
+ "Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: 3.6",
"Topic :: Security",
"Topic :: System :: Networking",
"Topic :: System :: Networking :: Monitoring",
diff --git a/test/answering_machines.uts b/test/answering_machines.uts
index a837aa8..bc84c69 100644
--- a/test/answering_machines.uts
+++ b/test/answering_machines.uts
@@ -54,7 +54,7 @@
= DNS_am
def check_DNS_am_reply(packet):
assert(DNS in packet and packet[DNS].ancount == 1)
- assert(packet[DNS].an.rdata == "192.168.1.1")
+ assert(packet[DNS].an.rdata == b"192.168.1.1")
test_am(DNS_am,
IP()/UDP()/DNS(qd=DNSQR(qname="www.secdev.org")),
diff --git a/test/dnssecRR.uts b/test/dnssecRR.uts
index 4069fbe..ab165bd 100644
--- a/test/dnssecRR.uts
+++ b/test/dnssecRR.uts
@@ -85,7 +85,7 @@
= DNSRRRSIG(), dissection
rrsig = b'\x03isc\x03org\x00\x00.\x00\x01\x00\x00\x96O\x00\x9b\x00\x02\x05\x02\x00\x00\xa8\xc0K-3\xd9K\x05\xa6\xd9\xed6\x03isc\x03org\x00\xac\xb2_I\x9e\xdcU\xca/3\x1c\xdf{\xba\xd5\x80\xb0 \xa4~\x98\x95\xab~\x84\xb2\x1f9\x17#\x7f\xfeP\xb9\xfb\x8d\x13\x19\xd7\x7f\x9e/\x1c\xd7rv<\xc6\xd3\xf1\xae8\rh\xba\x1e\xaa\xe6\xf1\x1e\x1d\xdaS\xd4\\\xfd\xa3`P\xa1\xe0\xa2\x860\xd4?\xb4}j\x81O\x03\xdc&v\x13\xd4(k\xa07\x8f-\x08e\x06\xff\xb8h\x8f\x16j\xe4\xd92\xd2\x99\xc2\xb4'
t = DNSRRRSIG(rrsig)
-t.rrname == 'isc.org.' and t.labels == 2 and t.keytag == 60726 and t.signature[-4:] == b'\xd2\x99\xc2\xb4'
+t.rrname == b'isc.org.' and t.labels == 2 and t.keytag == 60726 and t.signature[-4:] == b'\xd2\x99\xc2\xb4'
+ Test DNSKEY RR
@@ -99,7 +99,7 @@
= DNSRRDNSKEY(), dissection
t = DNSRRDNSKEY(b'\x03dlv\x03isc\x03org\x00\x000\x00\x01\x00\x00\x1bq\x01\t\x01\x01\x03\x05\x04@\x00\x00\x03\xc72\xef\xf9\xa2|\xeb\x10N\xf3\xd5\xe8&\x86\x0f\xd6<\xed>\x8e\xea\x19\xadm\xde\xb9a\'\xe0\xccC\x08M~\x94\xbc\xb6n\xb8P\xbf\x9a\xcd\xdfdJ\xb4\xcc\xd7\xe8\xc8\xfb\xd27sx\xd0\xf8^I\xd6\xe7\xc7g$\xd3\xc2\xc6\x7f>\x8c\x01\xa5\xd8VK+\xcb~\xd6\xea\xb8[\xe9\xe7\x03z\x8e\xdb\xe0\xcb\xfaN\x81\x0f\x89\x9e\xc0\xc2\xdb!\x81p{C\xc6\xeft\xde\xf5\xf6v\x90\x96\xf9\xe9\xd8`1\xd7\xb9\xcae\xf8\x04\x8f\xe8C\xe7\x00+\x9d?\xc6\xf2o\xd3Ak\x7f\xc90\xea\xe7\x0cO\x01e\x80\xf7\xbe\x8eq\xb1<\xf1&\x1c\x0b^\xfdDdc\xad\x99~B\xe8\x04\x00\x03,t="\xb4\xb6\xb6\xbc\x80{\xb9\x9b\x05\x95\\;\x02\x1eS\xf4p\xfedq\xfe\xfc00$\xe05\xba\x0c@\xabTv\xf3W\x0e\xb6\t\r!\xd9\xc2\xcd\xf1\x89\x15\xc5\xd5\x17\xfej_T\x99\x97\xd2j\xff\xf85b\xca\x8c|\xe9O\x9fd\xfdT\xadL3taK\x96\xac\x13a')
-t.rrname == "dlv.isc.org." and t.rdlen == 265 and t.sprintf("%flags%") == 'SZ' and t.publickey == b'\x04@\x00\x00\x03\xc72\xef\xf9\xa2|\xeb\x10N\xf3\xd5\xe8&\x86\x0f\xd6<\xed>\x8e\xea\x19\xadm\xde\xb9a\'\xe0\xccC\x08M~\x94\xbc\xb6n\xb8P\xbf\x9a\xcd\xdfdJ\xb4\xcc\xd7\xe8\xc8\xfb\xd27sx\xd0\xf8^I\xd6\xe7\xc7g$\xd3\xc2\xc6\x7f>\x8c\x01\xa5\xd8VK+\xcb~\xd6\xea\xb8[\xe9\xe7\x03z\x8e\xdb\xe0\xcb\xfaN\x81\x0f\x89\x9e\xc0\xc2\xdb!\x81p{C\xc6\xeft\xde\xf5\xf6v\x90\x96\xf9\xe9\xd8`1\xd7\xb9\xcae\xf8\x04\x8f\xe8C\xe7\x00+\x9d?\xc6\xf2o\xd3Ak\x7f\xc90\xea\xe7\x0cO\x01e\x80\xf7\xbe\x8eq\xb1<\xf1&\x1c\x0b^\xfdDdc\xad\x99~B\xe8\x04\x00\x03,t="\xb4\xb6\xb6\xbc\x80{\xb9\x9b\x05\x95\\;\x02\x1eS\xf4p\xfedq\xfe\xfc00$\xe05\xba\x0c@\xabTv\xf3W\x0e\xb6\t\r!\xd9\xc2\xcd\xf1\x89\x15\xc5\xd5\x17\xfej_T\x99\x97\xd2j\xff\xf85b\xca\x8c|\xe9O\x9fd\xfdT\xadL3taK\x96\xac\x13a'
+t.rrname == b"dlv.isc.org." and t.rdlen == 265 and t.sprintf("%flags%") == 'SZ' and t.publickey == b'\x04@\x00\x00\x03\xc72\xef\xf9\xa2|\xeb\x10N\xf3\xd5\xe8&\x86\x0f\xd6<\xed>\x8e\xea\x19\xadm\xde\xb9a\'\xe0\xccC\x08M~\x94\xbc\xb6n\xb8P\xbf\x9a\xcd\xdfdJ\xb4\xcc\xd7\xe8\xc8\xfb\xd27sx\xd0\xf8^I\xd6\xe7\xc7g$\xd3\xc2\xc6\x7f>\x8c\x01\xa5\xd8VK+\xcb~\xd6\xea\xb8[\xe9\xe7\x03z\x8e\xdb\xe0\xcb\xfaN\x81\x0f\x89\x9e\xc0\xc2\xdb!\x81p{C\xc6\xeft\xde\xf5\xf6v\x90\x96\xf9\xe9\xd8`1\xd7\xb9\xcae\xf8\x04\x8f\xe8C\xe7\x00+\x9d?\xc6\xf2o\xd3Ak\x7f\xc90\xea\xe7\x0cO\x01e\x80\xf7\xbe\x8eq\xb1<\xf1&\x1c\x0b^\xfdDdc\xad\x99~B\xe8\x04\x00\x03,t="\xb4\xb6\xb6\xbc\x80{\xb9\x9b\x05\x95\\;\x02\x1eS\xf4p\xfedq\xfe\xfc00$\xe05\xba\x0c@\xabTv\xf3W\x0e\xb6\t\r!\xd9\xc2\xcd\xf1\x89\x15\xc5\xd5\x17\xfej_T\x99\x97\xd2j\xff\xf85b\xca\x8c|\xe9O\x9fd\xfdT\xadL3taK\x96\xac\x13a'
+ Test DS and DLV RR
@@ -110,7 +110,7 @@
= DNSRRDS(), check parameters
t = DNSRRDS(b'\x03isc\x03org\x00\x00+\x00\x01\x00\x01Q(\x00\x182\\\x05\x01\x98!\x13\xd0\x8bLj\x1d\x9fj\xee\x1e"7\xae\xf6\x9f?\x97Y')
-t.rrname == 'isc.org.' and t.keytag == 12892 and t.algorithm == 5 and t.digesttype == 1 and t.digest == b'\x98!\x13\xd0\x8bLj\x1d\x9fj\xee\x1e"7\xae\xf6\x9f?\x97Y'
+t.rrname == b'isc.org.' and t.keytag == 12892 and t.algorithm == 5 and t.digesttype == 1 and t.digest == b'\x98!\x13\xd0\x8bLj\x1d\x9fj\xee\x1e"7\xae\xf6\x9f?\x97Y'
+ Test TXT RR
diff --git a/test/edns0.uts b/test/edns0.uts
index 5faf04b..dc9ae96 100644
--- a/test/edns0.uts
+++ b/test/edns0.uts
@@ -37,7 +37,7 @@
= DNSRROP(), dissection
opt = DNSRROPT(b'\x05rropt\x00\x00*\x00{\x01\x02\x00\x03\x00\x0c\x00*\x00\x0cedns0tlv')
-opt.rrname == "rropt." and opt.rdlen == 12 and opt.rdata[0].optcode == 42 and opt.rdata[0].optdata == b"edns0tlv"
+opt.rrname == b"rropt." and opt.rdlen == 12 and opt.rdata[0].optcode == 42 and opt.rdata[0].optdata == b"edns0tlv"
+ Test EDNS-PING
diff --git a/test/fields.uts b/test/fields.uts
index 81456e5..1b5e478 100644
--- a/test/fields.uts
+++ b/test/fields.uts
@@ -22,7 +22,7 @@
= Simple tests
-assert LELongField("", None).addfield("", "", 0x44434241) == b'ABCD\x00\x00\x00\x00'
+assert LELongField("test", None).addfield(None, b"", 0x44434241) == b'ABCD\x00\x00\x00\x00'
= MACField class
~ core field
@@ -992,7 +992,7 @@
= Raise exception - test data
dnsf = DNSStrField("test", "")
-assert(dnsf.getfield("", b"\x01x\x00") == (b"", "x."))
+assert(dnsf.getfield("", b"\x01x\x00") == (b"", b"x."))
try:
dnsf.getfield("", b"\xff")
diff --git a/test/linux.uts b/test/linux.uts
index 462e3fe..24edeca 100644
--- a/test/linux.uts
+++ b/test/linux.uts
@@ -94,8 +94,8 @@
tcpdump_lines = ['12\n', '40 0 0 12\n', '21 0 5 34525\n', '48 0 0 20\n', '21 6 0 6\n', '21 0 6 44\n', '48 0 0 54\n', '21 3 4 6\n', '21 0 3 2048\n', '48 0 0 23\n', '21 0 1 6\n', '6 0 0 1600\n', '6 0 0 0\n']
pointer = get_bpf_pointer(tcpdump_lines)
-assert isinstance(pointer, str)
-assert len(pointer) > 1
+assert six.PY3 or isinstance(pointer, str)
+assert six.PY3 or len(pointer) > 1
conf.use_pypy = old_pypy
diff --git a/test/nmap.uts b/test/nmap.uts
index fb91ab2..3c64e74 100644
--- a/test/nmap.uts
+++ b/test/nmap.uts
@@ -16,7 +16,13 @@
except ImportError:
from urllib2 import urlopen
-open('nmap-os-fingerprints', 'wb').write(urlopen('https://raw.githubusercontent.com/nmap/nmap/9efe1892/nmap-os-fingerprints').read())
+for i in range(10):
+ try:
+ open('nmap-os-fingerprints', 'wb').write(urlopen('https://raw.githubusercontent.com/nmap/nmap/9efe1892/nmap-os-fingerprints').read())
+ break
+ except:
+ pass
+
conf.nmap_base = 'nmap-os-fingerprints'
= Database loading
diff --git a/test/pipetool.uts b/test/pipetool.uts
index 0604ed8..73cdf13 100644
--- a/test/pipetool.uts
+++ b/test/pipetool.uts
@@ -15,8 +15,6 @@
d1 > tf > t
p = PipeEngine(s)
-p.graph(type="png", target="test.png")
-p.graph(type="png")
p.start()
time.sleep(3)
s.msg = []
diff --git a/test/pptp.uts b/test/pptp.uts
index dc4b5de..6509df4 100644
--- a/test/pptp.uts
+++ b/test/pptp.uts
@@ -76,7 +76,7 @@
assert pkt[PPP_LCP_Echo].code == 9
assert pkt[PPP_LCP_Echo].id == 42
assert pkt[PPP_LCP_Echo].magic_number == 4242
-assert pkt[PPP_LCP_Echo].data == 'abcdef'
+assert pkt[PPP_LCP_Echo].data == b'abcdef'
+ PPP LCP Tests
= Test LCP Echo Request / Reply
@@ -270,7 +270,7 @@
assert isinstance(code_reject_pkt[PPP_LCP_Code_Reject].rejected_packet, PPP_LCP)
assert code_reject[PPP_LCP_Code_Reject].rejected_packet.code == 42
assert code_reject[PPP_LCP_Code_Reject].rejected_packet.id == 7
-assert code_reject[PPP_LCP_Code_Reject].rejected_packet.data == 'unknown_data'
+assert code_reject[PPP_LCP_Code_Reject].rejected_packet.data == b'unknown_data'
= Test LCP Protocol-Reject
~ ppp lcp lcp_protocol_reject
@@ -357,7 +357,7 @@
assert pap_response_pkt[PPP_PAP_Response].code == 2
assert pap_response_pkt[PPP_PAP_Response].id == 42
assert pap_response_pkt[PPP_PAP_Response].msg_len == 0
-assert pap_response_pkt[PPP_PAP_Response].message == ''
+assert pap_response_pkt[PPP_PAP_Response].message == b''
assert pap_response_pkt[PPP_PAP_Response].summary() == 'PAP-Ack'
pap_request_pkt = PPP(hex_bytes('c023012a00220d61646d696e6973747261746f720f7365637265745f70617373776f7264'))
@@ -436,7 +436,7 @@
assert PPP_CHAP in chap_success_pkt
assert chap_success_pkt[PPP_CHAP].code == 3
assert chap_success_pkt[PPP_CHAP].id == 47
-assert chap_success_pkt[PPP_CHAP].data == ''
+assert chap_success_pkt[PPP_CHAP].data == b''
assert chap_success_pkt[PPP_CHAP].summary() in ['CHAP Success message=\'\'', 'CHAP Success message=b\'\'']
chap_response_pkt = PPP(hex_bytes('c223022f001b1000000000000000000000000000000000636c69656e74'))
diff --git a/test/regression.uts b/test/regression.uts
index 4267fe3..37040f2 100644
--- a/test/regression.uts
+++ b/test/regression.uts
@@ -316,7 +316,7 @@
with ContextManagerCaptureOutput() as cmco:
export_object(2807)
result_export_object = cmco.get_output(eval_bytes=True)
- assert(result_export_object.startswith("eNprYPL9zqUHAAdrAf8=\n"))
+ assert(result_export_object.startswith("eNprYPL9zqUHAAdrAf8="))
assert(import_object(result_export_object) == 2807)
test_export_import_object()
@@ -428,9 +428,9 @@
conf_color_theme = conf.color_theme
conf.color_theme = BlackAndWhite()
p = IP(ttl=64)/ICMP()
-assert(repr(p) == "<IP frag=0 ttl=64 proto=icmp |<ICMP |>>")
+assert(repr(p) in ["<IP frag=0 ttl=64 proto=icmp |<ICMP |>>", "<IP frag=0 ttl=64 proto=1 |<ICMP |>>"])
p.hide_defaults()
-assert(repr(p) == "<IP frag=0 proto=icmp |<ICMP |>>")
+assert(repr(p) in ["<IP frag=0 proto=icmp |<ICMP |>>", "<IP frag=0 proto=1 |<ICMP |>>"])
conf.color_theme = conf_color_theme
= split_layers
@@ -441,7 +441,7 @@
bind_layers(IP, ICMP, frag=0, proto=1)
= fuzz
-~ not_pypy
+~ not_pypy random_weird_py3
random.seed(0x2807)
raw(fuzz(IP()/ICMP()))
assert _ in [
@@ -762,6 +762,7 @@
ASN1_Object(2).show()
= ASN1 - RandASN1Object
+~ random_weird_py3
a = RandASN1Object()
random.seed(0x2807)
assert raw(a) in [b'A\x02\x07q', b'C\x02\xfe\x92', b'\x1e\x023V']
@@ -779,7 +780,7 @@
a = ASN1_DECODING_ERROR("error", exc=OSError(1))
assert repr(a) == "<ASN1_DECODING_ERROR['error']{{1}}>"
b = ASN1_DECODING_ERROR("error", exc=OSError(ASN1_BIT_STRING("0")))
-assert repr(b) == "<ASN1_DECODING_ERROR['error']{{\x00}}>"
+assert repr(b) == "<ASN1_DECODING_ERROR['error']{{<ASN1_BIT_STRING[0] (7 unused bits)>}}>"
= ASN1 - ASN1_INTEGER
a = ASN1_INTEGER(int("1"*23))
@@ -792,15 +793,15 @@
# ASN1F_NUMERIC_STRING
random.seed(1514315682)
-str(RandASN1Object())
+raw(RandASN1Object())
# ASN1F_VIDEOTEX_STRING
random.seed(1240186058)
-str(RandASN1Object())
+raw(RandASN1Object())
# ASN1F_UTC_TIME & ASN1F_GENERALIZED_TIME
random.seed(1873503288)
-str(RandASN1Object())
+raw(RandASN1Object())
############
@@ -1068,10 +1069,8 @@
~ netaccess
import time
import os
-try:
- from Queue import Queue as queue
-except:
- from queue import Queue as queue
+
+from scapy.modules.six.moves.queue import Queue
def _send_or_sniff(pkt, timeout, flt, pid, fork, t_other=None, opened_socket=None):
assert pid != -1
@@ -1107,7 +1106,7 @@
def run_function(pkt, timeout, flt, pid, thread, results, opened_socket):
_send_or_sniff(pkt, timeout, flt, pid, False, t_other=thread, opened_socket=opened_socket)
results.put(True)
- results = queue()
+ results = Queue()
t_parent = Thread(target=run_function, args=(pkt, timeout, flt, 0, None, results, None))
t_child = Thread(target=run_function, args=(pkt, timeout, flt, 1, t_parent, results, opened_socket))
t_parent.start()
@@ -1123,16 +1122,23 @@
send_and_sniff(Ether()/IP(dst="secdev.org")/ICMP())
= Test L2ListenTcpdump socket
-~ netaccess
+~ netaccess FIXME_py3
-read_s = L2ListenTcpdump()
-out_s = conf.L2socket()
-icmp_r = Ether()/IP(dst="secdev.org")/ICMP()
-res = sndrcv(out_s, icmp_r, timeout=5, rcv_pks=read_s)
-read_s.close()
-out_s.close()
+# Often (but not always) fails with Python 3
+import time
+for i in range(10):
+ read_s = L2ListenTcpdump(iface=conf.iface)
+ out_s = conf.L2socket(iface=conf.iface)
+ time.sleep(5) # wait for read_s to be ready
+ icmp_r = Ether()/IP(dst="secdev.org")/ICMP()
+ res = sndrcv(out_s, icmp_r, timeout=5, rcv_pks=read_s)[0]
+ read_s.close()
+ out_s.close()
+ time.sleep(5)
+ if res:
+ break
-response = res[0][0][1]
+response = res[0][1]
assert response[ICMP].type == 0
############
@@ -1964,7 +1970,7 @@
= ICMPv6EchoRequest - Basic dissection
a=ICMPv6EchoRequest(b'\x80\x00\x00\x00\x00\x00\x00\x00')
-a.type == 128 and a.code == 0 and a.cksum == 0 and a.id == 0 and a.seq == 0 and a.data == ""
+a.type == 128 and a.code == 0 and a.cksum == 0 and a.id == 0 and a.seq == 0 and a.data == b""
= ICMPv6EchoRequest - Dissection with specific values
a=ICMPv6EchoRequest(b'\x80\xff\x11\x11""33thisissomerawing')
@@ -1990,7 +1996,7 @@
= ICMPv6EchoReply - Basic dissection
a=ICMPv6EchoReply(b'\x80\x00\x00\x00\x00\x00\x00\x00')
-a.type == 128 and a.code == 0 and a.cksum == 0 and a.id == 0 and a.seq == 0 and a.data == ""
+a.type == 128 and a.code == 0 and a.cksum == 0 and a.id == 0 and a.seq == 0 and a.data == b""
= ICMPv6EchoReply - Dissection with specific values
a=ICMPv6EchoReply(b'\x80\xff\x11\x11""33thisissomerawing')
@@ -2089,7 +2095,7 @@
= HBHOptUnknown - Basic Dissection
a=HBHOptUnknown(b'\x01\x00')
-a.otype == 0x01 and a.optlen == 0 and a.optdata == ""
+a.otype == 0x01 and a.optlen == 0 and a.optdata == b""
= HBHOptUnknown - Automatic optlen computation
raw(HBHOptUnknown(optdata="B"*10)) == b'\x01\nBBBBBBBBBB'
@@ -2125,7 +2131,7 @@
= PadN - Basic Dissection
a=PadN(b'\x01\x00')
-a.otype == 1 and a.optlen == 0 and a.optdata == ""
+a.otype == 1 and a.optlen == 0 and a.optdata == b""
= PadN - Dissection with specific values
a=PadN(b'\x01\x0cBBBBBBBBBB')
@@ -2788,14 +2794,14 @@
type(a) is tuple and len(a) == 2 and a[0] == 1 and a[1] == b'\x07abricot\x00\x00'
= ICMPv6NIQueryName - single label DNS name
-ICMPv6NIQueryName(data="abricot").data == "abricot"
+ICMPv6NIQueryName(data="abricot").data == b"abricot"
= ICMPv6NIQueryName - fqdn (internal)
a=ICMPv6NIQueryName(data="n.d.org").getfieldval("data")
type(a) is tuple and len(a) == 2 and a[0] == 1 and a[1] == b'\x01n\x01d\x03org\x00'
= ICMPv6NIQueryName - fqdn
-ICMPv6NIQueryName(data="n.d.org").data == "n.d.org"
+ICMPv6NIQueryName(data="n.d.org").data == b"n.d.org"
= ICMPv6NIQueryName - IPv6 address (internal)
a=ICMPv6NIQueryName(data="2001:db8::1").getfieldval("data")
@@ -2814,7 +2820,7 @@
= ICMPv6NIQueryName - build & dissection
s = raw(IPv6()/ICMPv6NIQueryName(data="n.d.org"))
p = IPv6(s)
-ICMPv6NIQueryName in p and p[ICMPv6NIQueryName].data == "n.d.org"
+ICMPv6NIQueryName in p and p[ICMPv6NIQueryName].data == b"n.d.org"
############
@@ -2828,14 +2834,14 @@
type(a) is tuple and len(a) == 2 and a[0] == 1 and a[1] == b'\x07abricot\x00\x00'
= ICMPv6NIQueryIPv6 - single label DNS name
-ICMPv6NIQueryIPv6(data="abricot").data == "abricot"
+ICMPv6NIQueryIPv6(data="abricot").data == b"abricot"
= ICMPv6NIQueryIPv6 - fqdn (internal)
a=ICMPv6NIQueryIPv6(data="n.d.org").getfieldval("data")
type(a) is tuple and len(a) == 2 and a[0] == 1 and a[1] == b'\x01n\x01d\x03org\x00'
= ICMPv6NIQueryIPv6 - fqdn
-ICMPv6NIQueryIPv6(data="n.d.org").data == "n.d.org"
+ICMPv6NIQueryIPv6(data="n.d.org").data == b"n.d.org"
= ICMPv6NIQueryIPv6 - IPv6 address (internal)
a=ICMPv6NIQueryIPv6(data="2001:db8::1").getfieldval("data")
@@ -2861,14 +2867,14 @@
type(a) is tuple and len(a) == 2 and a[0] == 1 and a[1] == b'\x07abricot\x00\x00'
= ICMPv6NIQueryIPv4 - single label DNS name
-ICMPv6NIQueryIPv4(data="abricot").data == "abricot"
+ICMPv6NIQueryIPv4(data="abricot").data == b"abricot"
= ICMPv6NIQueryIPv4 - fqdn (internal)
a=ICMPv6NIQueryIPv4(data="n.d.org").getfieldval("data")
type(a) is tuple and len(a) == 2 and a[0] == 1 and a[1] == b'\x01n\x01d\x03org\x00'
= ICMPv6NIQueryIPv4 - fqdn
-ICMPv6NIQueryIPv4(data="n.d.org").data == "n.d.org"
+ICMPv6NIQueryIPv4(data="n.d.org").data == b"n.d.org"
= ICMPv6NIQueryIPv4 - IPv6 address (internal)
a=ICMPv6NIQueryIPv4(data="2001:db8::1").getfieldval("data")
@@ -3054,31 +3060,31 @@
= ICMPv6NIReplyNOOP - single DNS name without hint => understood as string (internal)
a=ICMPv6NIReplyNOOP(data="abricot").getfieldval("data")
-type(a) is tuple and len(a) == 2 and a[0] == 0 and type(a[1]) is str and a[1] == "abricot"
+type(a) is tuple and len(a) == 2 and a[0] == 0 and a[1] == b"abricot"
= ICMPv6NIReplyNOOP - single DNS name without hint => understood as string
-ICMPv6NIReplyNOOP(data="abricot").data == "abricot"
+ICMPv6NIReplyNOOP(data="abricot").data == b"abricot"
= ICMPv6NIReplyNOOP - fqdn without hint => understood as string (internal)
a=ICMPv6NIReplyNOOP(data="n.d.tld").getfieldval("data")
-type(a) is tuple and len(a) == 2 and a[0] == 0 and type(a[1]) is str and a[1] == "n.d.tld"
+type(a) is tuple and len(a) == 2 and a[0] == 0 and a[1] == b"n.d.tld"
= ICMPv6NIReplyNOOP - fqdn without hint => understood as string
-ICMPv6NIReplyNOOP(data="n.d.tld").data == "n.d.tld"
+ICMPv6NIReplyNOOP(data="n.d.tld").data == b"n.d.tld"
= ICMPv6NIReplyNOOP - IPv6 address without hint => understood as string (internal)
a=ICMPv6NIReplyNOOP(data="2001:0db8::1").getfieldval("data")
-type(a) is tuple and len(a) == 2 and a[0] == 0 and type(a[1]) is str and a[1] == "2001:0db8::1"
+type(a) is tuple and len(a) == 2 and a[0] == 0 and a[1] == b"2001:0db8::1"
= ICMPv6NIReplyNOOP - IPv6 address without hint => understood as string
-ICMPv6NIReplyNOOP(data="2001:0db8::1").data == "2001:0db8::1"
+ICMPv6NIReplyNOOP(data="2001:0db8::1").data == b"2001:0db8::1"
= ICMPv6NIReplyNOOP - IPv4 address without hint => understood as string (internal)
a=ICMPv6NIReplyNOOP(data="169.254.253.010").getfieldval("data")
-type(a) is tuple and len(a) == 2 and a[0] == 0 and type(a[1]) is str and a[1] == "169.254.253.010"
+type(a) is tuple and len(a) == 2 and a[0] == 0 and a[1] == b"169.254.253.010"
= ICMPv6NIReplyNOOP - IPv4 address without hint => understood as string
-ICMPv6NIReplyNOOP(data="169.254.253.010").data == "169.254.253.010"
+ICMPv6NIReplyNOOP(data="169.254.253.010").data == b"169.254.253.010"
############
@@ -3090,28 +3096,28 @@
type(a) is tuple and len(a) == 2 and a[0] == 2 and type(a[1]) is list and len(a[1]) == 2 and a[1][0] == 0 and a[1][1] == b'\x07abricot\x00\x00'
= ICMPv6NIReplyName - single label DNS name as a rawing (without ttl)
-ICMPv6NIReplyName(data="abricot").data == [0, "abricot"]
+ICMPv6NIReplyName(data="abricot").data == [0, b"abricot"]
= ICMPv6NIReplyName - fqdn name as a rawing (without ttl) (internal)
a=ICMPv6NIReplyName(data="n.d.tld").getfieldval("data")
type(a) is tuple and len(a) == 2 and a[0] == 2 and type(a[1]) is list and len(a[1]) == 2 and a[1][0] == 0 and a[1][1] == b'\x01n\x01d\x03tld\x00'
= ICMPv6NIReplyName - fqdn name as a rawing (without ttl)
-ICMPv6NIReplyName(data="n.d.tld").data == [0, 'n.d.tld']
+ICMPv6NIReplyName(data="n.d.tld").data == [0, b'n.d.tld']
= ICMPv6NIReplyName - list of 2 single label DNS names (without ttl) (internal)
a=ICMPv6NIReplyName(data=["abricot", "poire"]).getfieldval("data")
type(a) is tuple and len(a) == 2 and a[0] == 2 and type(a[1]) is list and len(a[1]) == 2 and a[1][0] == 0 and a[1][1] == b'\x07abricot\x00\x00\x05poire\x00\x00'
= ICMPv6NIReplyName - list of 2 single label DNS names (without ttl)
-ICMPv6NIReplyName(data=["abricot", "poire"]).data == [0, "abricot", "poire"]
+ICMPv6NIReplyName(data=["abricot", "poire"]).data == [0, b"abricot", b"poire"]
= ICMPv6NIReplyName - [ttl, single-label, single-label, fqdn] (internal)
a=ICMPv6NIReplyName(data=[42, "abricot", "poire", "n.d.tld"]).getfieldval("data")
type(a) is tuple and len(a) == 2 and a[0] == 2 and type(a[1]) is list and len(a[1]) == 2 and a[1][0] == 42 and a[1][1] == b'\x07abricot\x00\x00\x05poire\x00\x00\x01n\x01d\x03tld\x00'
= ICMPv6NIReplyName - [ttl, single-label, single-label, fqdn]
-ICMPv6NIReplyName(data=[42, "abricot", "poire", "n.d.tld"]).data == [42, "abricot", "poire", "n.d.tld"]
+ICMPv6NIReplyName(data=[42, "abricot", "poire", "n.d.tld"]).data == [42, b"abricot", b"poire", b"n.d.tld"]
############
@@ -3422,8 +3428,8 @@
expected += "7 2001:db8::7 3 \n"
expected += "8 2001:db8::8 3 \n"
expected += "9 2001:db8::9 3 \n"
- index_result = result.index("1")
- index_expected = expected.index("1")
+ index_result = result.index("\n1")
+ index_expected = expected.index("\n1")
assert(result[index_result:] == expected[index_expected:])
test_show()
@@ -3590,7 +3596,7 @@
= DHCP6OptClientId dissection with specific DUID_EN as duid value
a=DHCP6OptClientId(b'\x00\x01\x00\x06\x00\x02\x00\x00\x017')
-a.optcode == 1 and a.optlen == 6 and isinstance(a.duid, DUID_EN) and a.duid.type == 2 and a.duid.enterprisenum == 311 and a.duid.id == ""
+a.optcode == 1 and a.optlen == 6 and isinstance(a.duid, DUID_EN) and a.duid.type == 2 and a.duid.enterprisenum == 311 and a.duid.id == b""
############
@@ -3636,7 +3642,7 @@
= DHCP6OptServerId dissection with specific DUID_EN as duid value
a=DHCP6OptServerId(b'\x00\x02\x00\x06\x00\x02\x00\x00\x017')
-a.optcode == 2 and a.optlen == 6 and isinstance(a.duid, DUID_EN) and a.duid.type == 2 and a.duid.enterprisenum == 311 and a.duid.id == ""
+a.optcode == 2 and a.optlen == 6 and isinstance(a.duid, DUID_EN) and a.duid.type == 2 and a.duid.enterprisenum == 311 and a.duid.id == b""
############
@@ -3648,7 +3654,7 @@
= DHCP6OptIAAddress - Basic Dissection
a = DHCP6OptIAAddress(b'\x00\x05\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-a.optcode == 5 and a.optlen == 24 and a.addr == "::" and a.preflft == 0 and a. validlft == 0 and a.iaaddropts == ""
+a.optcode == 5 and a.optlen == 24 and a.addr == "::" and a.preflft == 0 and a. validlft == 0 and a.iaaddropts == b""
= DHCP6OptIAAddress - Instantiation with specific values
raw(DHCP6OptIAAddress(optlen=0x1111, addr="2222:3333::5555", preflft=0x66666666, validlft=0x77777777, iaaddropts="somestring")) == b'\x00\x05\x11\x11""33\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00UUffffwwwwsomestring'
@@ -4148,14 +4154,14 @@
= DHCP6OptNISDomain - Basic Dissection
a = DHCP6OptNISDomain(b'\x00\x1d\x00\x00')
-a.optcode == 29 and a.optlen == 0 and a.nisdomain == ""
+a.optcode == 29 and a.optlen == 0 and a.nisdomain == b""
= DHCP6OptNISDomain - Instantiation with one domain name
raw(DHCP6OptNISDomain(nisdomain="toto.example.org")) == b'\x00\x1d\x00\x11\x04toto\x07example\x03org'
= DHCP6OptNISDomain - Dissection with one domain name
a = DHCP6OptNISDomain(b'\x00\x1d\x00\x11\x04toto\x07example\x03org\x00')
-a.optcode == 29 and a.optlen == 17 and a.nisdomain == "toto.example.org"
+a.optcode == 29 and a.optlen == 17 and a.nisdomain == b"toto.example.org"
= DHCP6OptNISDomain - Instantiation with one domain with trailing dot
raw(DHCP6OptNISDomain(nisdomain="toto.example.org.")) == b'\x00\x1d\x00\x12\x04toto\x07example\x03org\x00'
@@ -4170,14 +4176,14 @@
= DHCP6OptNISPDomain - Basic Dissection
a = DHCP6OptNISPDomain(b'\x00\x1e\x00\x00')
-a.optcode == 30 and a.optlen == 0 and a.nispdomain == ""
+a.optcode == 30 and a.optlen == 0 and a.nispdomain == b""
= DHCP6OptNISPDomain - Instantiation with one domain name
raw(DHCP6OptNISPDomain(nispdomain="toto.example.org")) == b'\x00\x1e\x00\x11\x04toto\x07example\x03org'
= DHCP6OptNISPDomain - Dissection with one domain name
a = DHCP6OptNISPDomain(b'\x00\x1e\x00\x11\x04toto\x07example\x03org\x00')
-a.optcode == 30 and a.optlen == 17 and a.nispdomain == "toto.example.org"
+a.optcode == 30 and a.optlen == 17 and a.nispdomain == b"toto.example.org"
= DHCP6OptNISPDomain - Instantiation with one domain with trailing dot
raw(DHCP6OptNISPDomain(nispdomain="toto.example.org.")) == b'\x00\x1e\x00\x12\x04toto\x07example\x03org\x00'
@@ -4283,7 +4289,7 @@
= DHCP6OptRemoteID - Basic Dissection
a = DHCP6OptRemoteID(b'\x00%\x00\x04\x00\x00\x00\x00')
-a.optcode == 37 and a.optlen == 4 and a.enterprisenum == 0 and a.remoteid == ""
+a.optcode == 37 and a.optlen == 4 and a.enterprisenum == 0 and a.remoteid == b""
= DHCP6OptRemoteID - Instantiation with specific values
raw(DHCP6OptRemoteID(enterprisenum=0xeeeeeeee, remoteid="someid")) == b'\x00%\x00\n\xee\xee\xee\xeesomeid'
@@ -4302,7 +4308,7 @@
= DHCP6OptSubscriberID - Basic Dissection
a = DHCP6OptSubscriberID(b'\x00&\x00\x00')
-a.optcode == 38 and a.optlen == 0 and a.subscriberid == ""
+a.optcode == 38 and a.optlen == 0 and a.subscriberid == b""
= DHCP6OptSubscriberID - Instantiation with specific values
raw(DHCP6OptSubscriberID(subscriberid="someid")) == b'\x00&\x00\x06someid'
@@ -4321,7 +4327,7 @@
= DHCP6OptClientFQDN - Basic Dissection
a = DHCP6OptClientFQDN(b"\x00'\x00\x01\x00")
-a.optcode == 39 and a.optlen == 1 and a.res == 0 and a.flags == 0 and a.fqdn == ""
+a.optcode == 39 and a.optlen == 1 and a.res == 0 and a.flags == 0 and a.fqdn == b""
= DHCP6OptClientFQDN - Instantiation with various flags combinations
raw(DHCP6OptClientFQDN(flags="S")) == b"\x00'\x00\x01\x01" and raw(DHCP6OptClientFQDN(flags="O")) == b"\x00'\x00\x01\x02" and raw(DHCP6OptClientFQDN(flags="N")) == b"\x00'\x00\x01\x04" and raw(DHCP6OptClientFQDN(flags="SON")) == b"\x00'\x00\x01\x07" and raw(DHCP6OptClientFQDN(flags="ON")) == b"\x00'\x00\x01\x06"
@@ -4331,7 +4337,7 @@
= DHCP6OptClientFQDN - Dissection with one fqdn
a = DHCP6OptClientFQDN(b"\x00'\x00\x12\x00\x04toto\x07example\x03org\x00")
-a.optcode == 39 and a.optlen == 18 and a.res == 0 and a.flags == 0 and a.fqdn == "toto.example.org"
+a.optcode == 39 and a.optlen == 18 and a.res == 0 and a.flags == 0 and a.fqdn == b"toto.example.org"
############
@@ -4834,7 +4840,7 @@
= MIP6OptMNID - basic dissection
p = MIP6OptMNID(b'\x08\x01\x01')
-p.otype == 8 and p.olen == 1 and p.subtype == 1 and p.id == ""
+p.otype == 8 and p.olen == 1 and p.subtype == 1 and p.id == b""
= MIP6OptMNID - build with specific values
raw(MIP6OptMNID(subtype=42, id="someid")) == b'\x08\x07*someid'
@@ -5699,13 +5705,13 @@
assert left[0] == Ether(d)
assert len(defragmented) == 1
assert len(defragmented[0]) == 3093
-assert defragmented[0][DNSRR].rrname == 'nyc.gov.'
+assert defragmented[0][DNSRR].rrname == b'nyc.gov.'
assert len(errored) == 0
plist_def = defragment(plist)
assert len(plist_def) == 2
assert len(plist_def[0]) == 3093
-assert plist_def[0][DNSRR].rrname == 'nyc.gov.'
+assert plist_def[0][DNSRR].rrname == b'nyc.gov.'
= Packet().fragment()
payloadlen, fragsize = 100, 8
@@ -5864,13 +5870,13 @@
pkt = IP(raw(IP(src="10.0.0.1", dst="8.8.8.8")/UDP(sport=RandShort(), dport=53)/DNS(qd=DNSQR(qname="secdev.org."))))
assert UDP in pkt and isinstance(pkt[UDP].payload, DNS)
assert pkt[UDP].dport == 53 and pkt[UDP].length is None
-assert pkt[DNS].qdcount == 1 and pkt[DNS].qd.qname == "secdev.org."
+assert pkt[DNS].qdcount == 1 and pkt[DNS].qd.qname == b"secdev.org."
* DNS over TCP
pkt = IP(raw(IP(src="10.0.0.1", dst="8.8.8.8")/TCP(sport=RandShort(), dport=53, flags="P")/DNS(qd=DNSQR(qname="secdev.org."))))
assert TCP in pkt and isinstance(pkt[TCP].payload, DNS)
assert pkt[TCP].dport == 53 and pkt[DNS].length is not None
-assert pkt[DNS].qdcount == 1 and pkt[DNS].qd.qname == "secdev.org."
+assert pkt[DNS].qdcount == 1 and pkt[DNS].qd.qname == b"secdev.org."
= DNS frame with advanced decompression
@@ -5878,27 +5884,27 @@
pkt = Ether(a)
assert pkt.ancount == 3
assert pkt.arcount == 4
-assert pkt.an[1].rdata == 'Zalmoid.local.'
-assert pkt.an[2].rdata == 'Zalmoid.local.'
-assert pkt.ar[1].nextname == '1.A.9.4.7.E.A.4.B.A.F.B.2.1.4.0.0.6.E.F.7.1.F.2.5.3.E.0.1.0.A.2.ip6.arpa.'
-assert pkt.ar[2].nextname == '136.0.168.192.in-addr.arpa.'
+assert pkt.an[1].rdata == b'Zalmoid.local.'
+assert pkt.an[2].rdata == b'Zalmoid.local.'
+assert pkt.ar[1].nextname == b'1.A.9.4.7.E.A.4.B.A.F.B.2.1.4.0.0.6.E.F.7.1.F.2.5.3.E.0.1.0.A.2.ip6.arpa.'
+assert pkt.ar[2].nextname == b'136.0.168.192.in-addr.arpa.'
pkt.show()
= DNS frame with DNSRRSRV
b = Ether(b'33\x00\x00\x00\xfb$\xe3\x14M\x84\xc0\x86\xdd`\t\xc0f\x02b\x11\xff\xfe\x80\x00\x00\x00\x00\x00\x00\x04*,\x03\xab+/\x14\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xfb\x14\xe9\x14\xe9\x02b_\xd8\x00\x00\x84\x00\x00\x00\x00\x0b\x00\x00\x00\x06\x014\x011\x01F\x012\x01B\x012\x01B\x01A\x013\x010\x01C\x012\x01A\x012\x014\x010\x010\x010\x010\x010\x010\x010\x010\x010\x010\x010\x010\x010\x010\x018\x01E\x01F\x03ip6\x04arpa\x00\x00\x0c\x80\x01\x00\x00\x00x\x00\x14\x0csCapys-fLuff\x05local\x00\x03177\x010\x03168\x03192\x07in-addr\xc0P\x00\x0c\x80\x01\x00\x00\x00x\x00\x02\xc0`\x01E\x01F\x017\x01D\x01B\x018\x014\x01C\x014\x01B\x016\x01E\x015\x017\x018\x010\x010\x016\x01E\x01F\x017\x011\x01F\x012\x015\x013\x01E\x010\x011\x010\x01A\x012\xc0L\x00\x0c\x80\x01\x00\x00\x00x\x00\x02\xc0`+24:e3:14:4d:84:c0@fe80::26e3:14ff:fe4d:84c0\x0e_apple-mobdev2\x04_tcp\xc0m\x00\x10\x80\x01\x00\x00\x11\x94\x00\x01\x00\t_services\x07_dns-sd\x04_udp\xc0m\x00\x0c\x00\x01\x00\x00\x11\x94\x00\x02\xc1\x12\x08521805b3\x04_sub\xc1\x12\x00\x0c\x00\x01\x00\x00\x11\x94\x00\x02\xc0\xe6\xc1\x12\x00\x0c\x00\x01\x00\x00\x11\x94\x00\x02\xc0\xe6\xc0\xe6\x00!\x80\x01\x00\x00\x00x\x00\x08\x00\x00\x00\x00~\xf2\xc0`\xc0`\x00\x1c\x80\x01\x00\x00\x00x\x00\x10\xfe\x80\x00\x00\x00\x00\x00\x00\x04*,\x03\xab+/\x14\xc0`\x00\x01\x80\x01\x00\x00\x00x\x00\x04\xc0\xa8\x00\xb1\xc0`\x00\x1c\x80\x01\x00\x00\x00x\x00\x10*\x01\x0e5/\x17\xfe`\x08u\xe6\xb4\xc4\x8b\xd7\xfe\xc0\x0c\x00/\x80\x01\x00\x00\x00x\x00\x06\xc0\x0c\x00\x02\x00\x08\xc0t\x00/\x80\x01\x00\x00\x00x\x00\x06\xc0t\x00\x02\x00\x08\xc0\x98\x00/\x80\x01\x00\x00\x00x\x00\x06\xc0\x98\x00\x02\x00\x08\xc0\xe6\x00/\x80\x01\x00\x00\x11\x94\x00\t\xc0\xe6\x00\x05\x00\x00\x80\x00@\xc0`\x00/\x80\x01\x00\x00\x00x\x00\x08\xc0`\x00\x04@\x00\x00\x08\x00\x00)\x05\xa0\x00\x00\x11\x94\x00\x12\x00\x04\x00\x0e\x00\xcf&\xe3\x14M\x84\xc0$\xe3\x14M\x84\xc0')
assert isinstance(b.an[7], DNSRRSRV)
-assert b.an[7].target == 'sCapys-fLuff.local.'
-assert b.an[6].rrname == '_apple-mobdev2._tcp.local.'
-assert b.an[6].rdata == '24:e3:14:4d:84:c0@fe80::26e3:14ff:fe4d:84c0._apple-mobdev2._tcp.local.'
+assert b.an[7].target == b'sCapys-fLuff.local.'
+assert b.an[6].rrname == b'_apple-mobdev2._tcp.local.'
+assert b.an[6].rdata == b'24:e3:14:4d:84:c0@fe80::26e3:14ff:fe4d:84c0._apple-mobdev2._tcp.local.'
= DNS frame with decompression hidden args
c = b'\x01\x00^\x00\x00\xfb\x14\x0cv\x8f\xfe(\x08\x00E\x00\x01C\xe3\x91@\x00\xff\x11\xf4u\xc0\xa8\x00\xfe\xe0\x00\x00\xfb\x14\xe9\x14\xe9\x01/L \x00\x00\x84\x00\x00\x00\x00\x04\x00\x00\x00\x00\x05_raop\x04_tcp\x05local\x00\x00\x0c\x00\x01\x00\x00\x11\x94\x00\x1e\x1b140C768FFE28@Freebox Server\xc0\x0c\xc0(\x00\x10\x80\x01\x00\x00\x11\x94\x00\xa0\ttxtvers=1\x08vs=190.9\x04ch=2\x08sr=44100\x05ss=16\x08pw=false\x06et=0,1\x04ek=1\ntp=TCP,UDP\x13am=FreeboxServer1,2\ncn=0,1,2,3\x06md=0,2\x07sf=0x44\x0bft=0xBF0A00\x08sv=false\x07da=true\x08vn=65537\x04vv=2\xc0(\x00!\x80\x01\x00\x00\x00x\x00\x19\x00\x00\x00\x00\x13\x88\x10Freebox-Server-3\xc0\x17\xc1\x04\x00\x01\x80\x01\x00\x00\x00x\x00\x04\xc0\xa8\x00\xfe'
pkt = Ether(c)
assert DNS in pkt
-assert pkt.an.rdata == '140C768FFE28@Freebox Server._raop._tcp.local.'
-assert pkt.an.getlayer(DNSRR, type=1).rrname == 'Freebox-Server-3.local.'
+assert pkt.an.rdata == b'140C768FFE28@Freebox Server._raop._tcp.local.'
+assert pkt.an.getlayer(DNSRR, type=1).rrname == b'Freebox-Server-3.local.'
assert pkt.an.getlayer(DNSRR, type=1).rdata == '192.168.0.254'
= Layer binding
@@ -6746,7 +6752,7 @@
assert(p.association_id == 0)
assert(p.offset == 0)
assert(p.count == 0)
-assert(p.data == '')
+assert(p.data == b'')
= NTP Control (mode 6) - CTL_OP_READSTAT (2) - response
@@ -6792,7 +6798,7 @@
assert(p.sequence == 18)
assert(p.status == 0)
assert(p.association_id == 64655)
-assert(p.data == '')
+assert(p.data == b'')
= NTP Control (mode 6) - CTL_OP_READVAR (2) - reponse (1st packet)
@@ -6975,8 +6981,8 @@
assert(p.err == 0)
assert(p.more == 0)
assert(p.op_code == 12)
-assert(p.data == '')
-assert(p.authenticator == '')
+assert(p.data == b'')
+assert(p.authenticator == b'')
= NTP Control (mode 6) - CTL_OP_REQ_NONCE (2) - response
@@ -6990,7 +6996,7 @@
assert(p.more == 0)
assert(p.op_code == 12)
assert(p.data.load == b'nonce=db4186a2e1d9022472e24bc9\r\n')
-assert(p.authenticator == '')
+assert(p.authenticator == b'')
= NTP Control (mode 6) - CTL_OP_READ_MRU (1) - request
@@ -7004,7 +7010,7 @@
assert(p.op_code == 10)
assert(p.count == 40)
assert(p.data.load == b'nonce=db4186a2e1d9022472e24bc9, frags=32')
-assert(p.authenticator == '')
+assert(p.authenticator == b'')
= NTP Control (mode 6) - CTL_OP_READ_MRU (2) - response
s = b'\xd6\x8a\x00\x08\x00\x00\x00\x00\x00\x00\x00\xe9nonce=db4186a2e2073198b93c6419, addr.0=192.168.122.100:123,\r\nfirst.0=0xdb418673.323e1a89, last.0=0xdb418673.323e1a89, ct.0=1,\r\nmv.0=36, rs.0=0x0, WWQ.0=18446744073709509383, now=0xdb4186a2.e20ff8f4,\r\nlast.newest=0xdb418673.323e1a89\r\n\x00\x00\x00'
@@ -7017,7 +7023,7 @@
assert(p.op_code == 10)
assert(p.count == 233)
assert(p.data.load == b'nonce=db4186a2e2073198b93c6419, addr.0=192.168.122.100:123,\r\nfirst.0=0xdb418673.323e1a89, last.0=0xdb418673.323e1a89, ct.0=1,\r\nmv.0=36, rs.0=0x0, WWQ.0=18446744073709509383, now=0xdb4186a2.e20ff8f4,\r\nlast.newest=0xdb418673.323e1a89\r\n\x00\x00\x00')
-assert(p.authenticator == '')
+assert(p.authenticator == b'')
############
@@ -8480,14 +8486,14 @@
assert(sane(raw(cb)) in ["ECk@Y", "QB.P."])
= RandEnumKeys
-~ not_pypy
+~ not_pypy random_weird_py3
random.seed(0x2807)
rek = RandEnumKeys({'a': 1, 'b': 2, 'c': 3}, seed=0x2807)
rek.enum.sort()
assert(rek == ('c' if six.PY2 else 'a'))
= RandSingNum
-~ not_pypy
+~ not_pypy random_weird_py3
random.seed(0x2807)
rs = RandSingNum(-28, 7)
assert(rs == (3 if six.PY2 else 2))
@@ -8796,7 +8802,7 @@
assert(p.reserved == 0)
assert(p.TCB == 0)
assert(p.len == 4)
-assert(p.error_causes == "")
+assert(p.error_causes == b"")
= basic SCTPChunkShutDown - Dissection
~ sctp
@@ -8822,7 +8828,7 @@
assert(isinstance(p, SCTPChunkError))
assert(p.flags == 0)
assert(p.len == 4)
-assert(p.error_causes == "")
+assert(p.error_causes == b"")
= basic SCTPChunkCookieEcho - Dissection
~ sctp
@@ -8831,7 +8837,7 @@
assert(isinstance(p, SCTPChunkCookieEcho))
assert(p.flags == 0)
assert(p.len == 4)
-assert(p.cookie == "")
+assert(p.cookie == b"")
= basic SCTPChunkCookieAck - Dissection
~ sctp
@@ -8966,8 +8972,8 @@
= Multiple Dot11Elt layers
pkt = Dot11() / Dot11Beacon() / Dot11Elt(ID="Rates") / Dot11Elt(ID="SSID", info="Scapy")
-assert pkt[Dot11Elt::{"ID": 0}].info == "Scapy"
-assert pkt.getlayer(Dot11Elt, ID=0).info == "Scapy"
+assert pkt[Dot11Elt::{"ID": 0}].info == b"Scapy"
+assert pkt.getlayer(Dot11Elt, ID=0).info == b"Scapy"
= Dot11WEP - build
~ crypto
@@ -9154,8 +9160,8 @@
expected += "7 192.168.0.7 11 \n"
expected += "8 192.168.0.8 11 \n"
expected += "9 192.168.0.9 11 \n"
- index_result = result_show.index("1")
- index_expected = expected.index("1")
+ index_result = result_show.index("\n1")
+ index_expected = expected.index("\n1")
assert(result_show[index_result:] == expected[index_expected:])
test_show()
@@ -9496,8 +9502,8 @@
created = RTP(extension=True, payload_type="PCMA", sequence=0x1234, timestamp=12345678, sourcesync=0xabcdef01)
created /= RTPExtension(header_id=0x4321, header=[0x11223344])
-assert str(created) == b'\x90\x08\x124\x00\xbcaN\xab\xcd\xef\x01C!\x00\x01\x11"3D', ' '.join(x.encode('hex') for x in str(created))
-parsed = RTP(str(created))
+assert raw(created) == b'\x90\x08\x124\x00\xbcaN\xab\xcd\xef\x01C!\x00\x01\x11"3D'
+parsed = RTP(raw(created))
assert parsed.payload_type == 8
assert "RTPExtension" in parsed, parsed.show()
assert parsed["RTPExtension"].header == [0x11223344]
@@ -9505,7 +9511,7 @@
= test RTP without extension
created = RTP(extension=False, payload_type="DVI4", sequence=0x1234, timestamp=12345678, sourcesync=0xabcdef01)
-assert str(created) == b'\x80\x11\x124\x00\xbcaN\xab\xcd\xef\x01', ' '.join(x.encode('hex') for x in str(created))
-parsed = RTP(str(created))
+assert raw(created) == b'\x80\x11\x124\x00\xbcaN\xab\xcd\xef\x01'
+parsed = RTP(raw(created))
assert parsed.sourcesync == 0xabcdef01
assert "RTPExtension" not in parsed
diff --git a/test/sslv2.uts b/test/sslv2.uts
index eaef9c8..e16030b 100644
--- a/test/sslv2.uts
+++ b/test/sslv2.uts
@@ -265,7 +265,7 @@
t = SSLv2(msg=mk)
t.tls_session.sslv2_connection_id = b'\xba'*16
t.tls_session.sslv2_challenge = b'\x42'*16
-t.str_stateful()
+t.raw_stateful()
s = t.tls_session
assert(s.master_secret == b'\xff'*19 + b'\xaa'*5)
assert(isinstance(s.rcs.ciphersuite, SSL_CK_DES_192_EDE3_CBC_WITH_MD5))
diff --git a/test/tls.uts b/test/tls.uts
index 392f57d..84ce41b 100644
--- a/test/tls.uts
+++ b/test/tls.uts
@@ -1049,7 +1049,7 @@
from scapy.layers.tls.crypto.cipher_block import Cipher_AES_256_CBC
sh = TLSServerHello(gmt_unix_time=0x41414141, random_bytes='B'*28, cipher=0xc014)
t = TLS(msg=sh)
-t.str_stateful()
+t.raw_stateful()
assert(isinstance(t.tls_session.pwcs.ciphersuite, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA))
assert(isinstance(t.tls_session.pwcs.key_exchange, KX_ECDHE_RSA))
assert(isinstance(t.tls_session.pwcs.cipher, Cipher_AES_256_CBC))
diff --git a/test/tls/tests_tls_netaccess.uts b/test/tls/tests_tls_netaccess.uts
index cc311af..9c54e8a 100644
--- a/test/tls/tests_tls_netaccess.uts
+++ b/test/tls/tests_tls_netaccess.uts
@@ -11,6 +11,8 @@
= Load server util functions
~ open_ssl_client
+from __future__ import print_function
+
import sys, os, re, time, multiprocessing, subprocess
sys.path.append(os.path.abspath("./tls"))
@@ -18,7 +20,7 @@
from travis_test_server import *
def test_tls_server(suite="", version=""):
- msg = "TestS_" + suite + "_data"
+ msg = ("TestS_%s_data" % suite).encode()
# Run server
q_ = multiprocessing.Manager().Queue()
th_ = multiprocessing.Process(target=run_tls_test_server, args=(msg, q_))
@@ -28,20 +30,22 @@
time.sleep(1)
# Run client
CA_f = os.path.abspath("./tls/pki/ca_cert.pem")
- p = subprocess.Popen("openssl s_client -cipher " + suite + " " + version + " -CAfile " + CA_f, stdout=subprocess.PIPE, universal_newlines=True,
- stdin=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
- msg += b"\nstop_server"
- out, err = p.communicate(input=msg)
- print out
+ p = subprocess.Popen(
+ ["openssl", "s_client", "-debug", "-cipher", suite, version, "-CAfile", CA_f],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+ )
+ msg += b"\nstop_server\n"
+ out = p.communicate(input=msg)[0]
+ print(out.decode())
if p.returncode != 0:
th_.terminate()
raise RuntimeError("OpenSSL returned with error code")
else:
- p = re.compile(r'verify return:(\d+)')
+ p = re.compile(b'verify return:(\d+)')
_failed = False
_one_success = False
for match in p.finditer(out):
- if match.group(1).strip() != "1":
+ if match.group(1).strip() != b"1":
_failed = True
break
else:
@@ -55,9 +59,9 @@
th_.terminate()
raise RuntimeError("Test timed out")
# Analyse values
- print q_.get()
+ print(q_.get())
assert th_.exitcode == 0
-
+
= Testing TLS server with TLS 1.0 and TLS_RSA_WITH_RC4_128_SHA
~ open_ssl_client
@@ -83,7 +87,9 @@
= Load client utils functions
-import sys, os, threading, Queue
+import sys, os, threading
+
+from scapy.modules.six.moves.queue import Queue
sys.path.append(os.path.abspath("./tls"))
@@ -91,18 +97,18 @@
def perform_tls_client_test(suite, version):
# Run test_tls_client in an other thread
- q = Queue.Queue()
+ q = Queue()
p = threading.Thread(target=test_tls_client, args=(suite, version, q))
p.start()
# Wait for the function to end
p.join()
# Analyse data and return
if not q.empty():
- print q.get()
+ print(q.get())
if not q.empty():
assert q.get() == 0
else:
- print "ERROR: Missing one of the return value detected !"
+ print("ERROR: Missing one of the return value detected !")
assert False
= Testing TLS server and client with SSLv2 and SSL_CK_DES_192_EDE3_CBC_WITH_MD5
diff --git a/test/tls/travis_test_client.py b/test/tls/travis_test_client.py
index efa2d1c..b29e81b 100755
--- a/test/tls/travis_test_client.py
+++ b/test/tls/travis_test_client.py
@@ -26,22 +26,22 @@
def run_tls_test_client(send_data=None, cipher_suite_code=None, version=None):
if version == "0002":
- t = TLSClientAutomaton(data=[send_data, "stop_server", "quit"], version="sslv2")
+ t = TLSClientAutomaton(data=[send_data, b"stop_server", b"quit"], version="sslv2")
else:
ch = TLSClientHello(version=int(version, 16), ciphers=int(cipher_suite_code, 16))
- t = TLSClientAutomaton(client_hello=ch, data=[send_data, "stop_server", "quit"])
+ t = TLSClientAutomaton(client_hello=ch, data=[send_data, b"stop_server", b"quit"], debug=1)
t.run()
from travis_test_server import run_tls_test_server
def test_tls_client(suite, version, q):
- msg = "TestC_" + suite + "_data"
+ msg = ("TestC_%s_data" % suite).encode()
# Run server
q_ = multiprocessing.Manager().Queue()
th_ = multiprocessing.Process(target=run_tls_test_server, args=(msg, q_))
th_.start()
# Synchronise threads
- q_.get()
+ assert q_.get() is True
time.sleep(1)
# Run client
run_tls_test_client(msg, suite, version)
diff --git a/test/tls/travis_test_server.py b/test/tls/travis_test_server.py
index c56e9ab..42848bc 100755
--- a/test/tls/travis_test_server.py
+++ b/test/tls/travis_test_server.py
@@ -12,20 +12,24 @@
If no expected_data was provided and the handshake was ok, we exit with 0.
"""
+from ast import literal_eval
import os
import sys
from contextlib import contextmanager
-from io import BytesIO
+from io import BytesIO, StringIO
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__),"../../"))
-sys.path=[basedir]+sys.path
+from scapy.modules import six
+
+basedir = os.path.abspath(os.path.join(os.path.dirname(__file__),
+ os.path.pardir, os.path.pardir))
+sys.path = [basedir] + sys.path
from scapy.layers.tls.automaton_srv import TLSServerAutomaton
@contextmanager
def captured_output():
- new_out, new_err = BytesIO(), BytesIO()
+ new_out, new_err = (StringIO(), StringIO()) if six.PY3 else (BytesIO(), BytesIO())
old_out, old_err = sys.stdout, sys.stderr
try:
sys.stdout, sys.stderr = new_out, new_err
@@ -39,10 +43,10 @@
return (False, errored)
output = out.getvalue().strip()
if expected_data:
- lines = output.split("\n")
- for l in lines:
- if l == ("> Received: %s" % expected_data):
- return (True, output)
+ for data in output.split('> Received: ')[1:]:
+ for line in literal_eval(data).split(b'\n'):
+ if line == expected_data:
+ return (True, output)
return (False, output)
else:
return (True, None)
@@ -51,8 +55,9 @@
correct = False
with captured_output() as (out, err):
# Prepare automaton
- t = TLSServerAutomaton(mycert=basedir+'/test/tls/pki/srv_cert.pem',
- mykey=basedir+'/test/tls/pki/srv_key.pem')
+ crt_basedir = os.path.join(basedir, 'test', 'tls', 'pki')
+ t = TLSServerAutomaton(mycert=os.path.join(crt_basedir, 'srv_cert.pem'),
+ mykey=os.path.join(crt_basedir, 'srv_key.pem'))
# Sync threads
q.put(True)
# Run server automaton
