diff options
| author | Matěj Cepl <mcepl@cepl.eu> | 2017-07-27 23:08:49 +0200 |
|---|---|---|
| committer | Matěj Cepl <mcepl@cepl.eu> | 2017-09-19 16:16:22 +0200 |
| commit | fcfec31e8f35c5c362e5acb965021b7467a21252 (patch) | |
| tree | 10c085e18d75281284216fa11bc746d341f6e2ea | |
| parent | 41f12ada8ec8a207841b25c895be5aad8775dcb9 (diff) | |
| download | m2crypto-fcfec31e8f35c5c362e5acb965021b7467a21252.tar.gz | |
Replace deprecated HMAC_Init(3) with HMAC_Init_ex(3).
| -rw-r--r-- | SWIG/_evp.i | 2 | ||||
| -rw-r--r-- | SWIG/_m2crypto_wrap.c | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/SWIG/_evp.i b/SWIG/_evp.i index eb3af5f..3d8f4b0 100644 --- a/SWIG/_evp.i +++ b/SWIG/_evp.i @@ -305,7 +305,7 @@ PyObject *hmac_init(HMAC_CTX *ctx, PyObject *key, const EVP_MD *md) { if (m2_PyObject_AsReadBufferInt(key, &kbuf, &klen) == -1) return NULL; - if (!HMAC_Init(ctx, kbuf, klen, md)) { + if (!HMAC_Init_ex(ctx, kbuf, klen, md, NULL)) { PyErr_SetString(_evp_err, "HMAC_Init failed"); return NULL; } diff --git a/SWIG/_m2crypto_wrap.c b/SWIG/_m2crypto_wrap.c index a183ceb..2c42f55 100644 --- a/SWIG/_m2crypto_wrap.c +++ b/SWIG/_m2crypto_wrap.c @@ -5274,8 +5274,6 @@ SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val) #include <openssl/opensslv.h> #if OPENSSL_VERSION_NUMBER < 0x10100000L -// #define EVP_MD_CTX_size(ctx) ((ctx)->digest->md_size) -// #define HMAC_size(ctx) ((ctx)->md->md_size) #define HMAC_CTX_new() \ ((HMAC_CTX *)PyMem_Malloc(sizeof(HMAC_CTX))) @@ -5286,17 +5284,7 @@ SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val) PyMem_Free((void *)ctx); \ } while(0) -// #define EVP_CIPHER_CTX_new() \ -// ((EVP_CIPHER_CTX *)PyMem_Malloc(sizeof(EVP_CIPHER_CTX))) #define EVP_CIPHER_CTX_reset(ctx) EVP_CIPHER_CTX_init(ctx) -// #define EVP_CIPHER_CTX_free(ctx) \ -// do { \ -// EVP_CIPHER_CTX_cleanup(ctx);\ -// PyMem_Free((void *)ctx); \ -// } while(0) -// #define EVP_CIPHER_CTX_block_size(ctx) \ -// ((ctx)->cipher->block_size) -// #define EVP_PKEY_base_id(pkey) ((pkey)->type) #endif @@ -5411,7 +5399,7 @@ PyObject *hmac_init(HMAC_CTX *ctx, PyObject *key, const EVP_MD *md) { if (m2_PyObject_AsReadBufferInt(key, &kbuf, &klen) == -1) return NULL; - if (!HMAC_Init(ctx, kbuf, klen, md)) { + if (!HMAC_Init_ex(ctx, kbuf, klen, md, NULL)) { PyErr_SetString(_evp_err, "HMAC_Init failed"); return NULL; } |