mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 14:25:53 +01:00
python3-m2crypto: upgrade 0.37.1 -> 0.38.0
0.38.0 - 2021-06-14 ------------------- - Remove the last use of setup.py test idiom. - Use m2_PyObject_AsReadBuffer instead of PyObject_AsReadBuffer. - Add support for arm64 big endian <Steev Klimaszewski> - Make support of RSA_SSLV23_PADDING optional (it has been deprecated). - Move project to src/ layout - Allow verify_cb_* to be called with ok=True <Casey Deccio> - Be prepared if any of constants in x509_vfy.h is not available. - But we do support 3.8 - We DO NOT support Python 2.6. Refresh the following patch: cross-compile-platform.patch 0001-Allow-verify_cb_-to-be-called-with-ok-True.patch 0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch Removed since these are included in 0.38.0 Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
This commit is contained in:
zangrc
Khem Raj
parent
f7f1c9fb2d
commit
eb70309399
|
|
@ -1,47 +0,0 @@
|
|||
From 73fbd1e646f6bbf202d4418bae80eb9941fbf552 Mon Sep 17 00:00:00 2001
|
||||
From: Casey Deccio <casey@deccio.net>
|
||||
Date: Fri, 8 Jan 2021 12:43:09 -0700
|
||||
Subject: [PATCH] Allow verify_cb_* to be called with ok=True
|
||||
|
||||
With https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
|
||||
OpenSSL allowed verificaton to continue on UNABLE_TO_VERIFY_LEAF_SIGNATURE
|
||||
---
|
||||
tests/test_ssl.py | 14 ++++++++++++--
|
||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
|
||||
index 92b6942..7a3271a 100644
|
||||
--- a/tests/test_ssl.py
|
||||
+++ b/tests/test_ssl.py
|
||||
@@ -59,8 +59,13 @@ def allocate_srv_port():
|
||||
|
||||
|
||||
def verify_cb_new_function(ok, store):
|
||||
- assert not ok
|
||||
err = store.get_error()
|
||||
+ # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
|
||||
+ # aborting, this callback is called to retrieve additional error
|
||||
+ # information. In this case, ok might not be False.
|
||||
+ # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
|
||||
+ if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
|
||||
+ assert not ok
|
||||
assert err in [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
|
||||
m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
|
||||
m2.X509_V_ERR_CERT_UNTRUSTED,
|
||||
@@ -618,7 +623,12 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase):
|
||||
|
||||
def verify_cb_old(self, ctx_ptr, x509_ptr, err, depth, ok):
|
||||
try:
|
||||
- self.assertFalse(ok)
|
||||
+ # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
|
||||
+ # aborting, this callback is called to retrieve additional error
|
||||
+ # information. In this case, ok might not be False.
|
||||
+ # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
|
||||
+ if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
|
||||
+ self.assertFalse(ok)
|
||||
self.assertIn(err,
|
||||
[m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
|
||||
m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From d06eaa88a5f491827733f32027c46de3557fbd05 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
|
||||
Date: Fri, 19 Feb 2021 15:53:02 +0100
|
||||
Subject: [PATCH] Use of RSA_SSLV23_PADDING has been deprecated.
|
||||
|
||||
Fixes #293.
|
||||
---
|
||||
tests/test_rsa.py | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/tests/test_rsa.py b/tests/test_rsa.py
|
||||
index 3de5016..7299785 100644
|
||||
--- a/tests/test_rsa.py
|
||||
+++ b/tests/test_rsa.py
|
||||
@@ -124,11 +124,6 @@ class RSATestCase(unittest.TestCase):
|
||||
ptxt = priv.private_decrypt(ctxt, p)
|
||||
self.assertEqual(ptxt, self.data)
|
||||
|
||||
- # sslv23_padding
|
||||
- ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding)
|
||||
- res = priv.private_decrypt(ctxt, RSA.sslv23_padding)
|
||||
- self.assertEqual(res, self.data)
|
||||
-
|
||||
# no_padding
|
||||
with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
|
||||
priv.public_encrypt(self.data, RSA.no_padding)
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -169,22 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_
|
||||
@@ -169,24 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_
|
||||
log.debug('self.include_dirs = %s', self.include_dirs)
|
||||
log.debug('self.library_dirs = %s', self.library_dirs)
|
||||
|
||||
|
|
@ -25,6 +25,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
- self.swig_opts.append('-D%s' % arch)
|
||||
- if mach in ('ppc64le', 'ppc64el'):
|
||||
- self.swig_opts.append('-D_CALL_ELF=2')
|
||||
- if mach in ('arm64_be'):
|
||||
- self.swig_opts.append('-D__AARCH64EB__')
|
||||
-
|
||||
self.swig_opts.extend(['-I%s' % i for i in self.include_dirs])
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/python-m2crypto:"
|
|||
|
||||
SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \
|
||||
file://cross-compile-platform.patch \
|
||||
file://0001-Allow-verify_cb_-to-be-called-with-ok-True.patch \
|
||||
file://0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch \
|
||||
file://avoid-host-contamination.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "e4e42f068b78ccbf113e5d0a72ae5f480f6c3ace4940b91e4fff5598cfff6fb3"
|
||||
SRC_URI[sha256sum] = "99f2260a30901c949a8dc6d5f82cd5312ffb8abc92e76633baf231bbbcb2decb"
|
||||
|
||||
PYPI_PACKAGE = "M2Crypto"
|
||||
inherit pypi siteinfo setuptools3
|
||||
Loading…
Reference in New Issue
Block a user