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

[Tristan Seligmann]

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

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

commit b2418b8dfe929af407cfc34151edd31fe04a888a
Merge: 5d8eb39 90ba808
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Mar 5 05:23:41 2016 +0200

    merge patched into master

 CHANGELOG.rst                                       |  5 +++++
 PKG-INFO                                            |  2 +-
 debian/.git-dpm                                     |  6 +++---
 ...allocate-a-buffer-that-is-the-correct-size.patch |  2 +-
 setup.py                                            | 21 +++++++++++++++++++--
 src/_cffi_src/openssl/bio.py                        |  3 ++-
 src/cryptography.egg-info/PKG-INFO                  |  2 +-
 src/cryptography.egg-info/requires.txt              | 20 ++++++++++++++++++++
 src/cryptography/__about__.py                       |  2 +-
 tests/hypothesis/__init__.py                        |  4 ++++
 10 files changed, 57 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index df60235,0000000..0091b06
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
- e441791b8d152729ac02814168038a3c40b81a10
- e441791b8d152729ac02814168038a3c40b81a10
- 2d7ac6fb65c5431f9d9ed73b8ade27927fd6c278
++90ba808bdb4207d2cddee127814c21ae3567950a
++90ba808bdb4207d2cddee127814c21ae3567950a
++b64d1e2164939b61713ec45c406c57429ce381d3
 +b64d1e2164939b61713ec45c406c57429ce381d3
 +python-cryptography_1.2.3.orig.tar.gz
 +a8a8083e70875423bd72899ca99890b788189205
 +373165
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Actually-allocate-a-buffer-that-is-the-correct-size.patch
index ffeec46,0000000..6e62e21
mode 100644,000000..100644
--- a/debian/patches/0001-Actually-allocate-a-buffer-that-is-the-correct-size.patch
+++ b/debian/patches/0001-Actually-allocate-a-buffer-that-is-the-correct-size.patch
@@@ -1,27 -1,0 +1,27 @@@
- From e441791b8d152729ac02814168038a3c40b81a10 Mon Sep 17 00:00:00 2001
++From 90ba808bdb4207d2cddee127814c21ae3567950a Mon Sep 17 00:00:00 2001
 +From: Tristan Seligmann <mithrandi at mithrandi.net>
 +Date: Mon, 8 Feb 2016 15:12:48 +0200
 +Subject: Actually allocate a buffer that is the correct size.
 +
 +---
 + tests/hazmat/backends/test_openssl.py | 5 +++--
 + 1 file changed, 3 insertions(+), 2 deletions(-)
 +
 +diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
 +index e055568..0b55a48 100644
 +--- a/tests/hazmat/backends/test_openssl.py
 ++++ b/tests/hazmat/backends/test_openssl.py
 +@@ -611,10 +611,11 @@ class TestOpenSSLSerializationWithOpenSSL(object):
 + 
 +     def test_pem_password_cb(self):
 +         password = b'abcdefg'
 ++        buf_size = len(password) + 1
 +         ffi_cb, userdata = backend._pem_password_cb(password)
 +         handle = backend._ffi.new_handle(userdata)
 +-        buf = backend._ffi.new('char *')
 +-        assert ffi_cb(buf, len(password) + 1, False, handle) == len(password)
 ++        buf = backend._ffi.new('char[]', buf_size)
 ++        assert ffi_cb(buf, buf_size, False, handle) == len(password)
 +         assert userdata.called == 1
 +         assert backend._ffi.string(buf, len(password)) == password
 + 

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