diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-23 20:17:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-23 20:17:10 +0000 |
| commit | 1b639dab951fb73d5031aa0c1afb13e8480d1dae (patch) | |
| tree | 4e13a4d1e4c609bd01d0bf5d65c6a8acdc3d0c50 /openssl/crypto/evp/pmeth_lib.c | |
| parent | 51181fb7f4d135d214974bb6611d51f21475eec8 (diff) | |
| parent | b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b (diff) | |
| download | vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.tar.gz vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.tar.bz2 vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'openssl/crypto/evp/pmeth_lib.c')
| -rw-r--r-- | openssl/crypto/evp/pmeth_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl/crypto/evp/pmeth_lib.c b/openssl/crypto/evp/pmeth_lib.c index b2d8de3a8..5481d4b8a 100644 --- a/openssl/crypto/evp/pmeth_lib.c +++ b/openssl/crypto/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) { |