diff options
| author | beldmit <beldmit@gmail.com> | 2019-06-05 23:45:55 +0300 |
|---|---|---|
| committer | beldmit <beldmit@gmail.com> | 2019-06-05 23:45:55 +0300 |
| commit | ae2b566c91a6a5e60c8f7f6b01effbcc5c51b63d (patch) | |
| tree | 1d826965ddd43f4dae993960190874135adde8b1 | |
| parent | e71ebcd708e932408384189b3c5460c84dfd0755 (diff) | |
| download | gost-engine-ae2b566c91a6a5e60c8f7f6b01effbcc5c51b63d.zip gost-engine-ae2b566c91a6a5e60c8f7f6b01effbcc5c51b63d.tar.gz gost-engine-ae2b566c91a6a5e60c8f7f6b01effbcc5c51b63d.tar.bz2 | |
Try to fix --no-deprecated build
| -rw-r--r-- | gost_keyexpimp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gost_keyexpimp.c b/gost_keyexpimp.c index 1f058a1..f394de1 100644 --- a/gost_keyexpimp.c +++ b/gost_keyexpimp.c @@ -6,6 +6,8 @@ #include "gost_lcl.h" #include "e_gost_err.h" +/* FIXME no-deprecated*/ +int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr); /* * Function expects that out is a preallocated buffer of length * defined as sum of shared_len and mac length defined by mac_nid @@ -44,8 +46,8 @@ int gost_kexp15(const unsigned char *shared_key, const int shared_len, } if (EVP_DigestInit_ex(mac, EVP_get_digestbynid(mac_nid), NULL) <= 0 - || EVP_MD_CTX_ctrl(mac, EVP_MD_CTRL_SET_KEY, 32, mac_key) <= 0 - || EVP_MD_CTX_ctrl(mac, EVP_MD_CTRL_MAC_LEN, mac_len, NULL) <= 0 + || omac_imit_ctrl(mac, EVP_MD_CTRL_SET_KEY, 32, mac_key) <= 0 + || omac_imit_ctrl(mac, EVP_MD_CTRL_MAC_LEN, mac_len, NULL) <= 0 || EVP_DigestUpdate(mac, iv, ivlen) <= 0 || EVP_DigestUpdate(mac, shared_key, shared_len) <= 0 /* As we set MAC length directly, we should not allow overwriting it */ @@ -137,8 +139,8 @@ int gost_kimp15(const unsigned char *expkey, const size_t expkeylen, } if (EVP_DigestInit_ex(mac, EVP_get_digestbynid(mac_nid), NULL) <= 0 - || EVP_MD_CTX_ctrl(mac, EVP_MD_CTRL_SET_KEY, 32, mac_key) <= 0 - || EVP_MD_CTX_ctrl(mac, EVP_MD_CTRL_MAC_LEN, mac_len, NULL) <= 0 + || omac_imit_ctrl(mac, EVP_MD_CTRL_SET_KEY, 32, mac_key) <= 0 + || omac_imit_ctrl(mac, EVP_MD_CTRL_MAC_LEN, mac_len, NULL) <= 0 || EVP_DigestUpdate(mac, iv, ivlen) <= 0 || EVP_DigestUpdate(mac, out, shared_len) <= 0 /* As we set MAC length directly, we should not allow overwriting it */ |