[Python-modules-commits] [python-asyncssh] 09/09: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository python-asyncssh.

commit 04f207fe034c3af4f9384951eedbfc57258bb49c
Merge: 6c7813d 942c19c
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Oct 31 23:47:55 2015 +0100

    merge patched into master

 debian/.git-dpm                                  |  4 ++--
 debian/patches/do-not-test-chacha20-cipher.patch | 17 +++++++++++++++--
 tests/test_cipher.py                             |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 3a9f258,0000000..fd96162
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
- 3a3386304535a71291f4f0b7c4f73b68c8bb9c2e
- 3a3386304535a71291f4f0b7c4f73b68c8bb9c2e
++942c19c5bd0357654715092a2b271f005f48a40c
++942c19c5bd0357654715092a2b271f005f48a40c
 +142bd9768421394f9f6880fb63c8de0932182c5b
 +142bd9768421394f9f6880fb63c8de0932182c5b
 +python-asyncssh_1.3.0.orig.tar.gz
 +a29e90c15f00bc5ac5c68dadc7dc295fa7e68e7a
 +166641
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/do-not-test-chacha20-cipher.patch
index b1b29c5,0000000..334ae83
mode 100644,000000..100644
--- a/debian/patches/do-not-test-chacha20-cipher.patch
+++ b/debian/patches/do-not-test-chacha20-cipher.patch
@@@ -1,29 -1,0 +1,42 @@@
- From 3a3386304535a71291f4f0b7c4f73b68c8bb9c2e Mon Sep 17 00:00:00 2001
++From 942c19c5bd0357654715092a2b271f005f48a40c Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <vincent at bernat.im>
 +Date: Sat, 31 Oct 2015 23:28:40 +0100
 +Subject: Don't run chacha20 tests as OpenSSL doesn't support this cipher.
 +
 +Forwarded: not-needed
 +
 +OpenSSL as shipped in Debian doesn't support the Chacha20-Poly1305
 +cipher. This cipher will be introduced in OpenSSL 1.1.0.
 +
 +Patch-Name: do-not-test-chacha20-cipher.patch
 +---
++ tests/test_cipher.py     | 1 +
 + tests/test_public_key.py | 3 +--
-  1 file changed, 1 insertion(+), 2 deletions(-)
++ 2 files changed, 2 insertions(+), 2 deletions(-)
 +
++diff --git a/tests/test_cipher.py b/tests/test_cipher.py
++index c6c90b7a0d1f..85ce2058fccb 100644
++--- a/tests/test_cipher.py
+++++ b/tests/test_cipher.py
++@@ -79,6 +79,7 @@ class _TestCipher(unittest.TestCase):
++                 self.assertEqual(hdr, dechdr)
++                 self.assertEqual(data, decdata)
++ 
+++    @unittest.skip("not supported in Debian")
++     def test_chacha_errors(self):
++         """Unit test error code paths in chacha cipher"""
++ 
 +diff --git a/tests/test_public_key.py b/tests/test_public_key.py
 +index 8cd8c13ed305..6a370c75af7c 100644
 +--- a/tests/test_public_key.py
 ++++ b/tests/test_public_key.py
 +@@ -102,8 +102,7 @@ if run('ssh -V') >= b'OpenSSH_6.9': # pragma: no branch
 +     # GCM & Chacha tests require OpenSSH 6.9 due to a bug in earlier versions:
 +     #     https://bugzilla.mindrot.org/show_bug.cgi?id=2366
 +     openssh_ciphers = openssh_ciphers + ('aes128-gcm at openssh.com',
 +-                                         'aes256-gcm at openssh.com',
 +-                                         'chacha20-poly1305 at openssh.com')
 ++                                         'aes256-gcm at openssh.com')
 + 
 + 
 + class _TestPublicKey(TempDirTestCase):

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