This commit was generated by cvs2git to track changes on a CVS vendor

branch.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index b2d8de3a8d..5481d4b8a5 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -134,6 +134,8 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
                 id = pkey->ameth->pkey_id;
                 }
 #ifndef OPENSSL_NO_ENGINE
+        if (pkey && pkey->engine)
+                e = pkey->engine;
         /* Try to find an ENGINE which implements this method */
         if (e)
                 {