[Python-modules-commits] [python-cryptography] 02/03: Refresh patch.

[Tristan Seligmann]

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

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

commit 566ca26f3b3e3725387291f86162bdda3863fa45
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sun Jan 1 22:25:25 2017 +0200

    Refresh patch.
---
 debian/patches/3215.patch | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/debian/patches/3215.patch b/debian/patches/3215.patch
index 98a2de5..49d2df4 100644
--- a/debian/patches/3215.patch
+++ b/debian/patches/3215.patch
@@ -3,16 +3,11 @@ From: Alex Gaynor <alex.gaynor at gmail.com>
 Date: Sat, 5 Nov 2016 21:18:15 -0400
 Subject: [PATCH] Fixes #3211 -- fixed hkdf's output with short length
 
----
- src/cryptography/hazmat/primitives/kdf/hkdf.py |  2 +-
- tests/hazmat/primitives/test_hkdf.py           | 11 +++++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/cryptography/hazmat/primitives/kdf/hkdf.py b/src/cryptography/hazmat/primitives/kdf/hkdf.py
-index f738bbd..82ed9b1 100644
---- a/src/cryptography/hazmat/primitives/kdf/hkdf.py
-+++ b/src/cryptography/hazmat/primitives/kdf/hkdf.py
-@@ -91,7 +91,7 @@ def _expand(self, key_material):
+Index: python-cryptography/cryptography/hazmat/primitives/kdf/hkdf.py
+===================================================================
+--- python-cryptography.orig/cryptography/hazmat/primitives/kdf/hkdf.py	2017-01-01 22:24:27.090828930 +0200
++++ python-cryptography/cryptography/hazmat/primitives/kdf/hkdf.py	2017-01-01 22:24:27.086828861 +0200
+@@ -99,7 +99,7 @@
          output = [b""]
          counter = 1
  
@@ -21,13 +16,13 @@ index f738bbd..82ed9b1 100644
              h = hmac.HMAC(key_material, self._algorithm, backend=self._backend)
              h.update(output[-1])
              h.update(self._info)
-diff --git a/tests/hazmat/primitives/test_hkdf.py b/tests/hazmat/primitives/test_hkdf.py
-index e33529c..a05fd75 100644
---- a/tests/hazmat/primitives/test_hkdf.py
-+++ b/tests/hazmat/primitives/test_hkdf.py
-@@ -142,6 +142,17 @@ def test_unicode_typeerror(self, backend):
+Index: python-cryptography/tests/hazmat/primitives/test_hkdf.py
+===================================================================
+--- python-cryptography.orig/tests/hazmat/primitives/test_hkdf.py	2017-01-01 22:24:27.090828930 +0200
++++ python-cryptography/tests/hazmat/primitives/test_hkdf.py	2017-01-01 22:24:27.086828861 +0200
+@@ -152,6 +152,17 @@
  
-             hkdf.verify(b"foo", u"bar")
+             hkdf.verify(b"foo", six.u("bar"))
  
 +    def test_derive_short_output(self, backend):
 +        hkdf = HKDF(
@@ -41,5 +36,5 @@ index e33529c..a05fd75 100644
 +        assert hkdf.derive(b"\x01" * 16) == b"gJ\xfb{"
 +
  
- @pytest.mark.requires_backend_interface(interface=HMACBackend)
+ @pytest.mark.hmac
  class TestHKDFExpand(object):

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