[Python-modules-commits] [python-cryptography] 02/03: 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 4e613cc8cea3029e9f1c66ab567cbbca11366dd4
Merge: ff21b50 e441791
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Feb 8 20:06:07 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...llocate-a-buffer-that-is-the-correct-size.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/hazmat/backends/test_openssl.py              |  5 ++--
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index c1c9b4e,0000000..fa6c495
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
- 2d7ac6fb65c5431f9d9ed73b8ade27927fd6c278
- 2d7ac6fb65c5431f9d9ed73b8ade27927fd6c278
++e441791b8d152729ac02814168038a3c40b81a10
++e441791b8d152729ac02814168038a3c40b81a10
 +2d7ac6fb65c5431f9d9ed73b8ade27927fd6c278
 +2d7ac6fb65c5431f9d9ed73b8ade27927fd6c278
 +python-cryptography_1.2.2.orig.tar.gz
 +16088fb22c2ea4cd445bcfca6a6bbb99b79dc285
 +372894
 +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 0000000,0000000..ffeec46
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Actually-allocate-a-buffer-that-is-the-correct-size.patch
@@@ -1,0 -1,0 +1,27 @@@
++From e441791b8d152729ac02814168038a3c40b81a10 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
++ 
diff --cc debian/patches/series
index 0000000,0000000..29d9539
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Actually-allocate-a-buffer-that-is-the-correct-size.patch

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