[Python-modules-commits] [python-cryptography] 03/06: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Tue Jun 20 19:32:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to branch master
in repository python-cryptography.
commit 951e89c87e6545c2599ac21a88b8a509a99dface
Merge: 2fda0ce 4005c5b
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Tue Jun 20 19:30:52 2017 +0200
merge patched into master
AUTHORS.rst | 1 +
CHANGELOG.rst | 127 +++-
PKG-INFO | 13 +-
README.rst | 10 +-
debian/.git-dpm | 6 +-
.../0001-add-memory-limit-check-for-scrypt.patch | 78 ---
.../0002-fix-compilation-on-1.1.0f-3603.patch | 33 --
debian/patches/series | 2 -
docs/api-stability.rst | 4 +
docs/community.rst | 3 +-
docs/conf.py | 7 +-
docs/cryptography-docs.py | 21 +-
docs/development/c-bindings.rst | 11 +-
docs/development/getting-started.rst | 26 +-
docs/development/submitting-patches.rst | 2 +-
docs/development/test-vectors.rst | 41 +-
docs/doing-a-release.rst | 20 +-
docs/faq.rst | 63 +-
docs/fernet.rst | 12 +-
docs/hazmat/backends/commoncrypto.rst | 30 -
docs/hazmat/backends/index.rst | 10 +-
docs/hazmat/backends/interfaces.rst | 23 +-
docs/hazmat/backends/multibackend.rst | 45 --
docs/hazmat/backends/openssl.rst | 18 +-
docs/hazmat/bindings/commoncrypto.rst | 30 -
docs/hazmat/bindings/index.rst | 1 -
docs/hazmat/bindings/openssl.rst | 2 +-
docs/hazmat/primitives/asymmetric/dh.rst | 97 ++-
docs/hazmat/primitives/asymmetric/ec.rst | 65 ++-
docs/hazmat/primitives/asymmetric/index.rst | 3 -
.../hazmat/primitives/asymmetric/serialization.rst | 11 +-
docs/hazmat/primitives/cryptographic-hashes.rst | 43 +-
docs/hazmat/primitives/index.rst | 11 +-
docs/hazmat/primitives/interfaces.rst | 80 ---
.../hazmat/primitives/key-derivation-functions.rst | 11 +-
docs/hazmat/primitives/mac/cmac.rst | 4 +-
docs/hazmat/primitives/mac/hmac.rst | 4 +-
docs/hazmat/primitives/mac/index.rst | 32 +
docs/hazmat/primitives/padding.rst | 4 +-
docs/hazmat/primitives/symmetric-encryption.rst | 105 +++-
docs/index.rst | 70 +--
docs/installation.rst | 80 +--
docs/security.rst | 6 +-
docs/spelling_wordlist.txt | 2 +
docs/x509/certificate-transparency.rst | 79 +++
docs/x509/index.rst | 1 +
docs/x509/reference.rst | 35 +-
docs/x509/tutorial.rst | 21 +-
setup.cfg | 1 -
setup.py | 29 +-
src/_cffi_src/build_commoncrypto.py | 33 --
src/_cffi_src/build_openssl.py | 27 +-
src/_cffi_src/commoncrypto/__init__.py | 5 -
src/_cffi_src/commoncrypto/cf.py | 113 ----
src/_cffi_src/commoncrypto/common_cryptor.py | 99 ----
src/_cffi_src/commoncrypto/common_digest.py | 58 --
src/_cffi_src/commoncrypto/common_hmac.py | 37 --
.../commoncrypto/common_key_derivation.py | 39 --
.../commoncrypto/common_symmetric_key_wrap.py | 35 --
src/_cffi_src/commoncrypto/seccertificate.py | 23 -
src/_cffi_src/commoncrypto/secimport.py | 86 ---
src/_cffi_src/commoncrypto/secitem.py | 27 -
src/_cffi_src/commoncrypto/seckey.py | 24 -
src/_cffi_src/commoncrypto/seckeychain.py | 25 -
src/_cffi_src/commoncrypto/sectransform.py | 68 ---
src/_cffi_src/commoncrypto/sectrust.py | 39 --
src/_cffi_src/commoncrypto/secure_transport.py | 308 ----------
src/_cffi_src/openssl/aes.py | 15 -
src/_cffi_src/openssl/asn1.py | 2 +
src/_cffi_src/openssl/bio.py | 2 +-
src/_cffi_src/openssl/callbacks.py | 69 +--
src/_cffi_src/openssl/cmac.py | 14 +-
src/_cffi_src/openssl/crypto.py | 48 +-
src/_cffi_src/openssl/cryptography.py | 51 +-
src/_cffi_src/openssl/ct.py | 96 +++
src/_cffi_src/openssl/dh.py | 135 ++++-
src/_cffi_src/openssl/dsa.py | 2 +-
src/_cffi_src/openssl/ec.py | 169 +-----
src/_cffi_src/openssl/ecdh.py | 11 -
src/_cffi_src/openssl/ecdsa.py | 32 -
src/_cffi_src/openssl/engine.py | 2 +-
src/_cffi_src/openssl/err.py | 8 +-
src/_cffi_src/openssl/evp.py | 25 +-
src/_cffi_src/openssl/hmac.py | 4 +-
src/_cffi_src/openssl/nid.py | 9 +
src/_cffi_src/openssl/osrandom_engine.py | 2 -
src/_cffi_src/openssl/pem.py | 9 +-
src/_cffi_src/openssl/rand.py | 2 +-
src/_cffi_src/openssl/rsa.py | 9 +-
src/_cffi_src/openssl/src/osrandom_engine.c | 8 +-
src/_cffi_src/openssl/src/osrandom_engine.h | 8 +-
src/_cffi_src/openssl/ssl.py | 175 ++----
src/_cffi_src/openssl/x509.py | 20 +-
src/_cffi_src/openssl/x509_vfy.py | 51 +-
src/_cffi_src/openssl/x509name.py | 2 +-
src/_cffi_src/openssl/x509v3.py | 8 +
src/_cffi_src/utils.py | 2 +-
src/cryptography.egg-info/PKG-INFO | 13 +-
src/cryptography.egg-info/SOURCES.txt | 41 +-
src/cryptography.egg-info/entry_points.txt | 1 -
src/cryptography.egg-info/requires.txt | 12 +-
src/cryptography/__about__.py | 4 +-
src/cryptography/__init__.py | 6 +
src/cryptography/hazmat/backends/__init__.py | 59 +-
.../hazmat/backends/commoncrypto/__init__.py | 10 -
.../hazmat/backends/commoncrypto/backend.py | 250 --------
.../hazmat/backends/commoncrypto/ciphers.py | 193 ------
.../hazmat/backends/commoncrypto/hashes.py | 55 --
.../hazmat/backends/commoncrypto/hmac.py | 59 --
src/cryptography/hazmat/backends/interfaces.py | 9 +-
src/cryptography/hazmat/backends/multibackend.py | 505 ----------------
.../hazmat/backends/openssl/backend.py | 412 +++++--------
.../hazmat/backends/openssl/ciphers.py | 102 ++--
src/cryptography/hazmat/backends/openssl/cmac.py | 4 +-
.../hazmat/backends/openssl/decode_asn1.py | 43 +-
src/cryptography/hazmat/backends/openssl/dh.py | 126 +++-
src/cryptography/hazmat/backends/openssl/dsa.py | 28 +-
src/cryptography/hazmat/backends/openssl/ec.py | 56 +-
.../hazmat/backends/openssl/encode_asn1.py | 7 +-
src/cryptography/hazmat/backends/openssl/hmac.py | 4 +-
src/cryptography/hazmat/backends/openssl/rsa.py | 47 +-
src/cryptography/hazmat/backends/openssl/utils.py | 21 -
src/cryptography/hazmat/backends/openssl/x509.py | 2 +-
.../hazmat/bindings/commoncrypto/__init__.py | 5 -
.../hazmat/bindings/commoncrypto/binding.py | 15 -
.../hazmat/bindings/openssl/_conditional.py | 210 +------
.../hazmat/bindings/openssl/binding.py | 67 +--
.../hazmat/primitives/asymmetric/dh.py | 25 +-
.../hazmat/primitives/asymmetric/ec.py | 14 +-
.../hazmat/primitives/asymmetric/rsa.py | 6 +-
.../hazmat/primitives/asymmetric/utils.py | 35 +-
.../hazmat/primitives/ciphers/__init__.py | 5 +-
src/cryptography/hazmat/primitives/ciphers/base.py | 46 +-
.../hazmat/primitives/ciphers/modes.py | 22 +-
src/cryptography/hazmat/primitives/cmac.py | 4 +-
src/cryptography/hazmat/primitives/hashes.py | 16 +
src/cryptography/hazmat/primitives/hmac.py | 4 +-
src/cryptography/hazmat/primitives/interfaces.py | 17 +
src/cryptography/hazmat/primitives/kdf/scrypt.py | 7 +
.../primitives/{interfaces/__init__.py => mac.py} | 0
src/cryptography/utils.py | 33 +-
src/cryptography/x509/__init__.py | 9 +
src/cryptography/x509/certificate_transparency.py | 46 ++
src/cryptography/x509/extensions.py | 40 +-
src/cryptography/x509/oid.py | 3 +
tests/conftest.py | 19 +-
tests/hazmat/backends/test_backendinit.py | 17 -
tests/hazmat/backends/test_commoncrypto.py | 54 --
tests/hazmat/backends/test_multibackend.py | 648 ---------------------
tests/hazmat/backends/test_openssl.py | 309 ++++------
tests/hazmat/backends/test_openssl_memleak.py | 191 ++++++
tests/hazmat/bindings/test_commoncrypto.py | 26 -
tests/hazmat/bindings/test_openssl.py | 47 +-
tests/hazmat/primitives/test_aes.py | 102 ++++
tests/hazmat/primitives/test_asym_utils.py | 3 +-
tests/hazmat/primitives/test_block.py | 13 +
tests/hazmat/primitives/test_cast5.py | 17 -
tests/hazmat/primitives/test_ciphers.py | 128 +++-
tests/hazmat/primitives/test_cmac.py | 15 +-
tests/hazmat/primitives/test_dh.py | 404 ++++++++++++-
tests/hazmat/primitives/test_ec.py | 11 +-
tests/hazmat/primitives/test_hashes.py | 11 -
tests/hazmat/primitives/test_hmac.py | 11 -
.../hazmat/primitives/test_mac.py | 20 +-
tests/hazmat/primitives/test_scrypt.py | 8 +-
tests/hazmat/primitives/test_serialization.py | 43 +-
tests/hazmat/primitives/utils.py | 7 +-
tests/test_utils.py | 45 +-
tests/test_x509.py | 68 +--
tests/test_x509_crlbuilder.py | 4 -
tests/test_x509_ext.py | 40 +-
tests/utils.py | 17 -
172 files changed, 3021 insertions(+), 5424 deletions(-)
diff --cc debian/.git-dpm
index 8e9e4b8,0000000..009155e
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
- 6fee9abaaa16550faaacf10e51053f36614a804b
- 6fee9abaaa16550faaacf10e51053f36614a804b
- 55816224b8c57c07982677ad261a11520141b97e
++4005c5bde2c5ec956629b7285630724490902d0e
++4005c5bde2c5ec956629b7285630724490902d0e
++4005c5bde2c5ec956629b7285630724490902d0e
+4005c5bde2c5ec956629b7285630724490902d0e
+python-cryptography_1.9.orig.tar.gz
+a997853b98d454e4b9bc404390ce576fb5c2aeed
+409664
+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