gentoo resync : 15.12.2019

2 files changed, 70 insertions, 0 deletions

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 000000000000..331333533f10
--- /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 000000000000..2cfcaec127de
--- /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 a/lib/Crypto/SelfTest/Cipher/test_GCM.py b/lib/Crypto/SelfTest/Cipher/test_GCM.py
+index e3a7a3da..71ea0d18 100644
+--- a/lib/Crypto/SelfTest/Cipher/test_GCM.py
++++ b/lib/Crypto/SelfTest/Cipher/test_GCM.py
+@@ -828,6 +828,7 @@ class TestVectorsWycheproof(unittest.TestCase):
+         unittest.TestCase.__init__(self)
+         self._wycheproof_warnings = wycheproof_warnings
+         self._extra_params = extra_params
++        self._id = "None"
+ 
+     def setUp(self):
+         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
+diff --git a/lib/Crypto/SelfTest/Cipher/test_SIV.py b/lib/Crypto/SelfTest/Cipher/test_SIV.py
+index 38341e14..ab588adc 100644
+--- a/lib/Crypto/SelfTest/Cipher/test_SIV.py
++++ b/lib/Crypto/SelfTest/Cipher/test_SIV.py
+@@ -456,6 +456,7 @@ class TestVectorsWycheproof(unittest.TestCase):
+ 
+     def __init__(self):
+         unittest.TestCase.__init__(self)
++        self._id = "None"
+ 
+     def setUp(self):
+         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")