Add EVP_PKEY_set1_engine() function.

[openssl.git] / crypto / evp / pmeth_lib.c

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 35e525b..37c5e85 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -106,7 +106,7 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
     }
 #ifndef OPENSSL_NO_ENGINE
     if (e == NULL && pkey != NULL)
     }
 #ifndef OPENSSL_NO_ENGINE
     if (e == NULL && pkey != NULL)

-        e = pkey->engine;
+        e = pkey->pmeth_engine != NULL ? pkey->pmeth_engine : pkey->engine;

     /* Try to find an ENGINE which implements this method */
     if (e) {
         if (!ENGINE_init(e)) {
     /* Try to find an ENGINE which implements this method */
     if (e) {
         if (!ENGINE_init(e)) {