diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2016-01-03 23:09:13 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2016-01-03 23:09:13 +0300 |
| commit | a170809d792816448cb4c95f3473531a1a917e69 (patch) | |
| tree | d430da16bdc99cbfea3e49b549631ba979e8ccb8 /gost_pmeth.c | |
| parent | 56c5e3414135c9443739db3b2b1409c3be265a50 (diff) | |
| download | gost-engine-a170809d792816448cb4c95f3473531a1a917e69.zip gost-engine-a170809d792816448cb4c95f3473531a1a917e69.tar.gz gost-engine-a170809d792816448cb4c95f3473531a1a917e69.tar.bz2 | |
openssl 1.1.0 compatibility
Diffstat (limited to 'gost_pmeth.c')
| -rw-r--r-- | gost_pmeth.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gost_pmeth.c b/gost_pmeth.c index 2d580ae..6b38e60 100644 --- a/gost_pmeth.c +++ b/gost_pmeth.c @@ -146,8 +146,10 @@ static int pkey_gost_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) case EVP_PKEY_CTRL_SET_IV: OPENSSL_assert(p2 != NULL); pctx->shared_ukm = OPENSSL_malloc((int)p1); - if (!pctx->shared_ukm) + if (pctx->shared_ukm == NULL) { + GOSTerr(GOST_F_PKEY_GOST_CTRL, ERR_R_MALLOC_FAILURE); return 0; + } memcpy(pctx->shared_ukm, p2, (int)p1); return 1; case EVP_PKEY_CTRL_PEER_KEY: @@ -566,13 +568,12 @@ static int pkey_gost_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) GOST_R_MAC_KEY_NOT_SET); return 0; } - return mctx->digest->md_ctrl(mctx, EVP_MD_CTRL_SET_KEY, 0, - key); + return EVP_MD_meth_get_ctrl(EVP_MD_CTX_md(mctx)) + (mctx, EVP_MD_CTRL_SET_KEY, 0, key); } else { - return mctx->digest->md_ctrl(mctx, EVP_MD_CTRL_SET_KEY, 32, - &(data->key)); + return EVP_MD_meth_get_ctrl(EVP_MD_CTX_md(mctx)) + (mctx, EVP_MD_CTRL_SET_KEY, 32, &(data->key)); } - return mctx->digest->md_ctrl(mctx, EVP_MD_CTRL_SET_KEY, 32, key); } case EVP_PKEY_CTRL_MAC_LEN: { @@ -707,7 +708,8 @@ static int pkey_gost_mac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, return 1; } - mctx->digest->md_ctrl(mctx, EVP_MD_CTRL_MAC_LEN, data->mac_size, NULL); + EVP_MD_meth_get_ctrl(EVP_MD_CTX_md(mctx)) + (mctx, EVP_MD_CTRL_MAC_LEN, data->mac_size, NULL); ret = EVP_DigestFinal_ex(mctx, sig, &tmpsiglen); *siglen = data->mac_size; return ret; |