Fix double encoded values decoding in SET

[pyderasn.git] / doc / install.rst

diff --git a/doc/install.rst b/doc/install.rst
index 08285de0e2a8c253bd949097b099bcc90d3b4640..a14ebc590b23fbc88d727720b21cc2d3ad6e3ff4 100644 (file)
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -4,21 +4,25 @@ Install
 Preferable way is to :ref:`download <download>` tarball with the
 signature from `official website <http://pyderasn.cypherpunks.ru/>`__::
 
-    % wget http://pyderasn.cypherpunks.ru/pyderasn-1.0.tar.xz
-    % wget http://pyderasn.cypherpunks.ru/pyderasn-1.0.tar.xz.sig
-    % gpg --verify pyderasn-1.0.tar.xz.sig pyderasn-1.0.tar.xz
-    % xz -d < pyderasn-1.0.tar.xz | tar xf -
-    % cd pyderasn-1.0
-    % python setup.py install
-
-PyDERASN depends on `six <https://pypi.python.org/pypi/six>`__ package
-for keeping compatibility with Py27/Py35. If it is not installed on your
-system, then ``setup.py install`` will try to download it from PyPI. You
-can also find it mirrored on :ref:`download <download>` page.
-
-You could use PIP (**no** authentication is performed!)::
-
-    % pip install pyderasn
+    $ [fetch|wget] http://pyderasn.cypherpunks.ru/pyderasn-7.0.tar.xz
+    $ [fetch|wget] http://pyderasn.cypherpunks.ru/pyderasn-7.0.tar.xz.sig
+    $ gpg --verify pyderasn-7.0.tar.xz.sig pyderasn-7.0.tar.xz
+    $ xz --decompress --stdout pyderasn-7.0.tar.xz | tar xf -
+    $ cd pyderasn-7.0
+    $ python setup.py install
+    # or copy pyderasn.py (+six.py, possibly termcolor.py) to your PYTHONPATH
+
+PyDERASN depends on `six <https://pypi.org/project/six/>`__ package
+for keeping compatibility with Py27/Py35. It is included in the tarball.
+You can also find it mirrored on :ref:`download <download>` page.
+
+You could use pip (**no** OpenPGP authentication is performed!) with PyPI::
+
+    $ cat > requirements.txt <<EOF
+    pyderasn==7.0 --hash=sha256:TO-BE-FILLED
+    six==1.14.0 --hash=sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a
+    EOF
+    $ pip install --requirement requirements.txt
 
 You have to verify downloaded tarballs integrity and authenticity to be
 sure that you retrieved trusted and untampered software. `GNU Privacy
@@ -34,9 +38,7 @@ resources.
           2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
     uid   PyDERASN releases <pyderasn@cypherpunks.ru>
 
-    % gpg --keyserver hkp://keys.gnupg.net/ --recv-keys 0x04A933D1BA20327A
-    % gpg --auto-key-locate dane --locate-keys pyderasn at cypherpunks dot ru
-    % gpg --auto-key-locate wkd --locate-keys pyderasn at cypherpunks dot ru
-    % gpg --auto-key-locate pka --locate-keys pyderasn at cypherpunks dot ru
+    $ gpg --auto-key-locate dane --locate-keys pyderasn at cypherpunks dot ru
+    $ gpg --auto-key-locate wkd --locate-keys pyderasn at cypherpunks dot ru
 
 .. literalinclude:: ../PUBKEY.asc