Fixes for EVP_DigestInit_ex() and OPENSSL_NO_ENGINE.

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 5b2104ac120f77ab1aa85aebd1a06d8f59ca4b2b..b22eed442115b544dd9b0348c3200e79b47a89f7 100644 (file)
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -187,12 +187,12 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
                        ctx->engine = NULL;
                }
        else
-#endif
        if(!ctx->digest)
                {
                EVPerr(EVP_F_EVP_DIGESTINIT, EVP_R_NO_DIGEST_SET);
                return 0;
                }
+#endif
        if (ctx->digest != type)
                {
                if (ctx->digest && ctx->digest->ctx_size)