[Python-modules-commits] [python-cryptography] 01/02: Merge branch 'master' into jessie-backports

Tristan Seligmann mithrandi at moszumanska.debian.org
Sat Jun 10 09:33:43 UTC 2017


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

mithrandi pushed a commit to branch jessie-backports
in repository python-cryptography.

commit 91c769d0df8513d7579bdb90a665b03e15e8c2a6
Merge: 207be72 f23a0e2
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Fri Jun 9 23:14:23 2017 +0200

    Merge branch 'master' into jessie-backports

 AUTHORS.rst                                        |   9 +
 CHANGELOG.rst                                      | 133 +++-
 LICENSE                                            |   4 +
 PKG-INFO                                           |  11 +-
 README.rst                                         |   9 +
 debian/.git-dpm                                    |  14 +-
 debian/changelog                                   |  67 ++
 debian/control                                     |  22 +-
 .../0001-add-memory-limit-check-for-scrypt.patch   |  78 +++
 .../0002-fix-compilation-on-1.1.0f-3603.patch      |  33 +
 debian/patches/series                              |   2 +
 debian/pydist-overrides                            |   2 +-
 debian/tests/control                               |   2 +
 debian/tests/python2                               |   8 -
 debian/tests/python3                               |   8 -
 docs/development/c-bindings.rst                    |   2 +-
 .../custom-vectors/cast5/generate_cast5.py         |   1 +
 docs/development/custom-vectors/idea.rst           |   2 +-
 .../custom-vectors/idea/generate_idea.py           |   1 +
 docs/development/custom-vectors/rsa-oaep-sha2.rst  |  56 ++
 .../rsa-oaep-sha2/VerifyRSAOAEPSHA2.java           | 416 +++++++++++++
 .../rsa-oaep-sha2/generate_rsa_oaep_sha2.py        | 128 ++++
 .../custom-vectors/secp256k1/generate_secp256k1.py |   1 +
 docs/development/custom-vectors/seed.rst           |   2 +-
 .../custom-vectors/seed/generate_seed.py           |   1 +
 docs/development/getting-started.rst               |  48 +-
 docs/development/submitting-patches.rst            |   7 +-
 docs/development/test-vectors.rst                  |  19 +-
 docs/doing-a-release.rst                           |   2 +
 docs/faq.rst                                       |  26 +-
 docs/hazmat/backends/commoncrypto.rst              |   2 +-
 docs/hazmat/backends/interfaces.rst                | 251 ++++----
 docs/hazmat/backends/openssl.rst                   |  34 +-
 docs/hazmat/bindings/commoncrypto.rst              |   4 +-
 docs/hazmat/bindings/openssl.rst                   |   7 +-
 docs/hazmat/primitives/asymmetric/dh.rst           | 168 +++--
 docs/hazmat/primitives/asymmetric/dsa.rst          | 148 +++--
 docs/hazmat/primitives/asymmetric/ec.rst           | 186 +++++-
 docs/hazmat/primitives/asymmetric/rsa.rst          | 172 ++++--
 .../hazmat/primitives/asymmetric/serialization.rst |  45 +-
 docs/hazmat/primitives/asymmetric/utils.rst        |  58 ++
 docs/hazmat/primitives/cryptographic-hashes.rst    |  42 +-
 .../hazmat/primitives/key-derivation-functions.rst | 327 ++++++++--
 docs/hazmat/primitives/keywrap.rst                 |   4 +-
 docs/hazmat/primitives/mac/cmac.rst                |  14 +-
 docs/hazmat/primitives/mac/hmac.rst                |   8 +-
 docs/hazmat/primitives/padding.rst                 |  12 +-
 docs/hazmat/primitives/symmetric-encryption.rst    |  16 +-
 docs/hazmat/primitives/twofactor.rst               |  36 +-
 docs/installation.rst                              |  37 +-
 docs/random-numbers.rst                            |   2 +-
 docs/spelling_wordlist.txt                         |  34 +-
 docs/x509/reference.rst                            | 219 +++++--
 docs/x509/tutorial.rst                             |   2 +
 setup.py                                           |   9 +-
 src/_cffi_src/build_commoncrypto.py                |   1 +
 src/_cffi_src/build_openssl.py                     |  28 +-
 src/_cffi_src/commoncrypto/secure_transport.py     | 308 ++++++++++
 src/_cffi_src/hazmat_src/padding.c                 |  30 +-
 src/_cffi_src/openssl/aes.py                       |  29 +-
 src/_cffi_src/openssl/asn1.py                      |  18 +-
 src/_cffi_src/openssl/bio.py                       |  69 +--
 src/_cffi_src/openssl/callbacks.py                 |  78 ++-
 src/_cffi_src/openssl/cmac.py                      |   9 +-
 src/_cffi_src/openssl/cms.py                       |  12 +-
 src/_cffi_src/openssl/conf.py                      |  24 +
 src/_cffi_src/openssl/crypto.py                    |  27 +-
 src/_cffi_src/openssl/cryptography.py              |  72 +++
 src/_cffi_src/openssl/dh.py                        |  94 ++-
 src/_cffi_src/openssl/dsa.py                       |  90 ++-
 src/_cffi_src/openssl/ec.py                        |   4 +-
 src/_cffi_src/openssl/ecdh.py                      |   9 +
 src/_cffi_src/openssl/engine.py                    |   2 +-
 src/_cffi_src/openssl/err.py                       | 148 ++---
 src/_cffi_src/openssl/evp.py                       | 139 ++---
 src/_cffi_src/openssl/hmac.py                      |  69 +--
 src/_cffi_src/openssl/nid.py                       |  15 +-
 src/_cffi_src/openssl/objects.py                   |  12 +-
 src/_cffi_src/openssl/osrandom_engine.py           |  29 +
 src/_cffi_src/openssl/pem.py                       |   2 +
 src/_cffi_src/openssl/rand.py                      |  13 +-
 src/_cffi_src/openssl/rsa.py                       | 149 ++++-
 src/_cffi_src/openssl/src/osrandom_engine.c        | 576 +++++++++++++++++
 src/_cffi_src/openssl/src/osrandom_engine.h        |  88 +++
 src/_cffi_src/openssl/ssl.py                       | 162 ++---
 src/_cffi_src/openssl/x509.py                      | 144 ++---
 src/_cffi_src/openssl/x509_vfy.py                  |  86 ++-
 src/_cffi_src/openssl/x509name.py                  |  42 +-
 src/_cffi_src/openssl/x509v3.py                    |  39 +-
 src/_cffi_src/utils.py                             |   7 +-
 src/cryptography.egg-info/PKG-INFO                 |  11 +-
 src/cryptography.egg-info/SOURCES.txt              |  17 +
 src/cryptography.egg-info/requires.txt             |   5 +-
 src/cryptography/__about__.py                      |   2 +-
 src/cryptography/exceptions.py                     |   1 +
 src/cryptography/hazmat/backends/__init__.py       |  40 +-
 .../hazmat/backends/commoncrypto/backend.py        |   9 +-
 src/cryptography/hazmat/backends/interfaces.py     |  35 +-
 src/cryptography/hazmat/backends/multibackend.py   | 100 ++-
 .../hazmat/backends/openssl/backend.py             | 582 ++++++++++++------
 .../hazmat/backends/openssl/ciphers.py             |  31 +-
 .../hazmat/backends/openssl/decode_asn1.py         |  80 +--
 src/cryptography/hazmat/backends/openssl/dh.py     | 182 ++++++
 src/cryptography/hazmat/backends/openssl/dsa.py    | 184 ++++--
 src/cryptography/hazmat/backends/openssl/ec.py     | 121 ++--
 .../hazmat/backends/openssl/encode_asn1.py         |  52 +-
 src/cryptography/hazmat/backends/openssl/hashes.py |   6 +-
 src/cryptography/hazmat/backends/openssl/hmac.py   |  14 +-
 src/cryptography/hazmat/backends/openssl/rsa.py    | 682 +++++++++------------
 src/cryptography/hazmat/backends/openssl/utils.py  |  20 +
 src/cryptography/hazmat/backends/openssl/x509.py   |  65 +-
 .../hazmat/bindings/openssl/_conditional.py        | 123 +---
 .../hazmat/bindings/openssl/binding.py             | 107 +---
 .../hazmat/primitives/asymmetric/dh.py             |  23 +
 .../hazmat/primitives/asymmetric/dsa.py            |  25 +
 .../hazmat/primitives/asymmetric/ec.py             |  31 +
 .../hazmat/primitives/asymmetric/padding.py        |  12 +
 .../hazmat/primitives/asymmetric/rsa.py            |  18 +-
 .../hazmat/primitives/asymmetric/utils.py          |  18 +-
 src/cryptography/hazmat/primitives/hashes.py       |  42 ++
 src/cryptography/hazmat/primitives/kdf/hkdf.py     |   2 +-
 src/cryptography/hazmat/primitives/kdf/kbkdf.py    | 148 +++++
 src/cryptography/hazmat/primitives/kdf/scrypt.py   |  59 ++
 src/cryptography/hazmat/primitives/padding.py      |   4 +-
 .../hazmat/primitives/serialization.py             |  43 +-
 .../hazmat/primitives/twofactor/hotp.py            |   5 +-
 .../hazmat/primitives/twofactor/totp.py            |   5 +-
 src/cryptography/utils.py                          |  32 +-
 src/cryptography/x509/__init__.py                  |  16 +-
 src/cryptography/x509/base.py                      |  66 +-
 src/cryptography/x509/extensions.py                | 136 ++--
 src/cryptography/x509/name.py                      |  63 +-
 src/cryptography/x509/oid.py                       |  51 +-
 tests/conftest.py                                  |   5 +
 tests/hazmat/backends/test_backendinit.py          |  17 +
 tests/hazmat/backends/test_multibackend.py         |  94 ++-
 tests/hazmat/backends/test_openssl.py              | 190 ++++--
 tests/hazmat/bindings/test_openssl.py              |  90 +--
 tests/hazmat/primitives/test_asym_utils.py         |   9 +-
 tests/hazmat/primitives/test_dh.py                 | 207 ++++++-
 tests/hazmat/primitives/test_dsa.py                | 105 +++-
 tests/hazmat/primitives/test_ec.py                 | 171 +++++-
 tests/hazmat/primitives/test_hash_vectors.py       |  34 +
 tests/hazmat/primitives/test_hashes.py             |  48 ++
 tests/hazmat/primitives/test_hkdf.py               |  11 +
 tests/hazmat/primitives/test_kbkdf.py              | 151 +++++
 tests/hazmat/primitives/test_kbkdf_vectors.py      |  23 +
 tests/hazmat/primitives/test_padding.py            |  16 +
 tests/hazmat/primitives/test_rsa.py                | 246 +++++++-
 tests/hazmat/primitives/test_scrypt.py             | 155 +++++
 tests/hazmat/primitives/test_serialization.py      |  11 +
 tests/hazmat/primitives/test_x963_vectors.py       |   3 +-
 tests/hazmat/primitives/twofactor/test_hotp.py     |   4 +
 tests/hazmat/primitives/utils.py                   |  59 ++
 tests/hypothesis/test_padding.py                   |   4 +-
 tests/test_cryptography_utils.py                   |  11 +
 tests/test_interfaces.py                           |  28 +-
 tests/test_utils.py                                |  99 ++-
 tests/test_x509.py                                 | 517 +++++++++++++---
 tests/test_x509_crlbuilder.py                      |  42 +-
 tests/test_x509_ext.py                             | 193 +++++-
 tests/test_x509_revokedcertbuilder.py              |  49 +-
 tests/utils.py                                     |  37 ++
 163 files changed, 8799 insertions(+), 2673 deletions(-)

diff --cc debian/changelog
index badccce,227faa5..c43add2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,70 +1,82 @@@
+ python-cryptography (1.7.1-3) unstable; urgency=medium
+ 
+   * Apply patch 6e7ea2e7 from upstream to fix compilation against OpenSSL
+     1.1.0f (closes: #863474).
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Sun, 28 May 2017 04:20:33 +0200
+ 
+ python-cryptography (1.7.1-2) unstable; urgency=medium
+ 
+   * Apply upstream patch from #3328 to fix test suite on 32-bit arches.
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Mon, 19 Dec 2016 19:49:14 +0200
+ 
+ python-cryptography (1.7.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Wed, 14 Dec 2016 07:59:21 +0200
+ 
+ python-cryptography (1.5.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Fixes a security issue where HKDF would generate a 0-length key when
+       asked for a short length key. Urgency medium, because no software in
+       Debian appears to be affected.
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Tue, 08 Nov 2016 05:36:00 +0200
+ 
+ python-cryptography (1.5.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Fixes failure on OpenSSL 1.0.2j (closes: #839369)
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Sat, 01 Oct 2016 17:26:32 +0200
+ 
+ python-cryptography (1.5-2) unstable; urgency=medium
+ 
+   * Add missing test dependency on python{,3}-tz.
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Sat, 10 Sep 2016 15:40:13 +0200
+ 
+ python-cryptography (1.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Compatible with OpenSSL 1.1.0 (closes: #828518).
+   * Version setuptools dependency.
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Fri, 26 Aug 2016 18:25:12 +0200
+ 
+ python-cryptography (1.4-2) unstable; urgency=medium
+ 
+   * Fix typo in overrides file.
+   * Add Breaks: on python{,3}-openssl because of incompatibilities between
+     older PyOpenSSL and Cryptography (see
+     https://github.com/pyca/pyopenssl/pull/406 for details).
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Sat, 16 Jul 2016 07:12:08 +0200
+ 
+ python-cryptography (1.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Depend on a new enough dh-python (necessary to handle the python-cffi
+     mapping correctly) (closes: #827925; technically not present in
+     testing/unstable anyway).
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Thu, 23 Jun 2016 00:26:35 +0200
+ 
 +python-cryptography (1.3.4-1~bpo8+2) jessie-backports; urgency=medium
 +
 +  * Restore cffi workaround that is still necessary.
 +
 + -- Tristan Seligmann <mithrandi at debian.org>  Wed, 22 Jun 2016 23:22:02 +0200
 +
 +python-cryptography (1.3.4-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Tristan Seligmann <mithrandi at debian.org>  Mon, 20 Jun 2016 18:06:58 +0200
 +
  python-cryptography (1.3.4-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index f32ab8a,dcd2446..e865aed
--- a/debian/control
+++ b/debian/control
@@@ -19,24 -19,26 +19,26 @@@ Build-Depends
   python-pretend <!nocheck>,
   python-pyasn1 (>= 0.1.8~),
   python-pyasn1-modules <!nocheck>,
-  python-pytest <!nocheck>,
+  python-pytest (>= 2.9.0) <!nocheck>,
 - python-setuptools (>= 11.3),
 + python-setuptools (>= 11.3~),
   python-six (>= 1.4.1~),
+  python-sphinx-rtd-theme <!nodoc>,
+  python-tz <!nocheck>,
   python3-all-dev,
   python3-cffi (>= 1.4.1~),
-  python3-cryptography-vectors (<< 1.3.5~) <!nocheck>,
-  python3-cryptography-vectors (>= 1.3.4~) <!nocheck>,
+  python3-cryptography-vectors (<< 1.7.2~) <!nocheck>,
+  python3-cryptography-vectors (>= 1.7.1~) <!nocheck>,
   python3-hypothesis <!nocheck>,
   python3-idna (>= 2.0~),
-  python-sphinx-rtd-theme <!nodoc>,
-  python3-sphinx <!nodoc>,
   python3-iso8601 <!nocheck>,
   python3-pretend <!nocheck>,
   python3-pyasn1 (>= 0.1.8~),
   python3-pyasn1-modules <!nocheck>,
-  python3-pytest <!nocheck>,
+  python3-pytest (>= 2.9.0) <!nocheck>,
 - python3-setuptools (>= 11.3),
 + python3-setuptools (>= 11.3~),
   python3-six (>= 1.4.1~),
+  python3-sphinx <!nodoc>,
+  python3-tz <!nocheck>,
  Standards-Version: 3.9.8
  Homepage: https://cryptography.io/
  Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-cryptography.git

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



More information about the Python-modules-commits mailing list