diff options
author | Matěj Cepl <mcepl@cepl.eu> | 2018-02-01 16:27:52 +0100 |
---|---|---|
committer | Matěj Cepl <mcepl@cepl.eu> | 2018-02-01 16:27:52 +0100 |
commit | 3930282fcea3524d03cf2910704ae123b2bff57f (patch) | |
tree | 52674f917609405a0d90fa5ccd9753e2338091d5 | |
parent | afb36b76b554e18a79b36768e6d3b1145c6ef9d8 (diff) | |
download | m2crypto-3930282fcea3524d03cf2910704ae123b2bff57f.tar.gz |
Do not use old buffer protocol, but PyBytes_AsStringAndSize instead.
-rw-r--r-- | SWIG/_aes.i | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/SWIG/_aes.i b/SWIG/_aes.i index 09579ec..ea36167 100644 --- a/SWIG/_aes.i +++ b/SWIG/_aes.i @@ -45,16 +45,16 @@ void AES_free(AES_KEY *key) { // otherwise: decrypt (Python code will supply the value 1.) */ PyObject *AES_set_key(AES_KEY *key, PyObject *value, int bits, int op) { - const void *vbuf; + char *vbuf; Py_ssize_t vlen; - if (PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1) + if (PyBytes_AsStringAndSize(value, &vbuf, &vlen) == -1) return NULL; if (op == 0) - AES_set_encrypt_key(vbuf, bits, key); + AES_set_encrypt_key((const unsigned char *)vbuf, bits, key); else - AES_set_decrypt_key(vbuf, bits, key); + AES_set_decrypt_key((const unsigned char *)vbuf, bits, key); Py_RETURN_NONE; } @@ -63,12 +63,12 @@ PyObject *AES_set_key(AES_KEY *key, PyObject *value, int bits, int op) { // otherwise: decrypt (Python code will supply the value 1.) */ PyObject *AES_crypt(const AES_KEY *key, PyObject *in, int outlen, int op) { - const void *buf; + char *buf; Py_ssize_t len; unsigned char *out; PyObject *res; - if (PyObject_AsReadBuffer(in, &buf, &len) == -1) + if (PyBytes_AsStringAndSize(in, &buf, &len) == -1) return NULL; if (!(out=(unsigned char *)PyMem_Malloc(outlen))) { |