mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/m2crypto: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
|
||||
DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
|
||||
|
||||
@@ -1,76 +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.31.1
|
||||
|
||||
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.31.1
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
diff --git a/SWIG/_bio.i b/SWIG/_bio.i
|
||||
index 84b76b3..6c090a4 100644
|
||||
--- a/SWIG/_bio.i
|
||||
+++ b/SWIG/_bio.i
|
||||
@@ -246,8 +246,8 @@ PyObject *bio_set_cipher(BIO *b, EVP_CIPHER *c, PyObject *key, PyObject *iv, int
|
||||
const void *kbuf, *ibuf;
|
||||
Py_ssize_t klen, ilen;
|
||||
|
||||
- if ((PyObject_AsReadBuffer(key, &kbuf, &klen) == -1)
|
||||
- || (PyObject_AsReadBuffer(iv, &ibuf, &ilen) == -1))
|
||||
+ if ((m2_PyObject_AsReadBuffer(key, &kbuf, &klen) == -1)
|
||||
+ || (m2_PyObject_AsReadBuffer(iv, &ibuf, &ilen) == -1))
|
||||
return NULL;
|
||||
|
||||
BIO_set_cipher(b, (const EVP_CIPHER *)c,
|
||||
diff --git a/SWIG/_ec.i b/SWIG/_ec.i
|
||||
index f47d593..a492f6f 100644
|
||||
--- a/SWIG/_ec.i
|
||||
+++ b/SWIG/_ec.i
|
||||
@@ -466,7 +466,7 @@ EC_KEY* ec_key_from_pubkey_der(PyObject *pubkey) {
|
||||
const unsigned char *tempBuf;
|
||||
EC_KEY *keypair;
|
||||
|
||||
- if (PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
|
||||
+ if (m2_PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@@ -486,7 +486,7 @@ EC_KEY* ec_key_from_pubkey_params(int nid, PyObject *pubkey) {
|
||||
const unsigned char *tempBuf;
|
||||
EC_KEY *keypair;
|
||||
|
||||
- if (PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
|
||||
+ if (m2_PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
diff --git a/SWIG/_lib.i b/SWIG/_lib.i
|
||||
index 954e99b..351134b 100644
|
||||
--- a/SWIG/_lib.i
|
||||
+++ b/SWIG/_lib.i
|
||||
@@ -137,8 +137,8 @@ m2_PyObject_AsReadBuffer(PyObject * obj, const void **buffer,
|
||||
len = view.len;
|
||||
}
|
||||
} else {
|
||||
- if ((ret = PyObject_AsReadBuffer(obj, buffer, &len)) != 0)
|
||||
- return ret;
|
||||
+ PyErr_SetString(PyExc_TypeError, "expected a readable buffer object");
|
||||
+ return -1;
|
||||
}
|
||||
if (len > INT_MAX) {
|
||||
m2_PyBuffer_Release(obj, &view);
|
||||
@@ -171,11 +171,8 @@ static int m2_PyObject_GetBufferInt(PyObject *obj, Py_buffer *view, int flags)
|
||||
if (PyObject_CheckBuffer(obj))
|
||||
ret = PyObject_GetBuffer(obj, view, flags);
|
||||
else {
|
||||
- const void *buf;
|
||||
-
|
||||
- ret = PyObject_AsReadBuffer(obj, &buf, &view->len);
|
||||
- if (ret == 0)
|
||||
- view->buf = (void *)buf;
|
||||
+ PyErr_SetString(PyExc_TypeError, "expected a readable buffer object");
|
||||
+ return -1;
|
||||
}
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -633,7 +630,7 @@ BIGNUM *hex_to_bn(PyObject *value) {
|
||||
}
|
||||
}
|
||||
else {
|
||||
- if (PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
|
||||
+ if (m2_PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -665,7 +662,7 @@ BIGNUM *dec_to_bn(PyObject *value) {
|
||||
}
|
||||
}
|
||||
else {
|
||||
- if (PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
|
||||
+ if (m2_PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
diff --git a/SWIG/_rc4.i b/SWIG/_rc4.i
|
||||
index eb4747e..6af2dc6 100644
|
||||
--- a/SWIG/_rc4.i
|
||||
+++ b/SWIG/_rc4.i
|
||||
@@ -46,7 +46,7 @@ PyObject *rc4_update(RC4_KEY *key, PyObject *in) {
|
||||
Py_ssize_t len;
|
||||
void *out;
|
||||
|
||||
- if (PyObject_AsReadBuffer(in, &buf, &len) == -1)
|
||||
+ if (m2_PyObject_AsReadBuffer(in, &buf, &len) == -1)
|
||||
return NULL;
|
||||
|
||||
if (!(out = PyMem_Malloc(len))) {
|
||||
diff --git a/SWIG/_util.i b/SWIG/_util.i
|
||||
index bc2ee61..18e446a 100644
|
||||
--- a/SWIG/_util.i
|
||||
+++ b/SWIG/_util.i
|
||||
@@ -22,7 +22,7 @@ PyObject *util_hex_to_string(PyObject *blob) {
|
||||
char *ret;
|
||||
Py_ssize_t len;
|
||||
|
||||
- if (PyObject_AsReadBuffer(blob, &buf, &len) == -1)
|
||||
+ if (m2_PyObject_AsReadBuffer(blob, &buf, &len) == -1)
|
||||
return NULL;
|
||||
|
||||
ret = hex_to_string((unsigned char *)buf, len);
|
||||
@@ -44,7 +44,7 @@ PyObject *util_string_to_hex(PyObject *blob) {
|
||||
Py_ssize_t len0;
|
||||
long len;
|
||||
|
||||
- if (PyObject_AsReadBuffer(blob, &buf, &len0) == -1)
|
||||
+ if (m2_PyObject_AsReadBuffer(blob, &buf, &len0) == -1)
|
||||
return NULL;
|
||||
|
||||
len = len0;
|
||||
@@ -1,69 +0,0 @@
|
||||
# Copyright 2018-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1 toolchain-funcs
|
||||
|
||||
MY_PN="M2Crypto"
|
||||
DESCRIPTION="A Python crypto and SSL toolkit"
|
||||
HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
|
||||
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
>=dev-lang/swig-2.0.9
|
||||
test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
|
||||
"
|
||||
RDEPEND="
|
||||
dev-libs/openssl:0=
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-openssl-fixes.patch"
|
||||
"${FILESDIR}/${P}-py310.patch"
|
||||
)
|
||||
|
||||
swig_define() {
|
||||
local x
|
||||
for x; do
|
||||
if tc-cpp-is-true "defined(${x})"; then
|
||||
SWIG_FEATURES+=" -D${x}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# TODO
|
||||
sed -e 's:test_server_simple_timeouts:_&:' \
|
||||
-i tests/test_ssl.py || die
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
# setup.py looks at platform.machine() to determine swig options.
|
||||
# For exotic ABIs, we need to give swig a hint.
|
||||
local -x SWIG_FEATURES=
|
||||
|
||||
# https://bugs.gentoo.org/617946
|
||||
swig_define __ILP32__
|
||||
|
||||
# https://bugs.gentoo.org/674112
|
||||
swig_define __ARM_PCS_VFP
|
||||
|
||||
distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
|
||||
}
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
Reference in New Issue
Block a user