diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2002-03-09 18:58:05 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2002-03-09 18:58:05 +0000 |
commit | bf6a9e66d6b339770dcc8733f97fd6eb10d58d6c (patch) | |
tree | 567122ac858d12dba01d3c45085a883a29c5b465 /crypto | |
parent | 0c372b94f77bebed947b6a5d217a141a3259b3ed (diff) |
Make ciphers and digests obtain an ENGINE functional reference
if impl is explicitly supplied.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/evp/digest.c | 10 | ||||
-rw-r--r-- | crypto/evp/evp_enc.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 12c6cec5d8..a969ac69ed 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -152,7 +152,15 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl) * ENGINE and EVP_MD could be used). */ if(ctx->engine) ENGINE_finish(ctx->engine); - if(!impl) + if(impl) + { + if (!ENGINE_init(impl)) + { + EVPerr(EVP_F_EVP_DIGESTINIT, EVP_R_INITIALIZATION_ERROR); + return 0; + } + } + else /* Ask if an ENGINE is reserved for this job */ impl = ENGINE_get_digest_engine(type->type); if(impl) diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 9c65a553d3..22a7b745c1 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -100,7 +100,15 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp * ENGINE and EVP_CIPHER could be used). */ if(ctx->engine) ENGINE_finish(ctx->engine); - if(!impl) + if(impl) + { + if (!ENGINE_init(impl)) + { + EVPerr(EVP_F_EVP_CIPHERINIT, EVP_R_INITIALIZATION_ERROR); + return 0; + } + } + else /* Ask if an ENGINE is reserved for this job */ impl = ENGINE_get_cipher_engine(cipher->nid); if(impl) |