mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 22:35:25 +01:00
python3-pycrypto: remove obsolete pycrypto module
pycrypto hasn't had a commit upstream since June 2014, which for a security-critical module is not a good sign. Everyone has migrated to the pycryptodome or cryptography modules, so remove pycrypto from meta-python. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
This commit is contained in:
parent
214cfe90f7
commit
84769a9639
|
|
@ -315,7 +315,6 @@ RDEPENDS:packagegroup-meta-python3 = "\
|
||||||
python3-pycodestyle \
|
python3-pycodestyle \
|
||||||
python3-pyconnman \
|
python3-pyconnman \
|
||||||
python3-pycparser \
|
python3-pycparser \
|
||||||
python3-pycrypto \
|
|
||||||
python3-pycurl \
|
python3-pycurl \
|
||||||
python3-pydbus \
|
python3-pydbus \
|
||||||
python3-pydbus-manager \
|
python3-pydbus-manager \
|
||||||
|
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
From 1d90727ff2368012d6e2f91b1a3198f626495b7f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ming Liu <liu.ming50@gmail.com>
|
|
||||||
Date: Sat, 25 Jan 2020 14:36:16 +0100
|
|
||||||
Subject: [PATCH] Replace time.clock() with time.process_time()
|
|
||||||
|
|
||||||
The use of time.clock() is deprecated in python 3.8, change to use
|
|
||||||
time.process_time().
|
|
||||||
|
|
||||||
Reference:
|
|
||||||
https://docs.python.org/3.3/library/time.html#time.clock
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
||||||
---
|
|
||||||
lib/Crypto/Random/_UserFriendlyRNG.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lib/Crypto/Random/_UserFriendlyRNG.py b/lib/Crypto/Random/_UserFriendlyRNG.py
|
|
||||||
index 957e006..d2a0259 100644
|
|
||||||
--- a/lib/Crypto/Random/_UserFriendlyRNG.py
|
|
||||||
+++ b/lib/Crypto/Random/_UserFriendlyRNG.py
|
|
||||||
@@ -74,7 +74,7 @@ class _EntropyCollector(object):
|
|
||||||
self._time_es.feed(struct.pack("@I", int(2**30 * (t - floor(t)))))
|
|
||||||
|
|
||||||
# Add the fractional part of time.clock()
|
|
||||||
- t = time.clock()
|
|
||||||
+ t = time.process_time()
|
|
||||||
self._clock_es.feed(struct.pack("@I", int(2**30 * (t - floor(t)))))
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
||||||
|
|
@ -1,98 +0,0 @@
|
||||||
From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Legrandin <helderijs@gmail.com>
|
|
||||||
Date: Sun, 22 Dec 2013 22:24:46 +0100
|
|
||||||
Subject: [PATCH] Throw exception when IV is used with ECB or CTR
|
|
||||||
|
|
||||||
The IV parameter is currently ignored when initializing
|
|
||||||
a cipher in ECB or CTR mode.
|
|
||||||
|
|
||||||
For CTR mode, it is confusing: it takes some time to see
|
|
||||||
that a different parameter is needed (the counter).
|
|
||||||
|
|
||||||
For ECB mode, it is outright dangerous.
|
|
||||||
|
|
||||||
This patch forces an exception to be raised.
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
[https://github.com/dlitz/pycrypto/commit/8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4]
|
|
||||||
|
|
||||||
CVE: CVE-2013-7459
|
|
||||||
|
|
||||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
||||||
---
|
|
||||||
lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++--------
|
|
||||||
src/block_template.c | 11 +++++++++++
|
|
||||||
2 files changed, 34 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/lib/Crypto/SelfTest/Cipher/common.py b/lib/Crypto/SelfTest/Cipher/common.py
|
|
||||||
index 8bebed9..91ec743 100644
|
|
||||||
--- a/lib/Crypto/SelfTest/Cipher/common.py
|
|
||||||
+++ b/lib/Crypto/SelfTest/Cipher/common.py
|
|
||||||
@@ -239,19 +239,34 @@ class RoundtripTest(unittest.TestCase):
|
|
||||||
return """%s .decrypt() output of .encrypt() should not be garbled""" % (self.module_name,)
|
|
||||||
|
|
||||||
def runTest(self):
|
|
||||||
- for mode in (self.module.MODE_ECB, self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP):
|
|
||||||
+
|
|
||||||
+ ## ECB mode
|
|
||||||
+ mode = self.module.MODE_ECB
|
|
||||||
+ encryption_cipher = self.module.new(a2b_hex(self.key), mode)
|
|
||||||
+ ciphertext = encryption_cipher.encrypt(self.plaintext)
|
|
||||||
+ decryption_cipher = self.module.new(a2b_hex(self.key), mode)
|
|
||||||
+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
|
|
||||||
+ self.assertEqual(self.plaintext, decrypted_plaintext)
|
|
||||||
+
|
|
||||||
+ ## OPENPGP mode
|
|
||||||
+ mode = self.module.MODE_OPENPGP
|
|
||||||
+ encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
|
|
||||||
+ eiv_ciphertext = encryption_cipher.encrypt(self.plaintext)
|
|
||||||
+ eiv = eiv_ciphertext[:self.module.block_size+2]
|
|
||||||
+ ciphertext = eiv_ciphertext[self.module.block_size+2:]
|
|
||||||
+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
|
|
||||||
+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
|
|
||||||
+ self.assertEqual(self.plaintext, decrypted_plaintext)
|
|
||||||
+
|
|
||||||
+ ## All other non-AEAD modes (but CTR)
|
|
||||||
+ for mode in (self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB):
|
|
||||||
encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
|
|
||||||
ciphertext = encryption_cipher.encrypt(self.plaintext)
|
|
||||||
-
|
|
||||||
- if mode != self.module.MODE_OPENPGP:
|
|
||||||
- decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
|
|
||||||
- else:
|
|
||||||
- eiv = ciphertext[:self.module.block_size+2]
|
|
||||||
- ciphertext = ciphertext[self.module.block_size+2:]
|
|
||||||
- decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
|
|
||||||
+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
|
|
||||||
decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
|
|
||||||
self.assertEqual(self.plaintext, decrypted_plaintext)
|
|
||||||
|
|
||||||
+
|
|
||||||
class PGPTest(unittest.TestCase):
|
|
||||||
def __init__(self, module, params):
|
|
||||||
unittest.TestCase.__init__(self)
|
|
||||||
diff --git a/src/block_template.c b/src/block_template.c
|
|
||||||
index c36b316..8746948 100644
|
|
||||||
--- a/src/block_template.c
|
|
||||||
+++ b/src/block_template.c
|
|
||||||
@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, PyObject *kwdict)
|
|
||||||
"Key cannot be the null string");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
+ if (IVlen != 0 && mode == MODE_ECB)
|
|
||||||
+ {
|
|
||||||
+ PyErr_Format(PyExc_ValueError, "ECB mode does not use IV");
|
|
||||||
+ return NULL;
|
|
||||||
+ }
|
|
||||||
+ if (IVlen != 0 && mode == MODE_CTR)
|
|
||||||
+ {
|
|
||||||
+ PyErr_Format(PyExc_ValueError,
|
|
||||||
+ "CTR mode needs counter parameter, not IV");
|
|
||||||
+ return NULL;
|
|
||||||
+ }
|
|
||||||
if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR)
|
|
||||||
{
|
|
||||||
PyErr_Format(PyExc_ValueError,
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
Index: pycrypto-2.6/setup.py
|
|
||||||
===================================================================
|
|
||||||
--- pycrypto-2.6.orig/setup.py
|
|
||||||
+++ pycrypto-2.6/setup.py
|
|
||||||
@@ -271,7 +271,8 @@ class PCTBuildConfigure(Command):
|
|
||||||
if not os.path.exists("config.status"):
|
|
||||||
if os.system("chmod 0755 configure") != 0:
|
|
||||||
raise RuntimeError("chmod error")
|
|
||||||
- cmd = "sh configure" # we use "sh" here so that it'll work on mingw32 with standard python.org binaries
|
|
||||||
+ host = os.environ.get("HOST_SYS")
|
|
||||||
+ cmd = "ac_cv_func_malloc_0_nonnull=yes sh configure --host " + host # we use "sh" here so that it'll work on mingw32 with standard python.org binaries
|
|
||||||
if self.verbose < 1:
|
|
||||||
cmd += " -q"
|
|
||||||
if os.system(cmd) != 0:
|
|
||||||
@@ -370,7 +371,7 @@ kw = {'name':"pycrypto",
|
|
||||||
'ext_modules': plat_ext + [
|
|
||||||
# _fastmath (uses GNU mp library)
|
|
||||||
Extension("Crypto.PublicKey._fastmath",
|
|
||||||
- include_dirs=['src/','/usr/include/'],
|
|
||||||
+ include_dirs=['src/'],
|
|
||||||
libraries=['gmp'],
|
|
||||||
sources=["src/_fastmath.c"]),
|
|
||||||
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
DESCRIPTION = "Cryptographic modules for Python."
|
|
||||||
HOMEPAGE = "http://www.pycrypto.org/"
|
|
||||||
LICENSE = "PSFv2"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35f354d199e8cb7667b059a23578e63d"
|
|
||||||
|
|
||||||
DEPENDS += " gmp"
|
|
||||||
|
|
||||||
export HOST_SYS
|
|
||||||
|
|
||||||
inherit pypi autotools-brokensep distutils3
|
|
||||||
|
|
||||||
SRC_URI += "file://cross-compiling.patch \
|
|
||||||
file://CVE-2013-7459.patch \
|
|
||||||
file://0001-Replace-time.clock-with-time.process_time.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "55a61a054aa66812daf5161a0d5d7eda"
|
|
||||||
SRC_URI[sha256sum] = "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c"
|
|
||||||
|
|
||||||
do_compile[noexec] = "1"
|
|
||||||
|
|
||||||
# We explicitly call distutils_do_install, since we want it to run, but
|
|
||||||
# *don't* want the autotools install to run, since this package doesn't
|
|
||||||
# provide a "make install" target.
|
|
||||||
do_install() {
|
|
||||||
distutils3_do_install
|
|
||||||
}
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "native nativesdk"
|
|
||||||
Loading…
Reference in New Issue
Block a user