[Python-modules-commits] [pycryptodome] 04/10: merge patched into master

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Sat Nov 4 09:51:28 UTC 2017


This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository pycryptodome.

commit 084ab8789997f10c12bd6fe7ba760adb0b04c1ea
Merge: 521c4be f62d6b6
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sat Nov 4 06:57:49 2017 +0000

    merge patched into master

 Changelog.rst                                      |  30 +-
 Doc/Makefile                                       |   2 +-
 Doc/conf.py                                        |  29 +-
 Doc/epydoc-config                                  |  24 --
 Doc/index.rst                                      |   3 +-
 Doc/src/api.rst                                    |  51 ++-
 Doc/src/public_key.rst                             |   4 +
 Doc/src/vs_pycrypto.rst                            |  65 ++++
 FuturePlans.rst                                    |   2 +-
 INSTALL.rst                                        |  68 ++++
 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 debian/patches/0001-Fix-Documentation.patch        |  18 +-
 .../patches/0002-Supress-privacy-violations.patch  |  23 --
 debian/patches/series                              |   1 -
 lib/Crypto/Cipher/AES.py                           | 229 ++++-------
 lib/Crypto/Cipher/ARC2.py                          | 148 +++-----
 lib/Crypto/Cipher/ARC4.py                          |  85 ++---
 lib/Crypto/Cipher/Blowfish.py                      | 134 +++----
 lib/Crypto/Cipher/CAST.py                          | 143 +++----
 lib/Crypto/Cipher/ChaCha20.py                      |  65 ++--
 lib/Crypto/Cipher/DES.py                           | 133 +++----
 lib/Crypto/Cipher/DES3.py                          | 174 +++------
 lib/Crypto/Cipher/PKCS1_OAEP.py                    | 132 +++----
 lib/Crypto/Cipher/PKCS1_v1_5.py                    | 123 +++---
 lib/Crypto/Cipher/Salsa20.py                       |  68 ++--
 lib/Crypto/Cipher/__init__.py                      |  75 ----
 lib/Crypto/Cipher/_errors.py                       |   0
 lib/Crypto/Hash/BLAKE2b.py                         | 157 ++++----
 lib/Crypto/Hash/BLAKE2s.py                         | 157 ++++----
 lib/Crypto/Hash/CMAC.py                            | 185 +++------
 lib/Crypto/Hash/HMAC.py                            | 183 +++------
 lib/Crypto/Hash/MD2.py                             |  91 ++---
 lib/Crypto/Hash/MD5.py                             |  21 +-
 lib/Crypto/Hash/RIPEMD160.py                       |  97 ++---
 lib/Crypto/Hash/SHA1.py                            |  23 +-
 lib/Crypto/Hash/SHA224.py                          |  86 ++---
 lib/Crypto/Hash/SHA256.py                          |  86 ++---
 lib/Crypto/Hash/SHA384.py                          |  86 ++---
 lib/Crypto/Hash/SHA3_224.py                        |  86 ++---
 lib/Crypto/Hash/SHA3_256.py                        |  86 ++---
 lib/Crypto/Hash/SHA3_384.py                        |  86 ++---
 lib/Crypto/Hash/SHA3_512.py                        |  87 ++---
 lib/Crypto/Hash/SHA512.py                          |  86 ++---
 lib/Crypto/Hash/SHAKE128.py                        |  71 ++--
 lib/Crypto/Hash/SHAKE256.py                        |  71 ++--
 lib/Crypto/Hash/__init__.py                        |  26 --
 lib/Crypto/Hash/keccak.py                          |  91 ++---
 lib/Crypto/IO/PEM.py                               |  41 +-
 lib/Crypto/IO/PKCS8.py                             |  82 ++--
 lib/Crypto/IO/__init__.py                          |  13 -
 lib/Crypto/Protocol/KDF.py                         | 134 +++----
 lib/Crypto/Protocol/SecretSharing.py               | 117 +++---
 lib/Crypto/Protocol/__init__.py                    |  12 -
 lib/Crypto/PublicKey/DSA.py                        | 244 +++++-------
 lib/Crypto/PublicKey/ECC.py                        | 173 ++++-----
 lib/Crypto/PublicKey/ElGamal.py                    | 171 +++------
 lib/Crypto/PublicKey/RSA.py                        | 234 ++++++------
 lib/Crypto/PublicKey/__init__.py                   |   8 -
 lib/Crypto/Random/random.py                        |   5 +-
 lib/Crypto/SelfTest/Hash/common.py                 |  10 -
 lib/Crypto/SelfTest/PublicKey/test_import_DSA.py   |   4 +-
 lib/Crypto/SelfTest/PublicKey/test_import_RSA.py   |   4 +-
 lib/Crypto/Signature/DSS.py                        | 152 ++++----
 lib/Crypto/Signature/pkcs1_15.py                   | 109 ++----
 lib/Crypto/Signature/pss.py                        | 166 ++++----
 lib/Crypto/Util/Counter.py                         |  62 +--
 lib/Crypto/Util/Padding.py                         |  42 +--
 lib/Crypto/Util/RFC1751.py                         |  37 +-
 lib/Crypto/Util/_raw_api.py                        |  35 +-
 lib/Crypto/Util/asn1.py                            | 138 +++----
 lib/Crypto/Util/number.py                          | 209 +++++------
 lib/Crypto/Util/strxor.py                          |  18 +-
 lib/Crypto/__init__.py                             |  45 +--
 PKG-INFO => pycryptodome.egg-info/PKG-INFO         |   2 +-
 pycryptodome.egg-info/SOURCES.txt                  | 417 +++++++++++++++++++++
 pycryptodome.egg-info/dependency_links.txt         |   1 +
 pycryptodome.egg-info/top_level.txt                |   1 +
 setup.cfg                                          |   1 -
 79 files changed, 2808 insertions(+), 3578 deletions(-)

diff --cc debian/.git-dpm
index c76dca7,0000000..2100589
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 34680aebe2c082eeac422b81c028e90412b44a64
- 34680aebe2c082eeac422b81c028e90412b44a64
- 223540de1154f40034a4be1703ef751522f99d5a
++f62d6b652cf135f635bcf2b2956e924ccba97394
++f62d6b652cf135f635bcf2b2956e924ccba97394
++d14794536e3f86e5740f8cdb584d15d8a07ad0d7
 +d14794536e3f86e5740f8cdb584d15d8a07ad0d7
 +pycryptodome_3.4.7.orig.tar.gz
 +19e7035789179fd2574fb36baf2ea548323f5b40
 +6483140
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-Documentation.patch
index 304e077,0000000..0a800ad
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-Documentation.patch
+++ b/debian/patches/0001-Fix-Documentation.patch
@@@ -1,57 -1,0 +1,43 @@@
- From 4fd78bfb1914e98fca35e2ee4a46c6cd182b14fe Mon Sep 17 00:00:00 2001
++From f62d6b652cf135f635bcf2b2956e924ccba97394 Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <mans0954 at debian.org>
 +Date: Wed, 7 Jun 2017 20:43:23 +0100
 +Subject: =?UTF-8?q?Fix=20Documentation=0A=20*=20Only=20use=20one=20maths?=
 + =?UTF-8?q?=20extension,=20choose=20mathimg=20as=20mathjax=20embedding=20h?=
 + =?UTF-8?q?as=20privacy=20issues=0A=20*=20Remove=20Travis=20and=20AppVeyor?=
 + =?UTF-8?q?=20image=20links=20to=20address=20privacy=20issues=0A=20*=20Use?=
 + =?UTF-8?q?=20debian=20copyright=20file=20for=20licenses?=
 +
 +Origin: upstream, https://github.com/Legrandin/pycryptodome/commit/05eb116ee1effcc39312121386eb047772925d62
 +Bug: https://github.com/Legrandin/pycryptodome/issues/73
 +Last-Update: 2017-07-08
 +---
-  Doc/conf.py         | 2 +-
 + Doc/src/license.rst | 3 ++-
 + README.rst          | 6 ------
-  3 files changed, 3 insertions(+), 8 deletions(-)
++ 2 files changed, 2 insertions(+), 7 deletions(-)
 +
- diff --git a/Doc/conf.py b/Doc/conf.py
- index 7b26049..f159582 100644
- --- a/Doc/conf.py
- +++ b/Doc/conf.py
- @@ -25,7 +25,7 @@ import sys, os
-  
-  # Add any Sphinx extension module names here, as strings. They can be extensions
-  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- -extensions = ['sphinx.ext.pngmath', 'sphinx.ext.mathjax']
- +extensions = ['sphinx.ext.imgmath']
-  
-  # Add any paths that contain templates here, relative to this directory.
-  templates_path = ['_templates']
 +diff --git a/Doc/src/license.rst b/Doc/src/license.rst
 +index 25acf59..9a492fa 100644
 +--- a/Doc/src/license.rst
 ++++ b/Doc/src/license.rst
 +@@ -1,5 +1,6 @@
 + License
 + -------
 + 
 +-.. include:: ../../LICENSE.rst
 ++`Copyright <../../copyright>`_
 ++
 + 
 +diff --git a/README.rst b/README.rst
 +index 85e89cf..bb18953 100644
 +--- a/README.rst
 ++++ b/README.rst
 +@@ -1,9 +1,3 @@
 +-.. image:: https://travis-ci.org/Legrandin/pycryptodome.svg?branch=master
 +-   :target: https://travis-ci.org/Legrandin/pycryptodome
 +-
 +-.. image:: https://ci.appveyor.com/api/projects/status/mbxyqdodw9ylfib9/branch/master?svg=true
 +-   :target: https://ci.appveyor.com/project/Legrandin/pycryptodome
 +-
 + PyCryptodome
 + ============
 + 
diff --cc debian/patches/series
index 9752f4e,0000000..dc61448
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +0001-Fix-Documentation.patch
- 0002-Supress-privacy-violations.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycryptodome.git



More information about the Python-modules-commits mailing list