diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2019-06-08 15:58:19 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2019-06-08 15:58:19 +0300 |
| commit | 79c7bd611a48915dfc1e4796a38309120ce2dd39 (patch) | |
| tree | edc20d0e1e0f91d4ca94528a020aa8300e7a30b0 | |
| parent | 54bce8a3ac563614957571ae984ed3aade5e2b32 (diff) | |
| download | gost-engine-79c7bd611a48915dfc1e4796a38309120ce2dd39.zip gost-engine-79c7bd611a48915dfc1e4796a38309120ce2dd39.tar.gz gost-engine-79c7bd611a48915dfc1e4796a38309120ce2dd39.tar.bz2 | |
Make build against current OpenSSL with --no-deprecated
| -rw-r--r-- | gost_keyexpimp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gost_keyexpimp.c b/gost_keyexpimp.c index 1f058a1..6df1b2a 100644 --- a/gost_keyexpimp.c +++ b/gost_keyexpimp.c @@ -6,6 +6,7 @@ #include "gost_lcl.h" #include "e_gost_err.h" +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 +45,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 +138,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 */ |