diff options
author | Matěj Cepl <mcepl@cepl.eu> | 2022-07-12 22:54:28 +0200 |
---|---|---|
committer | Matěj Cepl <mcepl@cepl.eu> | 2022-07-12 23:12:19 +0200 |
commit | b0607106a0b9d19ee97565eb333d9e50fca6defd (patch) | |
tree | 3e44ba1f19465aaaf497bcf5f028be43082332b9 /src | |
parent | 84c53958def0f510e92119fca14d74f94215827a (diff) | |
download | m2crypto-b0607106a0b9d19ee97565eb333d9e50fca6defd.tar.gz |
Fix according to the code review.
Diffstat (limited to 'src')
-rw-r--r-- | src/SWIG/_m2crypto_wrap.c | 10 | ||||
-rw-r--r-- | src/SWIG/_rsa.i | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c index a9f30da..60f5331 100644 --- a/src/SWIG/_m2crypto_wrap.c +++ b/src/SWIG/_m2crypto_wrap.c @@ -7040,10 +7040,9 @@ 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) { - ERR_clear_error(); - PyErr_Clear(); + m2_PyErr_Msg(_rsa_err); PyMem_Free(tbuf); - Py_RETURN_NONE; + return NULL; } ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); @@ -7099,10 +7098,9 @@ 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) { - ERR_clear_error(); - PyErr_Clear(); + m2_PyErr_Msg(_rsa_err); PyMem_Free(tbuf); - Py_RETURN_NONE; + return NULL; } ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i index 1377b8b..0f0bc78 100644 --- a/src/SWIG/_rsa.i +++ b/src/SWIG/_rsa.i @@ -239,10 +239,9 @@ 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) { - ERR_clear_error(); - PyErr_Clear(); + m2_PyErr_Msg(_rsa_err); PyMem_Free(tbuf); - Py_RETURN_NONE; + return NULL; } ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); @@ -298,10 +297,9 @@ 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) { - ERR_clear_error(); - PyErr_Clear(); + m2_PyErr_Msg(_rsa_err); PyMem_Free(tbuf); - Py_RETURN_NONE; + return NULL; } ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); |