Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 757BF7A1AE for ; Wed, 8 Mar 2017 01:09:02 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 219A085799; Wed, 8 Mar 2017 01:09:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A6CE385790 for ; Wed, 8 Mar 2017 01:09:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id knMRJCiNh3TY for ; Wed, 8 Mar 2017 01:09:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E799084CEF for ; Wed, 8 Mar 2017 01:09:00 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DE8CAFBE4; Wed, 8 Mar 2017 01:09:00 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1488935340133820" MIME-Version: 1.0 Date: Wed, 8 Mar 2017 01:09:00 +0000 From: "Sevan Janiyan" Subject: CVS commit: pkgsrc/security/py-crypto To: pkgsrc-changes@NetBSD.org Reply-To: sevan@netbsd.org X-Mailer: log_accum Message-Id: <20170308010900.DE8CAFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1488935340133820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: sevan Date: Wed Mar 8 01:09:00 UTC 2017 Modified Files: pkgsrc/security/py-crypto: distinfo pkgsrc/security/py-crypto/patches: patch-lib_Crypto_SelfTest_Cipher_common.py Log Message: Tabs vs spaces! Unbreak with the Python 3 versions of the package. Heads up by Daniel Jakots. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/py-crypto/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/security/py-crypto/patches/patch-lib_Crypto_SelfTest_Cipher_common.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1488935340133820 Content-Disposition: inline Content-Length: 4890 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/py-crypto/distinfo diff -u pkgsrc/security/py-crypto/distinfo:1.12 pkgsrc/security/py-crypto/distinfo:1.13 --- pkgsrc/security/py-crypto/distinfo:1.12 Tue Mar 7 23:17:51 2017 +++ pkgsrc/security/py-crypto/distinfo Wed Mar 8 01:09:00 2017 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.12 2017/03/07 23:17:51 sevan Exp $ +$NetBSD: distinfo,v 1.13 2017/03/08 01:09:00 sevan Exp $ SHA1 (pycrypto-2.6.1.tar.gz) = aeda3ed41caf1766409d4efc689b9ca30ad6aeb2 RMD160 (pycrypto-2.6.1.tar.gz) = ac0db079e5e4be9daf739e094c10e96291dbc009 SHA512 (pycrypto-2.6.1.tar.gz) = 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847 Size (pycrypto-2.6.1.tar.gz) = 446240 bytes SHA1 (patch-ab) = 2c72b0e70fdebd2e62aff28284afd919e935de08 -SHA1 (patch-lib_Crypto_SelfTest_Cipher_common.py) = 4e4f3c0a705ceb8fbc922c5d44bd33fce347ac83 +SHA1 (patch-lib_Crypto_SelfTest_Cipher_common.py) = d505f84217614a5a0065addcebab46da15c204e7 SHA1 (patch-src_block_template.c) = 646bb15e41290922c417a2104e401c82379e97dd Index: pkgsrc/security/py-crypto/patches/patch-lib_Crypto_SelfTest_Cipher_common.py diff -u pkgsrc/security/py-crypto/patches/patch-lib_Crypto_SelfTest_Cipher_common.py:1.1 pkgsrc/security/py-crypto/patches/patch-lib_Crypto_SelfTest_Cipher_common.py:1.2 --- pkgsrc/security/py-crypto/patches/patch-lib_Crypto_SelfTest_Cipher_common.py:1.1 Tue Mar 7 23:17:51 2017 +++ pkgsrc/security/py-crypto/patches/patch-lib_Crypto_SelfTest_Cipher_common.py Wed Mar 8 01:09:00 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-lib_Crypto_SelfTest_Cipher_common.py,v 1.1 2017/03/07 23:17:51 sevan Exp $ +$NetBSD: patch-lib_Crypto_SelfTest_Cipher_common.py,v 1.2 2017/03/08 01:09:00 sevan Exp $ CVE-2013-7459 backport https://github.com/dlitz/pycrypto/commit/8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 @@ -11,25 +11,25 @@ https://github.com/dlitz/pycrypto/commit 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) ++ 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) ++ ## 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): ++ ## 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) - @@ -39,7 +39,7 @@ https://github.com/dlitz/pycrypto/commit - 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) ++ decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) decrypted_plaintext = decryption_cipher.decrypt(ciphertext) self.assertEqual(self.plaintext, decrypted_plaintext) --_----------=_1488935340133820--