diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/patches/python-axolotl-AES-fix.patch | 24 | ||||
| -rw-r--r-- | gnu/packages/python-crypto.scm | 5 |
2 files changed, 27 insertions, 2 deletions
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 <https://bugs.gnu.org/29415>. + +Description: Removes IV paramenter from AES constructor, since it is not necessary for ctr mode. +Author: Josue Ortega <josue@debian.org> +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 |