[arch-commits] Commit in python-axolotl/trunk (2 files)

[Levente Polyak]

    Date: Saturday, April 7, 2018 @ 16:01:08
  Author: anthraxx
Revision: 314868

upgpkg: python-axolotl 0.1.42-1

Modified:
  python-axolotl/trunk/PKGBUILD
Deleted:
  python-axolotl/trunk/python-axolotl-don-t-pass-IV-in-CTR-mode.patch

------------------------------------------------+
 PKGBUILD                                       |   32 ++++++++++-------------
 python-axolotl-don-t-pass-IV-in-CTR-mode.patch |   30 ---------------------
 2 files changed, 15 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-07 15:32:38 UTC (rev 314867)
+++ PKGBUILD	2018-04-07 16:01:08 UTC (rev 314868)
@@ -6,31 +6,29 @@
 
 pkgbase=python-axolotl
 pkgname=('python-axolotl' 'python2-axolotl')
-pkgver=0.1.39
-pkgrel=2
+pkgver=0.1.42
+pkgrel=1
 pkgdesc='Python port of libaxolotl'
 url='https://github.com/tgalal/python-axolotl'
 arch=('any')
 license=('GPL3')
-makedepends=('python-setuptools' 'python-protobuf' 'python-crypto' 'python-axolotl-curve25519'
-             'python2-setuptools' 'python2-protobuf' 'python2-crypto' 'python2-axolotl-curve25519')
+makedepends=('python-setuptools' 'python-protobuf' 'python-cryptography' 'python-axolotl-curve25519'
+             'python2-setuptools' 'python2-protobuf' 'python2-cryptography' 'python2-axolotl-curve25519')
 checkdepends=('python-pytest' 'python2-pytest')
-source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/tgalal/python-axolotl/archive/${pkgver}.tar.gz
-        python-axolotl-don-t-pass-IV-in-CTR-mode.patch)
-sha256sums=('f59b3e0a202648c3187b756fafc941f15ea69e74fa77eb311c3982ffe6d34d2d'
-            '4289d3c07593c2c4241898b179dbcd040b52adea7ff824cb28e459803d84f628')
-sha512sums=('b117c7f5417c624b020ba8f488b9f61d3ce359a3e3132cb98e637a40ae6c2ebb52d55d62a40736340c6352e0249d349b3555e8e7a52479c2d77ad4907ea211ae'
-            '0c6f631404e9057e521ed8219463a8ed0ca018b68945f579b1b8d8f1ea3b0afb407830f83fa39d54d3fbc628542190b24fb48f33eacb7eac6b3307caa593bb7a')
+source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/tgalal/python-axolotl/archive/${pkgver}.tar.gz)
+sha256sums=('26a3c43769affe9bfdf82b783684ee62fef1a2c080bdb94ed186a360bdbb50b6')
+sha512sums=('db9e1cfab87d690619a672b1782942a18b12b17af555959c17bcc3e2581e9c689c57becc0ea884a1129df9dace17684ba03de38b81f8c8c65cab27962ebdb6c5')
 
 prepare() {
-  patch -d ${pkgbase}-${pkgver} -p1 < "${srcdir}/python-axolotl-don-t-pass-IV-in-CTR-mode.patch"
   cp -a ${pkgbase}-${pkgver}{,-py2}
 }
 
 build() {
+  msg2 'Building python...'
   (cd ${pkgbase}-${pkgver}
     python setup.py build
   )
+  msg2 'Building python2...'
   (cd ${pkgbase}-${pkgver}-py2
     python2 setup.py build
   )
@@ -37,9 +35,11 @@
 }
 
 check() {
+  msg2 'Testing python...'
   (cd ${pkgbase}-${pkgver}
     py.test
   )
+  msg2 'Testing python2...'
   (cd ${pkgbase}-${pkgver}-py2
     py.test2
   )
@@ -46,16 +46,14 @@
 }
 
 package_python-axolotl() {
-  depends=('python-protobuf' 'python-crypto' 'python-axolotl-curve25519')
-
-  cd "${pkgbase}-${pkgver}"
+  depends=('python-protobuf' 'python-cryptography' 'python-axolotl-curve25519')
+  cd ${pkgbase}-${pkgver}
   python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }
 
 package_python2-axolotl() {
-  depends=('python2-protobuf' 'python2-crypto' 'python2-axolotl-curve25519')
-
-  cd "${pkgbase}-${pkgver}-py2"
+  depends=('python2-protobuf' 'python2-cryptography' 'python2-axolotl-curve25519')
+  cd ${pkgbase}-${pkgver}-py2
   python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }
 

Deleted: python-axolotl-don-t-pass-IV-in-CTR-mode.patch
===================================================================
--- python-axolotl-don-t-pass-IV-in-CTR-mode.patch	2018-04-07 15:32:38 UTC (rev 314867)
+++ python-axolotl-don-t-pass-IV-in-CTR-mode.patch	2018-04-07 16:01:08 UTC (rev 314868)
@@ -1,30 +0,0 @@
-From bd4938bd943bc3810dc95ef7ced92674bcfe9797 Mon Sep 17 00:00:00 2001
-From: anthraxx <levente at leventepolyak.net>
-Date: Tue, 12 Sep 2017 19:45:51 +0200
-Subject: [PATCH] don't pass IV in pycrypto CTR mode as counter must be
- exclusive
-
----
- axolotl/sessioncipher.py | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/axolotl/sessioncipher.py b/axolotl/sessioncipher.py
-index 3b80ccb..6f41cea 100644
---- a/axolotl/sessioncipher.py
-+++ b/axolotl/sessioncipher.py
-@@ -229,11 +229,7 @@ class SessionCipher:
-         # 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
- 
--- 
-2.14.1
-