Use supplied ENGINE when initialising CMAC. Restore pctx setting.

diff --git a/crypto/cmac/cm_pmeth.c b/crypto/cmac/cm_pmeth.c
index 585fc8e4bb7266baac3d25949c863fcb29ef92aa..c581e789f7a0cf4bcc25fe74b43497e9cc830882 100644 (file)
--- a/crypto/cmac/cm_pmeth.c
+++ b/crypto/cmac/cm_pmeth.c
@@ -138,7 +138,7 @@ static int pkey_cmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                break;
 
                case EVP_PKEY_CTRL_CIPHER:
-               if (!CMAC_Init(cmctx, NULL, 0, p2, NULL))
+               if (!CMAC_Init(cmctx, NULL, 0, p2, ctx->engine))
                        return 0;
                break;
 

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 2fd35a90e4d0c2be4c3a99681079cfab7f1126cd..c7b7390b5eb64f1c010357dd0509d4a24b3d3f11 100644 (file)
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -113,6 +113,8 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
                }
        if (EVP_PKEY_CTX_set_signature_md(ctx->pctx, type) <= 0)
                return 0;
+       if (pctx)
+               *pctx = ctx->pctx;
        if (ctx->pctx->pmeth->flags & EVP_PKEY_FLAG_SIGCTX_CUSTOM)
                return 1;
        if (!EVP_DigestInit_ex(ctx, type, e))