From 51f887f33d08a805fa62c726c81904ce54a540ac Mon Sep 17 00:00:00 2001 From: Adam Van Ymeren Date: Thu, 23 Nov 2017 15:04:46 -0500 Subject: [PATCH] gnu: python-axolotl: Update to 0.1.39 and fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. * gnu/packages/patches/python-axolotl-AES-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python-crypto.scm (python-axolotl): Upgrade to 0.1.39. [source]: Use the patch. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + .../patches/python-axolotl-AES-fix.patch | 24 +++++++++++++++++++ gnu/packages/python-crypto.scm | 5 ++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-axolotl-AES-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6c46c4e5da..f9264231ed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1017,6 +1017,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3.5-fix-tests.patch \ %D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch \ + %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-dendropy-fix-tests.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \ diff --git a/gnu/packages/patches/python-axolotl-AES-fix.patch b/gnu/packages/patches/python-axolotl-AES-fix.patch new file mode 100644 index 0000000000..d34f4855cb --- /dev/null +++ b/gnu/packages/patches/python-axolotl-AES-fix.patch @@ -0,0 +1,24 @@ +Patch taken from the Debian package for python-axolotl-0.1.39. +See . + +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 7b0054cf8a..a9059efa5f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -450,7 +450,7 @@ python-axolotl.") (define-public python-axolotl (package (name "python-axolotl") - (version "0.1.35") + (version "0.1.39") (source (origin (method url-fetch) @@ -458,8 +458,9 @@ 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-AES-fix.patch")) (sha256 - (base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8")))) + (base32 "0badsgkgz0ir3hqynxzsfjgacppi874syvvmgccc6j164053x6zm")))) (build-system python-build-system) (arguments `(#:phases