From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHxlA-0003el-Rj for guix-patches@gnu.org; Thu, 23 Nov 2017 15:06:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eHxl6-0005dO-26 for guix-patches@gnu.org; Thu, 23 Nov 2017 15:06:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:45487) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eHxl5-0005cs-Ut for guix-patches@gnu.org; Thu, 23 Nov 2017 15:06:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eHxl5-0007tB-Hi for guix-patches@gnu.org; Thu, 23 Nov 2017 15:06:03 -0500 Subject: [bug#29415] [PATCH] gnu: python-axolotl: Update to 0.1.39 and fix build. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHxk1-0003WQ-RU for guix-patches@gnu.org; Thu, 23 Nov 2017 15:04:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eHxjx-00040M-4M for guix-patches@gnu.org; Thu, 23 Nov 2017 15:04:57 -0500 Received: from mail2.vany.ca ([142.54.190.254]:47176) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eHxjw-0003zO-Ur for guix-patches@gnu.org; Thu, 23 Nov 2017 15:04:53 -0500 Received: from adamvy-laptop (unknown [192.159.178.248]) by mail2.vany.ca (Postfix) with ESMTPSA id 4FAFCAC1EA0 for ; Thu, 23 Nov 2017 14:04:47 -0600 (CST) From: Adam Van Ymeren Date: Thu, 23 Nov 2017 15:04:46 -0500 Message-ID: <87y3mw3go1.fsf@vany.ca> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29415@debbugs.gnu.org Patch taken from the debian package for python-axolotl-0.1.39. python-axolotl has been failing since March, https://hydra.gnu.org/job/gnu/master/python-axolotl-0.1.35.x86_64-linux This also fixes the OMEMO and OTR plugins for Gajim work. --- ...olotl-removes-IV-parameter-at-AES-creation.patch | 21 +++++++++++++++++++++ gnu/packages/python-crypto.scm | 6 ++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-axolotl-removes-IV-parameter-at-AES-creation.patch diff --git a/gnu/packages/patches/python-axolotl-removes-IV-parameter-at-AES-creation.patch b/gnu/packages/patches/python-axolotl-removes-IV-parameter-at-AES-creation.patch new file mode 100644 index 000000000..b25806ca2 --- /dev/null +++ b/gnu/packages/patches/python-axolotl-removes-IV-parameter-at-AES-creation.patch @@ -0,0 +1,21 @@ +Description: Removes IV paramenter from AES constructor, since it is not necessary for ctr mode. +Author: Josue Ortega +Last-Update: 2017-04-13 + +--- a/axolotl/sessioncipher.py ++++ b/axolotl/sessioncipher.py +@@ -228,13 +228,7 @@ + # counterint = struct.unpack(">L", counterbytes)[0] + # counterint = int.from_bytes(counterbytes, byteorder='big') + ctr = Counter.new(128, initial_value=counter) +- +- # cipher = AES.new(key, AES.MODE_CTR, counter=ctr) +- ivBytes = bytearray(16) +- ByteUtil.intToByteArray(ivBytes, 0, counter) +- +- cipher = AES.new(key, AES.MODE_CTR, IV=bytes(ivBytes), counter=ctr) +- ++ cipher = AES.new(key, AES.MODE_CTR, counter=ctr) + return cipher + + diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 77409d86d..3ffa477fe 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -430,7 +430,7 @@ python-axolotl.") (define-public python-axolotl (package (name "python-axolotl") - (version "0.1.35") + (version "0.1.39") (source (origin (method url-fetch) @@ -438,8 +438,10 @@ python-axolotl.") "https://github.com/tgalal/python-axolotl/archive/" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) + (patches (search-patches + "python-axolotl-removes-IV-parameter-at-AES-creation.patch")) (sha256 - (base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8")))) + (base32 "0badsgkgz0ir3hqynxzsfjgacppi874syvvmgccc6j164053x6zm")))) (build-system python-build-system) (arguments `(#:phases -- 2.15.0