Hi
Proposed debdiff attached.
Regards,
Salvatore
diff -Nru python-crypto-2.6.1/debian/changelog
python-crypto-2.6.1/debian/changelog
--- python-crypto-2.6.1/debian/changelog 2015-12-06 15:03:16.000000000
+0100
+++ python-crypto-2.6.1/debian/changelog 2016-12-28 06:21:20.000000000
+0100
@@ -1,3 +1,11 @@
+python-crypto (2.6.1-6.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Throw exception when IV is used with ECB or CTR (CVE-2013-7459)
+ (Closes: #849495)
+
+ -- Salvatore Bonaccorso <car...@debian.org> Wed, 28 Dec 2016 06:21:20 +0100
+
python-crypto (2.6.1-6) unstable; urgency=medium
* debian/control:
diff -Nru python-crypto-2.6.1/debian/patches/CVE-2013-7459.patch
python-crypto-2.6.1/debian/patches/CVE-2013-7459.patch
--- python-crypto-2.6.1/debian/patches/CVE-2013-7459.patch 1970-01-01
01:00:00.000000000 +0100
+++ python-crypto-2.6.1/debian/patches/CVE-2013-7459.patch 2016-12-28
06:21:20.000000000 +0100
@@ -0,0 +1,84 @@
+From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001
+From: Legrandin <helder...@gmail.com>
+Date: Sun, 22 Dec 2013 22:24:46 +0100
+Subject: [PATCH] Throw exception when IV is used with ECB or CTR
+
+The IV parameter is currently ignored when initializing
+a cipher in ECB or CTR mode.
+
+For CTR mode, it is confusing: it takes some time to see
+that a different parameter is needed (the counter).
+
+For ECB mode, it is outright dangerous.
+
+This patch forces an exception to be raised.
+---
+ lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++--------
+ src/block_template.c | 11 +++++++++++
+ 2 files changed, 34 insertions(+), 8 deletions(-)
+
+--- a/lib/Crypto/SelfTest/Cipher/common.py
++++ b/lib/Crypto/SelfTest/Cipher/common.py
+@@ -239,19 +239,34 @@ class RoundtripTest(unittest.TestCase):
+ return """%s .decrypt() output of .encrypt() should not be garbled"""
% (self.module_name,)
+
+ def runTest(self):
+- for mode in (self.module.MODE_ECB, self.module.MODE_CBC,
self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP):
++
++ ## ECB mode
++ mode = self.module.MODE_ECB
++ encryption_cipher = self.module.new(a2b_hex(self.key), mode)
++ ciphertext = encryption_cipher.encrypt(self.plaintext)
++ decryption_cipher = self.module.new(a2b_hex(self.key), mode)
++ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
++ self.assertEqual(self.plaintext, decrypted_plaintext)
++
++ ## OPENPGP mode
++ mode = self.module.MODE_OPENPGP
++ encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
++ eiv_ciphertext = encryption_cipher.encrypt(self.plaintext)
++ eiv = eiv_ciphertext[:self.module.block_size+2]
++ ciphertext = eiv_ciphertext[self.module.block_size+2:]
++ decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
++ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
++ self.assertEqual(self.plaintext, decrypted_plaintext)
++
++ ## All other non-AEAD modes (but CTR)
++ for mode in (self.module.MODE_CBC, self.module.MODE_CFB,
self.module.MODE_OFB):
+ encryption_cipher = self.module.new(a2b_hex(self.key), mode,
self.iv)
+ ciphertext = encryption_cipher.encrypt(self.plaintext)
+-
+- if mode != self.module.MODE_OPENPGP:
+- decryption_cipher = self.module.new(a2b_hex(self.key), mode,
self.iv)
+- else:
+- eiv = ciphertext[:self.module.block_size+2]
+- ciphertext = ciphertext[self.module.block_size+2:]
+- decryption_cipher = self.module.new(a2b_hex(self.key), mode,
eiv)
++ decryption_cipher = self.module.new(a2b_hex(self.key), mode,
self.iv)
+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
+ self.assertEqual(self.plaintext, decrypted_plaintext)
+
++
+ class PGPTest(unittest.TestCase):
+ def __init__(self, module, params):
+ unittest.TestCase.__init__(self)
+--- a/src/block_template.c
++++ b/src/block_template.c
+@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, P
+ "Key cannot be the null string");
+ return NULL;
+ }
++ if (IVlen != 0 && mode == MODE_ECB)
++ {
++ PyErr_Format(PyExc_ValueError, "ECB mode does not use IV");
++ return NULL;
++ }
++ if (IVlen != 0 && mode == MODE_CTR)
++ {
++ PyErr_Format(PyExc_ValueError,
++ "CTR mode needs counter parameter, not IV");
++ return NULL;
++ }
+ if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR)
+ {
+ PyErr_Format(PyExc_ValueError,
diff -Nru python-crypto-2.6.1/debian/patches/series
python-crypto-2.6.1/debian/patches/series
--- python-crypto-2.6.1/debian/patches/series 2015-12-06 14:31:55.000000000
+0100
+++ python-crypto-2.6.1/debian/patches/series 2016-12-28 06:21:20.000000000
+0100
@@ -9,3 +9,4 @@
unittest-stream.patch
deprecated-test-methods.patch
asn1-decoding.patch
+CVE-2013-7459.patch
