[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/
commit: 203e79d928d23676a00e8253d18058a7afd954a1
Author: Michał Górny gentoo org>
AuthorDate: Mon Jan 29 10:17:28 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jan 29 10:24:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203e79d9
dev-python/pycryptodome: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/pycryptodome/Manifest | 1 -
.../pycryptodome-3.19.1-gcc14-configure.patch | 73 --
.../pycryptodome/pycryptodome-3.19.1-r2.ebuild | 61 --
3 files changed, 135 deletions(-)
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index adb8f8df01c8..49c39d87d206 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.19.1.gh.tar.gz 17158420 BLAKE2B
2180bb37e2295f0499c6d00237207513ad6c186ff8fd8fac466cc43efa9b068cf8a272b5ae30da08d37db88d354d41c0b426643743251ea8460abb6ff627e3be
SHA512
103910b385578732e356145247d3c1a4a3b0fe8acf22ce91f1c1155500cce2342e5caa0dff0a30825b11d7a614853c2dcb8657628f4d65682f6e543adb4db240
DIST pycryptodome-3.20.0.gh.tar.gz 17173888 BLAKE2B
7706a7f512579b4edf080b5074a9f226b2f0ef18a8f1faf74e890cfccff85d0599b4883cd5011a5cc0296b5a10e94cb2b948de29d785f6add04e54215a5a
SHA512
0d65ccd93f9f78548c04aa3af01cb65b6a39e81bb3dfa4bb08acc5a5a731b17f9c5b07a1d1780739b3f358402a3596b04e446fc7b39345a4c6f03fd5a2de7ff9
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch
b/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch
deleted file mode 100644
index f2d24f9cf696..
--- a/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://github.com/Legrandin/pycryptodome/issues/787
-https://github.com/Legrandin/pycryptodome/commit/b4083688fde0580de6c2a4d36d84da31a2549a2c
-https://github.com/Legrandin/pycryptodome/commit/3f6a86e072ef0e650f04eebf086940e6d8b33c03
-
-From b4083688fde0580de6c2a4d36d84da31a2549a2c Mon Sep 17 00:00:00 2001
-From: Helder Eijs
-Date: Fri, 29 Dec 2023 14:36:19 +0100
-Subject: [PATCH] Better autodetect of AES support, in case of aggressive
- optimization
-
a/compiler_opt.py
-+++ b/compiler_opt.py
-@@ -140,7 +140,7 @@ def compiler_has_intrin_h():
- {
- int a, b[4];
- __cpuid(b, a);
--return 0;
-+return a;
- }
- """
- return test_compilation(source, msg="intrin.h header")
-@@ -154,7 +154,7 @@ def compiler_has_cpuid_h():
- {
- unsigned int eax, ebx, ecx, edx;
- __get_cpuid(1, , , , );
--return 0;
-+return eax;
- }
- """
- return test_compilation(source, msg="cpuid.h header")
-@@ -163,11 +163,16 @@ def compiler_has_cpuid_h():
- def compiler_supports_aesni():
- source = """
- #include
-+#include
- __m128i f(__m128i x, __m128i y) {
- return _mm_aesenc_si128(x, y);
- }
- int main(void) {
--return 0;
-+int ret;
-+__m128i x = _mm_setzero_si128();
-+x = f(x, x);
-+memcpy(, , sizeof(ret));
-+return ret;
- }
- """
-
-From 3f6a86e072ef0e650f04eebf086940e6d8b33c03 Mon Sep 17 00:00:00 2001
-From: Helder Eijs
-Date: Fri, 29 Dec 2023 14:52:15 +0100
-Subject: [PATCH] Use memset, to avoid emmintrin.h
-
- compiler_opt.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/compiler_opt.py b/compiler_opt.py
-index 57db0a6f..a2711c09 100644
a/compiler_opt.py
-+++ b/compiler_opt.py
-@@ -169,7 +169,8 @@ def compiler_supports_aesni():
- }
- int main(void) {
- int ret;
--__m128i x = _mm_setzero_si128();
-+__m128i x;
-+memset(, 0, sizeof(x));
- x = f(x, x);
- memcpy(, , sizeof(ret));
- return ret;
-
-
diff --git a/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild
b/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild
deleted file mode 100644
index 5e5ee8256d02..
--- a/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="
- https://www.pycryptodome.org/
- https://github.com/Legrandin/pycryptodome/
- https://pypi.org/project/pycryptodome/
-"
-SRC_URI="
- https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-
-DEPEND="
-
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/
commit: d2de8ad43c17349f4511be5e028ce3a1c31e9678
Author: Sam James gentoo org>
AuthorDate: Fri Jan 5 13:05:15 2024 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 5 13:24:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2de8ad4
dev-python/pycryptodome: fix configure w/ gcc 14
Signed-off-by: Sam James gentoo.org>
.../pycryptodome-3.19.1-gcc14-configure.patch | 48 +
.../pycryptodome/pycryptodome-3.19.1-r1.ebuild | 61 ++
2 files changed, 109 insertions(+)
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch
b/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch
new file mode 100644
index ..ee87f615b814
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch
@@ -0,0 +1,48 @@
+https://github.com/Legrandin/pycryptodome/issues/787
+https://github.com/Legrandin/pycryptodome/commit/b4083688fde0580de6c2a4d36d84da31a2549a2c
+
+From b4083688fde0580de6c2a4d36d84da31a2549a2c Mon Sep 17 00:00:00 2001
+From: Helder Eijs
+Date: Fri, 29 Dec 2023 14:36:19 +0100
+Subject: [PATCH] Better autodetect of AES support, in case of aggressive
+ optimization
+
+--- a/compiler_opt.py
b/compiler_opt.py
+@@ -140,7 +140,7 @@ def compiler_has_intrin_h():
+ {
+ int a, b[4];
+ __cpuid(b, a);
+-return 0;
++return a;
+ }
+ """
+ return test_compilation(source, msg="intrin.h header")
+@@ -154,7 +154,7 @@ def compiler_has_cpuid_h():
+ {
+ unsigned int eax, ebx, ecx, edx;
+ __get_cpuid(1, , , , );
+-return 0;
++return eax;
+ }
+ """
+ return test_compilation(source, msg="cpuid.h header")
+@@ -163,11 +163,16 @@ def compiler_has_cpuid_h():
+ def compiler_supports_aesni():
+ source = """
+ #include
++#include
+ __m128i f(__m128i x, __m128i y) {
+ return _mm_aesenc_si128(x, y);
+ }
+ int main(void) {
+-return 0;
++int ret;
++__m128i x = _mm_setzero_si128();
++x = f(x, x);
++memcpy(, , sizeof(ret));
++return ret;
+ }
+ """
+
+
diff --git a/dev-python/pycryptodome/pycryptodome-3.19.1-r1.ebuild
b/dev-python/pycryptodome/pycryptodome-3.19.1-r1.ebuild
new file mode 100644
index ..89a5edcca25b
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.19.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="
+ https://www.pycryptodome.org/
+ https://github.com/Legrandin/pycryptodome/
+ https://pypi.org/project/pycryptodome/
+"
+SRC_URI="
+ https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+
+DEPEND="
+ dev-libs/gmp:=
+ >=dev-libs/libtomcrypt-1.18.2-r1:=
+"
+BDEPEND="
+ $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
+"
+RDEPEND="
+ ${DEPEND}
+ ${BDEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+ "${FILESDIR}/pycryptodome-3.19.1-gcc14-configure.patch"
+)
+
+python_prepare_all() {
+ # make sure we're unbundling it correctly
+ rm -r src/libtom || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
+ "${EPYTHON}" - <<-EOF || die
+ import sys
+ from Crypto import SelfTest
+ SelfTest.run(verbosity=2, stream=sys.stdout)
+ EOF
+
+ # TODO: run cmake tests from src/test?
+}
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/
commit: 4122ae6f765a6bd940815a19109baab131e9f842
Author: Michał Górny gentoo org>
AuthorDate: Wed Nov 29 15:52:03 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Nov 29 15:52:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4122ae6f
dev-python/pycryptodome: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/pycryptodome/Manifest | 1 -
.../pycryptodome-3.18.0-python3.12-unittest.patch | 22
dev-python/pycryptodome/pycryptodome-3.18.0.ebuild | 62 --
3 files changed, 85 deletions(-)
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 7d8268b41a31..9fcc8999fb69 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.18.0.gh.tar.gz 16720227 BLAKE2B
dfdc3a7cc0b1aea1e7b7d8f6e8bcf651ca92f0020e2c51849512d00e716283537feb884cacdc655d99a6b992305db9b899172d022bc9ff65d6349ee40b40c4d5
SHA512
a30a6b406bfd1d4288169924924636246c36999ca1e14c5cb70bd2f71ce25739dae04726ca97bdaebf7a8b36927cc6f617fbe2599fad48512a2c5e016a528247
DIST pycryptodome-3.19.0.gh.tar.gz 17153954 BLAKE2B
5ecaacce490e5eec052d632b1427a4e36ba19a863c28934f53f247b945bb32a1367aeaf1b8669018978bd19d53c28a00f711158c6be014779c47c48f263b2e8c
SHA512
1afa71336da38efb32f79d87b442a1d50537a6908ec153be7a087027a8540cebabab12922557c92e501f2d6da5c2f35466d3bbe6a3de44540de7278069691290
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch
b/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch
deleted file mode 100644
index 6e49a784af16..
---
a/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/Legrandin/pycryptodome/pull/746
-
-From 9d70fbca927516b31ef61fd7cc3ed3e0ebc95fa6 Mon Sep 17 00:00:00 2001
-From: Sam James
-Date: Thu, 1 Jun 2023 08:03:18 +0100
-Subject: [PATCH] Replace deprecated unittest aliases for Python 3.12
-
-See https://docs.python.org/3.12/whatsnew/3.12.html#removed.
a/lib/Crypto/SelfTest/PublicKey/test_import_ECC.py
-+++ b/lib/Crypto/SelfTest/PublicKey/test_import_ECC.py
-@@ -2269,9 +2269,9 @@ def test_import_x509_pem(self):
- def test_import_openssh_public(self):
- key_file = load_file("ecc_ed25519_public_openssh.txt")
- key = ECC._import_openssh_public(key_file)
--self.failIf(key.has_private())
-+self.assertFalse(key.has_private())
- key = ECC.import_key(key_file)
--self.failIf(key.has_private())
-+self.assertFalse(key.has_private())
-
- def test_import_openssh_private_clear(self):
- key_file = load_file("ecc_ed25519_private_openssh.pem")
diff --git a/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
b/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
deleted file mode 100644
index c6091d5602fe..
--- a/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="
- https://www.pycryptodome.org/
- https://github.com/Legrandin/pycryptodome/
- https://pypi.org/project/pycryptodome/
-"
-SRC_URI="
- https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-
-DEPEND="
- dev-libs/gmp:=
- >=dev-libs/libtomcrypt-1.18.2-r1:=
-"
-BDEPEND="
- $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-"
-RDEPEND="
- ${DEPEND}
- ${BDEPEND}
- !dev-python/pycrypto
-"
-
-PATCHES=(
- "${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
- "${FILESDIR}/pycryptodome-3.18.0-python3.12-unittest.patch"
-)
-
-python_prepare_all() {
- # make sure we're unbundling it correctly
- rm -r src/libtom || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
- "${EPYTHON}" - <<-EOF || die
- import sys
- from Crypto import SelfTest
- SelfTest.run(verbosity=2, stream=sys.stdout)
- EOF
-
- # TODO: run cmake tests from src/test?
-}
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/
commit: 46a2594793fad37bb1568d848df0126d54183c92
Author: Michał Górny gentoo org>
AuthorDate: Sun Oct 31 20:32:45 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Oct 31 20:33:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a25947
dev-python/pycryptodome: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/pycryptodome/Manifest | 2 -
.../files/pycryptodome-3.10.1-parallel-make.patch | 22 -
dev-python/pycryptodome/pycryptodome-3.10.1.ebuild | 54 --
dev-python/pycryptodome/pycryptodome-3.10.4.ebuild | 45 --
4 files changed, 123 deletions(-)
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index a65f0924ccc..33a931ee4c0 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,3 +1 @@
-DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B
ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf
SHA512
4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
-DIST pycryptodome-3.10.4.tar.gz 15552675 BLAKE2B
aaa6e6768d099b7b229f2b920671577800baea11b8b5a8efdd818f3d5685e46ac51d1c79d9c987f1d93cc9df98c786028137348c946da7aff35fc436ff21894c
SHA512
1ee2f6c499d7ea73bdeafc94b1e91b45bf888f84ea214a01db180e030b4724264ba05e16241c465484ec13075f5300f6c489229bedb84e54b93e2852906b634f
DIST pycryptodome-3.11.0.tar.gz 1515 BLAKE2B
fee6a2f2ac0659c82efed2cfdaf7c4d1e4813aaa2203c41c249a7e512a4ec1c955f443022e81847fbfd095cd95f205c054b8c3ef90f4741063c679798cd8c5e5
SHA512
9a6f94a78909b236e9b9224915495f092891951b76836396706c11e8e87717ff84fd92fe04ad641d6a5a0ef1f3b339990d7f21a326e72b95b166a76169240964
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
b/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
deleted file mode 100644
index 3b8f503bb29..000
--- a/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -dupr a/setup.py b/setup.py
a/setup.py 2021-02-09 13:46:16.138626317 +0100
-+++ b/setup.py 2021-02-09 13:46:51.116065599 +0100
-@@ -360,7 +360,7 @@ ext_modules = [
- Extension("Crypto.Cipher._raw_eksblowfish",
- include_dirs=['src/'],
- define_macros=[('EKS',None),],
--sources=["src/blowfish.c"],
-+sources=["src/blowfish_eks.c"],
- py_limited_api=True),
- Extension("Crypto.Cipher._raw_cast",
- include_dirs=['src/'],
-@@ -442,7 +442,8 @@ ext_modules = [
- # Math
- Extension("Crypto.Math._modexp",
- include_dirs=['src/'],
--sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
'src/mont.c'],
-+sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
-+ 'src/mont_math.c'],
- py_limited_api=True,
- ),
- ]
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
deleted file mode 100644
index 16d872aebcf..000
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org/
- https://github.com/Legrandin/pycryptodome/
- https://pypi.org/project/pycryptodome/;
-SRC_URI="
- https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
- dev-libs/gmp:0=
- >=dev-libs/libtomcrypt-1.18.2-r1:="
-BDEPEND="
- virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
- ${DEPEND}
- ${BDEPEND}
- !dev-python/pycrypto"
-
-PATCHES=(
- "${FILESDIR}/pycryptodome-3.10.1-parallel-make.patch"
- "${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
- # parallel make fixes
- # Multiple targets were compiling the same file, setuptools doesn't
- # understand this and you get race conditions where a file gets
- # overwritten while it's linking. This makes the files look like
separate
- # files so this race won't happen
- ln src/blowfish.c src/blowfish_eks.c || die
- ln src/mont.c src/mont_math.c || die
-
- # make sure we're unbundling it correctly
- rm -r src/libtom || die
-
-
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/
commit: ee886ca4b0ef0e3224d1c8bececb8522f6da1987
Author: Michał Górny gentoo org>
AuthorDate: Sun Mar 28 15:41:08 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Mar 28 15:55:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee886ca4
dev-python/pycryptodome: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/pycryptodome/Manifest | 1 -
.../files/pycryptodome-3.9.4-parallel-make.patch | 22 -
.../pycryptodome-3.9.9-system-libtomcrypt.patch| 43 -
.../pycryptodome/pycryptodome-3.9.9-r1.ebuild | 54 --
4 files changed, 120 deletions(-)
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 4ac5d971007..024ebb61ebb 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B
ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf
SHA512
4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
-DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B
ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab
SHA512
a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
b/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
deleted file mode 100644
index 331333533f1..000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1d70caad..c72f64ff 100644
a/setup.py
-+++ b/setup.py
-@@ -364,7 +364,7 @@ ext_modules = [
- Extension("Crypto.Cipher._raw_eksblowfish",
- include_dirs=['src/'],
- define_macros=[('EKS',None),],
--sources=["src/blowfish.c"]),
-+sources=["src/blowfish_eks.c"]),
- Extension("Crypto.Cipher._raw_cast",
- include_dirs=['src/'],
- sources=["src/CAST.c"]),
-@@ -427,7 +427,7 @@ ext_modules = [
- # Math
- Extension("Crypto.Math._modexp",
- include_dirs=['src/'],
--sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
'src/mont.c'],
-+sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
'src/mont_math.c'],
- ),
- ]
-
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
b/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
deleted file mode 100644
index 927ad65e7c4..000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
+++ /dev/null
@@ -1,43 +0,0 @@
a/setup.py 2019-01-19 22:52:55.0 +0100
-+++ b/setup.py 2019-02-15 15:29:46.960976879 +0100
-@@ -367,11 +367,13 @@ ext_modules = [
- include_dirs=['src/'],
- sources=["src/CAST.c"]),
- Extension("Crypto.Cipher._raw_des",
--include_dirs=['src/', 'src/libtom/'],
--sources=["src/DES.c"]),
-+include_dirs=['src/'],
-+sources=["src/DES.c"],
-+extra_link_args=["-ltomcrypt"]),
- Extension("Crypto.Cipher._raw_des3",
--include_dirs=['src/', 'src/libtom/'],
--sources=["src/DES3.c"]),
-+include_dirs=['src/'],
-+sources=["src/DES3.c"],
-+extra_link_args=["-ltomcrypt"]),
- Extension("Crypto.Util._cpuid_c",
- include_dirs=['src/'],
- sources=['src/cpuid.c']),
-@@ -400,8 +402,9 @@ ext_modules = [
- include_dirs=['src/'],
- sources=["src/ARC4.c"]),
- Extension("Crypto.Cipher._Salsa20",
--include_dirs=['src/', 'src/libtom/'],
--sources=["src/Salsa20.c"]),
-+include_dirs=['src/'],
-+sources=["src/Salsa20.c"],
-+extra_link_args=["-ltomcrypt"]),
- Extension("Crypto.Cipher._chacha20",
- include_dirs=['src/'],
- sources=["src/chacha20.c"]),
a/src/DES.c2019-01-19 22:52:55.0 +0100
-+++ b/src/DES.c2019-02-15 15:30:27.014967034 +0100
-@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
-
- /* Include the actial DES implementation */
- #define LTC_NO_PROTOTYPES
--#include "libtom/tomcrypt_des.c"
-+#include
-
- struct block_state {
- symmetric_key sk;
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
deleted file mode 100644
index 50c3a515eb5..000
--- a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/
commit: 29ad384fc17a0c9efe52d1d6283aee3d268ce5e2
Author: Michał Górny gentoo org>
AuthorDate: Tue Feb 9 12:53:33 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Feb 9 13:13:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ad384f
dev-python/pycryptodome: Bump to 3.10.1
Signed-off-by: Michał Górny gentoo.org>
dev-python/pycryptodome/Manifest | 1 +
.../files/pycryptodome-3.10.1-parallel-make.patch | 22 +
.../pycryptodome-3.10.1-system-libtomcrypt.patch | 50
dev-python/pycryptodome/pycryptodome-3.10.1.ebuild | 54 ++
4 files changed, 127 insertions(+)
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 5c3a1ea1a6e..4ac5d971007 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1 +1,2 @@
+DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B
ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf
SHA512
4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B
ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab
SHA512
a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
b/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
new file mode 100644
index 000..3b8f503bb29
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
@@ -0,0 +1,22 @@
+diff -dupr a/setup.py b/setup.py
+--- a/setup.py 2021-02-09 13:46:16.138626317 +0100
b/setup.py 2021-02-09 13:46:51.116065599 +0100
+@@ -360,7 +360,7 @@ ext_modules = [
+ Extension("Crypto.Cipher._raw_eksblowfish",
+ include_dirs=['src/'],
+ define_macros=[('EKS',None),],
+-sources=["src/blowfish.c"],
++sources=["src/blowfish_eks.c"],
+ py_limited_api=True),
+ Extension("Crypto.Cipher._raw_cast",
+ include_dirs=['src/'],
+@@ -442,7 +442,8 @@ ext_modules = [
+ # Math
+ Extension("Crypto.Math._modexp",
+ include_dirs=['src/'],
+-sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
'src/mont.c'],
++sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
++ 'src/mont_math.c'],
+ py_limited_api=True,
+ ),
+ ]
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch
b/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch
new file mode 100644
index 000..51a5766c15f
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch
@@ -0,0 +1,50 @@
+diff -dupr a/setup.py b/setup.py
+--- a/setup.py 2021-02-09 13:49:46.356455141 +0100
b/setup.py 2021-02-09 13:50:49.351076275 +0100
+@@ -367,13 +367,15 @@ ext_modules = [
+ sources=["src/CAST.c"],
+ py_limited_api=True),
+ Extension("Crypto.Cipher._raw_des",
+-include_dirs=['src/', 'src/libtom/'],
++include_dirs=['src/'],
+ sources=["src/DES.c"],
+-py_limited_api=True),
++py_limited_api=True,
++extra_link_args=["-ltomcrypt"]),
+ Extension("Crypto.Cipher._raw_des3",
+-include_dirs=['src/', 'src/libtom/'],
++include_dirs=['src/'],
+ sources=["src/DES3.c"],
+-py_limited_api=True),
++py_limited_api=True,
++extra_link_args=["-ltomcrypt"]),
+ Extension("Crypto.Util._cpuid_c",
+ include_dirs=['src/'],
+ sources=['src/cpuid.c'],
+@@ -410,9 +412,10 @@ ext_modules = [
+ sources=["src/ARC4.c"],
+ py_limited_api=True),
+ Extension("Crypto.Cipher._Salsa20",
+-include_dirs=['src/', 'src/libtom/'],
++include_dirs=['src/'],
+ sources=["src/Salsa20.c"],
+-py_limited_api=True),
++py_limited_api=True,
++extra_link_args=["-ltomcrypt"]),
+ Extension("Crypto.Cipher._chacha20",
+ include_dirs=['src/'],
+ sources=["src/chacha20.c"],
+Only in b: setup.py.orig
+Only in b: setup.py.rej
+diff -dupr a/src/DES.c b/src/DES.c
+--- a/src/DES.c2021-02-09 13:49:46.336454729 +0100
b/src/DES.c2021-02-09 13:50:02.640123617 +0100
+@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
+
+ /* Include the actial DES implementation */
+ #define LTC_NO_PROTOTYPES
+-#include "libtom/tomcrypt_des.c"
++#include
+
+ struct block_state {
+ symmetric_key sk;
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
new file mode 100644
index
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/
commit: ba6d20d101e079eb1e997fcfb830b40b111b7217
Author: Michał Górny gentoo org>
AuthorDate: Tue Dec 22 09:52:43 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Dec 22 10:10:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6d20d1
dev-python/pycryptodome: Unbundle libtomcrypt
Closes: https://bugs.gentoo.org/732662
Signed-off-by: Michał Górny gentoo.org>
.../pycryptodome-3.9.9-system-libtomcrypt.patch| 43 +
.../pycryptodome/pycryptodome-3.9.9-r1.ebuild | 54 ++
2 files changed, 97 insertions(+)
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
b/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
new file mode 100644
index 000..927ad65e7c4
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
@@ -0,0 +1,43 @@
+--- a/setup.py 2019-01-19 22:52:55.0 +0100
b/setup.py 2019-02-15 15:29:46.960976879 +0100
+@@ -367,11 +367,13 @@ ext_modules = [
+ include_dirs=['src/'],
+ sources=["src/CAST.c"]),
+ Extension("Crypto.Cipher._raw_des",
+-include_dirs=['src/', 'src/libtom/'],
+-sources=["src/DES.c"]),
++include_dirs=['src/'],
++sources=["src/DES.c"],
++extra_link_args=["-ltomcrypt"]),
+ Extension("Crypto.Cipher._raw_des3",
+-include_dirs=['src/', 'src/libtom/'],
+-sources=["src/DES3.c"]),
++include_dirs=['src/'],
++sources=["src/DES3.c"],
++extra_link_args=["-ltomcrypt"]),
+ Extension("Crypto.Util._cpuid_c",
+ include_dirs=['src/'],
+ sources=['src/cpuid.c']),
+@@ -400,8 +402,9 @@ ext_modules = [
+ include_dirs=['src/'],
+ sources=["src/ARC4.c"]),
+ Extension("Crypto.Cipher._Salsa20",
+-include_dirs=['src/', 'src/libtom/'],
+-sources=["src/Salsa20.c"]),
++include_dirs=['src/'],
++sources=["src/Salsa20.c"],
++extra_link_args=["-ltomcrypt"]),
+ Extension("Crypto.Cipher._chacha20",
+ include_dirs=['src/'],
+ sources=["src/chacha20.c"]),
+--- a/src/DES.c2019-01-19 22:52:55.0 +0100
b/src/DES.c2019-02-15 15:30:27.014967034 +0100
+@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
+
+ /* Include the actial DES implementation */
+ #define LTC_NO_PROTOTYPES
+-#include "libtom/tomcrypt_des.c"
++#include
+
+ struct block_state {
+ symmetric_key sk;
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
new file mode 100644
index 000..8366e337747
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org/
+ https://github.com/Legrandin/pycryptodome/
+ https://pypi.org/project/pycryptodome/;
+SRC_URI="
+ https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/gmp:0=
+ >=dev-libs/libtomcrypt-1.18.2-r1:="
+BDEPEND="
+ virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+ ${DEPEND}
+ ${BDEPEND}
+ !dev-python/pycrypto"
+
+PATCHES=(
+ "${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
+ "${FILESDIR}/pycryptodome-3.9.9-system-libtomcrypt.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+ # parallel make fixes
+ # Multiple targets were compiling the same file, setuptools doesn't
+ # understand this and you get race conditions where a file gets
+ # overwritten while it's linking. This makes the files look like
separate
+ # files so this race won't happen
+ ln src/blowfish.c src/blowfish_eks.c || die
+ ln src/mont.c src/mont_math.c || die
+
+ # make sure we're unbundling it correctly
+ rm -r src/libtom || die
+
+ distutils-r1_python_prepare_all
+}
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/
commit: 953aee9c307b4cead26995a66292248de5b97e92
Author: Patrick McLean sony com>
AuthorDate: Wed Nov 27 05:31:01 2019 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Nov 27 05:32:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953aee9c
dev-python/pycryptodome-3.9.4: Bump, add py38, fix tests
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean gentoo.org>
dev-python/pycryptodome/Manifest | 1 +
.../files/pycryptodome-3.9.4-parallel-make.patch | 22 ++
.../files/pycryptodome-3.9.4-tests.patch | 48 ++
dev-python/pycryptodome/pycryptodome-3.9.4.ebuild | 46 +
4 files changed, 117 insertions(+)
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 31aadd3a9fb..31352feff6b 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -3,3 +3,4 @@ DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B
02368e2af0a12686cf2e635cca8e2c279
DIST pycryptodome-3.6.6.tar.gz 7137656 BLAKE2B
72a3dffa22ca4a90a6515ce0bb6939d4c11aab31793ca330523feb08f6529cbfdf3dee01b1caa4577caed1818c0227961e7f25d855b2dcfb09757beb3e0790b4
SHA512
ce03d9940c23ce59e19bcd795c300dbddeddd49756a4bfcc6933da66dfb8b7bedb8d6eaa2b01727c53e72c8e84dfcab2961d1580a188afa9c9451bd2099bdc61
DIST pycryptodome-3.7.3.tar.gz 9285823 BLAKE2B
6f215a3bb0337f5b7469d92bd2d5b5a19ab4e2c6a8f119411c3a5bcdcf93307752d99113866268b5066cceda6470bd0fbe81b1b2f9e30b5e5e569c77ede087f3
SHA512
b5e09c08cd252cad4d76249be84ce29e16a9bba4f2c5e81594c24d9a39df0f3fc67822698497eb9daa4cb6a43311c5d5a2543f187a5d5f801288596c2941f08f
DIST pycryptodome-3.8.2.tar.gz 12441359 BLAKE2B
857b77ce23bafe8a296d6fc2402914491818b51142d2a08aa882a0d4e15899bc2b18a6b69ffa904cad406fb3ce8bf029404ea178532cd4580ce118ec03311cd2
SHA512
361909d479b3478b72f2723f2c94cafd4e9d50c2d4156535d217f0566c534dc27435f64e9ba0cdb8215c2c3d3800ad1e0befde95deed481f33f9ed2ba318
+DIST pycryptodome-3.9.4.tar.gz 11575825 BLAKE2B
c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223
SHA512
d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
diff --git
a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
b/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
new file mode 100644
index 000..331333533f1
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
@@ -0,0 +1,22 @@
+diff --git a/setup.py b/setup.py
+index 1d70caad..c72f64ff 100644
+--- a/setup.py
b/setup.py
+@@ -364,7 +364,7 @@ ext_modules = [
+ Extension("Crypto.Cipher._raw_eksblowfish",
+ include_dirs=['src/'],
+ define_macros=[('EKS',None),],
+-sources=["src/blowfish.c"]),
++sources=["src/blowfish_eks.c"]),
+ Extension("Crypto.Cipher._raw_cast",
+ include_dirs=['src/'],
+ sources=["src/CAST.c"]),
+@@ -427,7 +427,7 @@ ext_modules = [
+ # Math
+ Extension("Crypto.Math._modexp",
+ include_dirs=['src/'],
+-sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
'src/mont.c'],
++sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
'src/mont_math.c'],
+ ),
+ ]
+
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch
b/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch
new file mode 100644
index 000..2cfcaec127d
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch
@@ -0,0 +1,48 @@
+diff --git a/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
b/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
+index a2109891..44d2e532 100644
+--- a/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
b/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
+@@ -626,6 +626,7 @@ class TestVectorsWycheproof(unittest.TestCase):
+ def __init__(self, wycheproof_warnings):
+ unittest.TestCase.__init__(self)
+ self._wycheproof_warnings = wycheproof_warnings
++self._id = "None"
+
+ def setUp(self):
+ comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
+diff --git a/lib/Crypto/SelfTest/Cipher/test_EAX.py
b/lib/Crypto/SelfTest/Cipher/test_EAX.py
+index cdd0e85a..546186d1 100644
+--- a/lib/Crypto/SelfTest/Cipher/test_EAX.py
b/lib/Crypto/SelfTest/Cipher/test_EAX.py
+@@ -656,6 +656,7 @@ class TestVectorsWycheproof(unittest.TestCase):
+ def __init__(self, wycheproof_warnings):
+ unittest.TestCase.__init__(self)
+ self._wycheproof_warnings = wycheproof_warnings
++self._id = "None"
+
+ def setUp(self):
+ comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
+diff --git
