Merge
diff --git a/MANIFEST.in b/MANIFEST.in
index 27de48c..7c33aff 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
include MANIFEST.in
include run_scapy
+recursive-include bin *
recursive-include doc *
recursive-include test *
diff --git a/doc/scapy/conf.py b/doc/scapy/conf.py
index 9097fac..bdc8012 100644
--- a/doc/scapy/conf.py
+++ b/doc/scapy/conf.py
@@ -42,9 +42,9 @@
# other places throughout the built documents.
#
# The short X.Y version.
-version = '2.0.1'
+version = '2.1.0'
# The full version, including alpha/beta/rc tags.
-release = '2.0.1'
+release = '2.1.0'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
diff --git a/doc/scapy/installation.rst b/doc/scapy/installation.rst
index af952fa..7ac9ef7 100644
--- a/doc/scapy/installation.rst
+++ b/doc/scapy/installation.rst
@@ -44,7 +44,7 @@
Latest release
--------------
-Download the `latest release <http://scapy.net>`_ to a temporary directory and install it in the standard `distutils <http://docs.python.org/inst/inst.html>`_ way::
+Download the `latest version <http://scapy.net>`_ to a temporary directory and install it in the standard `distutils <http://docs.python.org/inst/inst.html>`_ way::
$ cd /tmp
$ wget scapy.net
@@ -52,17 +52,27 @@
$ cd scapy-2.*
$ sudo python setup.py install
-Alternatively, you can make the zip file executable, move it to a directory in your PATH and run it directly::
+Alternatively, you can execute the zip file::
$ chmod +x scapy-latest.zip
$ sudo ./scapy-latest.zip
+or::
+
+$ sudo sh scapy-latest.zip
+
+or::
+
+$ mv scapy-latest.zip /usr/local/bin/scapy
+$ sudo scapy
+
.. note::
To make a zip executable, some bytes have been added before the zip header.
Most zip programs handle this, but not all. If your zip program complains
about the zip file to be corrupted, either change it, or download a
non-executable zip at http://hg.secdev.org/scapy/archive/tip.zip
+
Current development version
----------------------------
@@ -372,7 +382,7 @@
You need the following software packages in order to install Scapy on Windows:
* `Python <http://www.python.org>`_: `python-2.5.4.msi <http://www.python.org/ftp/python/2.5.4/python-2.5.4.msi>`_. `python-2.6.3.msi <http://www.python.org/ftp/python/2.6.3/python-2.6.3.msi>`_. After installation, add the Python installation directory and its \Scripts subdirectory to your PATH. Depending on your Python version, the defaults would be ``C:\Python25`` and ``C:\Python25\Scripts`` or ``C:\Python26`` and ``C:\Python26\Scripts`` respectively.
- * `Scapy <http://www.secdev.org/projects/scapy/>`_: `latest version from the Mercurial repository <http://scapy.net>`_. Unzip the archive, open a command prompt in that directory and run "python setup.py install".
+ * `Scapy <http://www.secdev.org/projects/scapy/>`_: `latest development version <http://hg.secdev.org/scapy/archive/tip.zip>`_ from the `Mercurial repository <http://hg.secdev.org/scapy>`_. Unzip the archive, open a command prompt in that directory and run "python setup.py install".
* `pywin32 <http://python.net/crew/mhammond/win32/Downloads.html>`_: `pywin32-214.win32-py2.5.exe <http://surfnet.dl.sourceforge.net/sourceforge/pywin32/pywin32-214.win32-py2.5.exe>`_ `pywin32-214.win32-py2.6.exe <http://downloads.sourceforge.net/project/pywin32/pywin32/Build%20214/pywin32-214.win32-py2.6.exe>`_
* `WinPcap <http://www.winpcap.org/>`_: `WinPcap_4_1_1.exe <http://www.winpcap.org/install/bin/WinPcap_4_1_1.exe>`_. You might want to choose "[x] Automatically start the WinPcap driver at boot time", so that non-privileged users can sniff, especially under Vista and Windows 7. If you want to use the ethernet vendor database to resolve MAC addresses or use the ``wireshark()`` command, download `Wireshark <http://www.wireshark.org/>`_ which already includes WinPcap.
* `pypcap <http://code.google.com/p/pypcap/>`_: `pcap-1.1-scapy-20090720.win32-py25.exe <http://www.secdev.org/projects/scapy/files/pcap-1.1-scapy-20090720.win32-py2.5.exe>`_ `pcap-1.1-scapy-20090720.win32-py2.6.exe <http://www.secdev.org/projects/scapy/files/pcap-1.1-scapy-20090720.win32-py2.6.exe>`_. This is a *special version for Scapy*, as the original leads to some timing problems. Now works on Vista and Windows 7, too. Under Vista/Win7 please right-click on the installer and choose "Run as administrator".
diff --git a/scapy/all.py b/scapy/all.py
index fbaf017..f6cf00e 100644
--- a/scapy/all.py
+++ b/scapy/all.py
@@ -40,4 +40,4 @@
from asn1.ber import *
from asn1.mib import *
-from crypto.cert import *
+from crypto import *
diff --git a/scapy/crypto/__init__.py b/scapy/crypto/__init__.py
index 0fdc3e4..a29ecf8 100644
--- a/scapy/crypto/__init__.py
+++ b/scapy/crypto/__init__.py
@@ -3,4 +3,13 @@
## Copyright (C) Arnaud Ebalard <arno@natisbad.org>
## This program is published under a GPLv2 license
-__all__ = ["cert"]
+
+
+try:
+ import Crypto
+except ImportError:
+ import logging
+ log_loading = logging.getLogger("scapy.loading")
+ log_loading.info("Can't import python Crypto lib. Disabled certificate manipulation tools")
+else:
+ from scapy.crypto.cert import *