m2crypto: patch CVE-2020-25657 (#3541)
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
This commit is contained in:
Muhammad Falak R Wani
GitHub
Родитель
07bd9dbc74
Коммит
d86e53a9e7
|
|
@ -0,0 +1,175 @@
|
|||
From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
|
||||
Date: Tue, 28 Jun 2022 21:17:01 +0200
|
||||
Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA
|
||||
decryption API (CVE-2020-25657)
|
||||
|
||||
Fixes #282
|
||||
|
||||
Upstream commit: 84c53958def0f510e92119fca14d74f94215827a
|
||||
backported by @mfrw on 2022-08-16
|
||||
|
||||
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
|
||||
---
|
||||
src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++--------
|
||||
src/SWIG/_rsa.i | 20 ++++++++++++--------
|
||||
tests/test_rsa.py | 15 +++++++--------
|
||||
3 files changed, 31 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c
|
||||
index aba9eb6..a9f30da 100644
|
||||
--- a/src/SWIG/_m2crypto_wrap.c
|
||||
+++ b/src/SWIG/_m2crypto_wrap.c
|
||||
@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) {
|
||||
tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf,
|
||||
(unsigned char *)tbuf, rsa, padding);
|
||||
if (tlen == -1) {
|
||||
- m2_PyErr_Msg(_rsa_err);
|
||||
+ ERR_clear_error();
|
||||
+ PyErr_Clear();
|
||||
PyMem_Free(tbuf);
|
||||
- return NULL;
|
||||
+ Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
|
||||
@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) {
|
||||
tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf,
|
||||
(unsigned char *)tbuf, rsa, padding);
|
||||
if (tlen == -1) {
|
||||
- m2_PyErr_Msg(_rsa_err);
|
||||
+ ERR_clear_error();
|
||||
+ PyErr_Clear();
|
||||
PyMem_Free(tbuf);
|
||||
- return NULL;
|
||||
+ Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
|
||||
@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) {
|
||||
tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf,
|
||||
(unsigned char *)tbuf, rsa, padding);
|
||||
if (tlen == -1) {
|
||||
- m2_PyErr_Msg(_rsa_err);
|
||||
+ ERR_clear_error();
|
||||
+ PyErr_Clear();
|
||||
PyMem_Free(tbuf);
|
||||
- return NULL;
|
||||
+ Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
|
||||
@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) {
|
||||
tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf,
|
||||
(unsigned char *)tbuf, rsa, padding);
|
||||
if (tlen == -1) {
|
||||
- m2_PyErr_Msg(_rsa_err);
|
||||
+ ERR_clear_error();
|
||||
+ PyErr_Clear();
|
||||
PyMem_Free(tbuf);
|
||||
- return NULL;
|
||||
+ Py_RETURN_NONE;
|
||||
}
|
||||
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
|
||||
|
||||
diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i
|
||||
index bc714e0..1377b8b 100644
|
||||
--- a/src/SWIG/_rsa.i
|
||||
+++ b/src/SWIG/_rsa.i
|
||||
@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) {
|
||||
tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf,
|
||||
(unsigned char *)tbuf, rsa, padding);
|
||||
if (tlen == -1) {
|
||||
- m2_PyErr_Msg(_rsa_err);
|
||||
+ ERR_clear_error();
|
||||
+ PyErr_Clear();
|
||||
PyMem_Free(tbuf);
|
||||
- return NULL;
|
||||
+ Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
|
||||
@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) {
|
||||
tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf,
|
||||
(unsigned char *)tbuf, rsa, padding);
|
||||
if (tlen == -1) {
|
||||
- m2_PyErr_Msg(_rsa_err);
|
||||
+ ERR_clear_error();
|
||||
+ PyErr_Clear();
|
||||
PyMem_Free(tbuf);
|
||||
- return NULL;
|
||||
+ Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
|
||||
@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) {
|
||||
tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf,
|
||||
(unsigned char *)tbuf, rsa, padding);
|
||||
if (tlen == -1) {
|
||||
- m2_PyErr_Msg(_rsa_err);
|
||||
+ ERR_clear_error();
|
||||
+ PyErr_Clear();
|
||||
PyMem_Free(tbuf);
|
||||
- return NULL;
|
||||
+ Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
|
||||
@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) {
|
||||
tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf,
|
||||
(unsigned char *)tbuf, rsa, padding);
|
||||
if (tlen == -1) {
|
||||
- m2_PyErr_Msg(_rsa_err);
|
||||
+ ERR_clear_error();
|
||||
+ PyErr_Clear();
|
||||
PyMem_Free(tbuf);
|
||||
- return NULL;
|
||||
+ Py_RETURN_NONE;
|
||||
}
|
||||
ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen);
|
||||
|
||||
diff --git a/tests/test_rsa.py b/tests/test_rsa.py
|
||||
index 7bb3af7..5e75d68 100644
|
||||
--- a/tests/test_rsa.py
|
||||
+++ b/tests/test_rsa.py
|
||||
@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase):
|
||||
# The other paddings.
|
||||
for padding in self.s_padding_nok:
|
||||
p = getattr(RSA, padding)
|
||||
- with self.assertRaises(RSA.RSAError):
|
||||
- priv.private_encrypt(self.data, p)
|
||||
+ # Exception disabled as a part of mitigation against CVE-2020-25657
|
||||
+ # with self.assertRaises(RSA.RSAError):
|
||||
+ priv.private_encrypt(self.data, p)
|
||||
# Type-check the data to be encrypted.
|
||||
with self.assertRaises(TypeError):
|
||||
priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding)
|
||||
@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase):
|
||||
self.assertEqual(ptxt, self.data)
|
||||
|
||||
# no_padding
|
||||
- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
|
||||
- priv.public_encrypt(self.data, RSA.no_padding)
|
||||
+ # Exception disabled as a part of mitigation against CVE-2020-25657
|
||||
+ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
|
||||
+ priv.public_encrypt(self.data, RSA.no_padding)
|
||||
|
||||
# Type-check the data to be encrypted.
|
||||
+ # Exception disabled as a part of mitigation against CVE-2020-25657
|
||||
with self.assertRaises(TypeError):
|
||||
priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding)
|
||||
|
||||
@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase):
|
||||
b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4
|
||||
with self.assertRaises(RSA.RSAError):
|
||||
setattr(rsa, 'e', '\000\000\000\003\001\000\001')
|
||||
- with self.assertRaises(RSA.RSAError):
|
||||
- rsa.private_encrypt(1)
|
||||
- with self.assertRaises(RSA.RSAError):
|
||||
- rsa.private_decrypt(1)
|
||||
assert rsa.check_key()
|
||||
|
||||
def test_loadpub_bad(self):
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: Crypto and SSL toolkit for Python
|
||||
Name: m2crypto
|
||||
Version: 0.38.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -9,6 +9,7 @@ Group: Development/Languages/Python
|
|||
URL: https://pypi.python.org/pypi/M2Crypto
|
||||
Source0: https://files.pythonhosted.org/packages/2c/52/c35ec79dd97a8ecf6b2bbd651df528abb47705def774a4a15b99977274e8/M2Crypto-%{version}.tar.gz
|
||||
Patch0: 0001-skip-test_tls1_nok-which-cant-be-run-in-FIPS.patch
|
||||
Patch1: CVE-2020-25657.patch
|
||||
|
||||
%description
|
||||
M2Crypto is a crypto and SSL toolkit for Python
|
||||
|
|
@ -56,6 +57,9 @@ pip3 install parameterized
|
|||
%{python3_sitelib}/*
|
||||
|
||||
%changelog
|
||||
* Tue Aug 16 2022 Muhammad Falak <mwani@microsoft.com> - 0.38.0-3
|
||||
- Patch CVE-2020-25657
|
||||
|
||||
* Fri Feb 11 2022 Muhammad Falak <mwani@microsoft.com> - 0.38.0-2
|
||||
- Introduce patch to skip tests which can not run on FIPS mode & TLS1
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче