From 76964454e0a54e9fc2bb67f29c89155ca2c05a96 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Fri, 20 Jan 2017 17:56:09 +0100 Subject: dev-python/pycrypto: Add patch for CVE-2013-7459 Gentoo-bug: 576494 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- .../files/pycrypto-2.6.1-CVE-2013-7459.patch | 88 ++++++++++++++++++++++ dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild | 75 ++++++++++++++++++ 2 files changed, 163 insertions(+) create mode 100644 dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch create mode 100644 dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild (limited to 'dev-python/pycrypto') diff --git a/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch b/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch new file mode 100644 index 000000000000..9850f0340510 --- /dev/null +++ b/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch @@ -0,0 +1,88 @@ +From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001 +From: Legrandin +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(-) + +diff --git a/lib/Crypto/SelfTest/Cipher/common.py b/lib/Crypto/SelfTest/Cipher/common.py +index 420b6ff..a5f8a88 100644 +--- a/lib/Crypto/SelfTest/Cipher/common.py ++++ b/lib/Crypto/SelfTest/Cipher/common.py +@@ -239,19 +239,34 @@ def shortDescription(self): + 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) +diff --git a/src/block_template.c b/src/block_template.c +index f940e0e..d555ceb 100644 +--- a/src/block_template.c ++++ b/src/block_template.c +@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, PyObject *kwdict) + "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 --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild new file mode 100644 index 000000000000..3b2a6263454c --- /dev/null +++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 flag-o-matic + +DESCRIPTION="Python Cryptography Toolkit" +HOMEPAGE="http://www.dlitz.net/software/pycrypto/ https://pypi.python.org/pypi/pycrypto" +SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz" + +LICENSE="PSF-2 public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" +IUSE="doc +gmp test" + +RDEPEND="gmp? ( dev-libs/gmp:0= )" +DEPEND="${RDEPEND} + doc? ( + dev-python/docutils[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/epydoc-3[${PYTHON_USEDEP}]' 'python2*') + )" + +REQUIRED_USE="test? ( gmp )" + +DOCS=( ACKS ChangeLog README TODO ) +PATCHES=( + "${FILESDIR}"/${P}-cross-compile.patch + "${FILESDIR}"/${P}-CVE-2013-7459.patch +) + +python_prepare_all() { + # Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3 + # https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a + sed \ + -e "/keyparts =/s/'ssh-rsa'/b('ssh-rsa')/" \ + -e "s/keystring = ''.join/keystring = b('').join/" \ + -e "s/return 'ssh-rsa '/return b('ssh-rsa ')/" \ + -i lib/Crypto/PublicKey/RSA.py || die + + distutils-r1_python_prepare_all +} + +python_configure_all() { + # the configure does not interact with python in any way, + # it just sets up the C header file. + econf \ + $(use_with gmp) \ + --without-mpir +} + +python_compile_all() { + if use doc; then + rst2html.py Doc/pycrypt.rst > Doc/index.html || die + epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die + HTML_DOCS=( Doc/apidoc/. Doc/index.html ) + fi +} + +python_compile() { + if ! python_is_python3; then + local -x CFLAGS="${CFLAGS}" + append-cflags -fno-strict-aliasing + fi + + distutils-r1_python_compile +} + +python_test() { + esetup.py test +} -- cgit v1.2.3-65-gdbad