[Python-modules-commits] [python-cryptography] 03/04: merge patched into master

Tristan Seligmann mithrandi at moszumanska.debian.org
Wed Apr 6 20:50:19 UTC 2016


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

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

commit 07c201cd401c5ff7bebe9ecd699dce83280595d8
Merge: 934d9cd 703d5a4
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Wed Apr 6 22:37:39 2016 +0200

    merge patched into master

 CHANGELOG.rst                                      |  26 +-
 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 ...llocate-a-buffer-that-is-the-correct-size.patch |  27 -
 debian/patches/series                              |   1 -
 docs/conf.py                                       | 104 +--
 docs/development/test-vectors.rst                  |  19 +-
 docs/faq.rst                                       |  28 +
 docs/hazmat/backends/interfaces.rst                |   4 +-
 docs/hazmat/primitives/asymmetric/ec.rst           |   2 +-
 docs/hazmat/primitives/asymmetric/rsa.rst          |   8 +-
 docs/hazmat/primitives/constant-time.rst           |   2 +-
 docs/hazmat/primitives/padding.rst                 |  45 ++
 docs/hazmat/primitives/symmetric-encryption.rst    |   5 +-
 docs/installation.rst                              |   6 +-
 docs/security.rst                                  |  37 +-
 docs/spelling_wordlist.txt                         |   1 +
 docs/x509/reference.rst                            |  88 +++
 docs/x509/tutorial.rst                             |  72 +-
 setup.py                                           |   2 +-
 src/_cffi_src/build_commoncrypto.py                |   2 +
 src/_cffi_src/build_openssl.py                     |  24 +-
 src/_cffi_src/commoncrypto/cf.py                   |  10 +
 .../{sectrust.py => seccertificate.py}             |   5 +-
 .../{openssl/conf.py => commoncrypto/secpolicy.py} |   7 +-
 src/_cffi_src/commoncrypto/sectrust.py             |  17 +
 src/_cffi_src/hazmat_src/padding.c                 |  24 +
 src/_cffi_src/hazmat_src/padding.h                 |   1 +
 src/_cffi_src/openssl/aes.py                       |  11 +-
 src/_cffi_src/openssl/asn1.py                      |  10 +-
 src/_cffi_src/openssl/bio.py                       |   3 -
 src/_cffi_src/openssl/cms.py                       |   5 -
 src/_cffi_src/openssl/crypto.py                    |  69 +-
 src/_cffi_src/openssl/dh.py                        |   1 -
 src/_cffi_src/openssl/dsa.py                       |   8 -
 src/_cffi_src/openssl/ec.py                        |  22 +-
 src/_cffi_src/openssl/ecdh.py                      |  14 -
 src/_cffi_src/openssl/ecdsa.py                     |  21 +-
 src/_cffi_src/openssl/engine.py                    |  35 +-
 src/_cffi_src/openssl/err.py                       |  12 +-
 src/_cffi_src/openssl/evp.py                       |  44 +-
 src/_cffi_src/openssl/hmac.py                      |  31 +-
 src/_cffi_src/openssl/ocsp.py                      |  67 ++
 src/_cffi_src/openssl/rand.py                      |   3 +-
 src/_cffi_src/openssl/ssl.py                       | 139 +++-
 src/_cffi_src/openssl/x509.py                      |  94 ++-
 src/_cffi_src/openssl/x509_vfy.py                  |   6 +-
 src/_cffi_src/openssl/x509name.py                  |  12 +-
 src/_cffi_src/openssl/x509v3.py                    |   9 +
 src/cryptography.egg-info/PKG-INFO                 |   2 +-
 src/cryptography.egg-info/SOURCES.txt              |  10 +-
 src/cryptography.egg-info/requires.txt             |   2 +-
 src/cryptography/__about__.py                      |   2 +-
 src/cryptography/fernet.py                         |   6 +-
 src/cryptography/hazmat/__init__.py                |   6 +
 src/cryptography/hazmat/backends/__init__.py       |   7 +-
 src/cryptography/hazmat/backends/multibackend.py   |   7 +
 .../hazmat/backends/openssl/backend.py             | 722 ++-----------------
 .../backends/openssl/{x509.py => decode_asn1.py}   | 453 +++---------
 .../hazmat/backends/openssl/encode_asn1.py         | 592 +++++++++++++++
 src/cryptography/hazmat/backends/openssl/hashes.py |  13 +-
 src/cryptography/hazmat/backends/openssl/hmac.py   |  13 +-
 src/cryptography/hazmat/backends/openssl/rsa.py    |   8 +-
 src/cryptography/hazmat/backends/openssl/x509.py   | 797 ++-------------------
 .../hazmat/bindings/openssl/_conditional.py        |  32 +-
 .../hazmat/bindings/openssl/binding.py             |  37 +-
 src/cryptography/hazmat/primitives/ciphers/base.py |   2 +-
 .../hazmat/primitives/ciphers/modes.py             |  21 +
 src/cryptography/hazmat/primitives/padding.py      | 172 +++--
 .../hazmat/primitives/serialization.py             |  14 +-
 src/cryptography/utils.py                          |  10 +-
 src/cryptography/x509/__init__.py                  |  18 +-
 src/cryptography/x509/base.py                      |   6 +
 src/cryptography/x509/extensions.py                |  70 ++
 src/cryptography/x509/name.py                      |   7 +-
 tests/doubles.py                                   |  43 ++
 tests/hazmat/backends/test_commoncrypto.py         |  13 +-
 tests/hazmat/backends/test_multibackend.py         |  20 +-
 tests/hazmat/backends/test_openssl.py              |  77 +-
 tests/hazmat/bindings/test_openssl.py              |  28 +-
 tests/hazmat/primitives/fixtures_rsa.py            |  72 ++
 tests/hazmat/primitives/test_3des.py               |   8 +-
 tests/hazmat/primitives/test_aes.py                |  12 +-
 tests/hazmat/primitives/test_arc4.py               |   2 +-
 tests/hazmat/primitives/test_block.py              |  50 +-
 tests/hazmat/primitives/test_blowfish.py           |   8 +-
 tests/hazmat/primitives/test_camellia.py           |   8 +-
 tests/hazmat/primitives/test_cast5.py              |  10 +-
 tests/hazmat/primitives/test_dsa.py                |  45 +-
 tests/hazmat/primitives/test_ec.py                 |  14 +-
 tests/hazmat/primitives/test_hashes.py             |  11 +-
 tests/hazmat/primitives/test_hmac.py               |  11 +-
 tests/hazmat/primitives/test_idea.py               |   8 +-
 tests/hazmat/primitives/test_keywrap.py            |  10 +-
 tests/hazmat/primitives/test_padding.py            |  92 +++
 tests/hazmat/primitives/test_pbkdf2hmac.py         |  13 +-
 tests/hazmat/primitives/test_rsa.py                | 103 ++-
 tests/hazmat/primitives/test_seed.py               |   8 +-
 tests/hazmat/primitives/test_x963_vectors.py       |  11 +-
 tests/hypothesis/test_padding.py                   |  32 +
 tests/test_fernet.py                               |  13 +-
 tests/test_warnings.py                             |  41 ++
 tests/test_x509.py                                 | 111 +++
 tests/test_x509_ext.py                             | 113 +++
 104 files changed, 2798 insertions(+), 2409 deletions(-)

diff --cc debian/.git-dpm
index 81c2249,0000000..dbac3fb
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
- 90ba808bdb4207d2cddee127814c21ae3567950a
- 90ba808bdb4207d2cddee127814c21ae3567950a
- b64d1e2164939b61713ec45c406c57429ce381d3
++703d5a499e941fa81dcd513ea04f21db2137f2fb
++703d5a499e941fa81dcd513ea04f21db2137f2fb
++703d5a499e941fa81dcd513ea04f21db2137f2fb
 +703d5a499e941fa81dcd513ea04f21db2137f2fb
 +python-cryptography_1.3.1.orig.tar.gz
 +ebcfdc46c9a169a49ab034c819eca8d8b07167c6
 +383852
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
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