1 files changed, 5 insertions, 6 deletions

diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c
index eca04d3729b3..fe5129d6ff4e 100644
--- a/crypto/mcryptd.c
+++ b/crypto/mcryptd.c
@@ -26,7 +26,6 @@
 #include <linux/sched.h>
 #include <linux/sched/stat.h>
 #include <linux/slab.h>
-#include <linux/hardirq.h>
 
 #define MCRYPTD_MAX_CPU_QLEN 100
 #define MCRYPTD_BATCH 9
@@ -517,10 +516,9 @@ static int mcryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
         if (err)
                 goto out_free_inst;
 
-        type = CRYPTO_ALG_ASYNC;
-        if (alg->cra_flags & CRYPTO_ALG_INTERNAL)
-                type |= CRYPTO_ALG_INTERNAL;
-        inst->alg.halg.base.cra_flags = type;
+        inst->alg.halg.base.cra_flags = CRYPTO_ALG_ASYNC |
+                (alg->cra_flags & (CRYPTO_ALG_INTERNAL |
+                                   CRYPTO_ALG_OPTIONAL_KEY));
 
         inst->alg.halg.digestsize = halg->digestsize;
         inst->alg.halg.statesize = halg->statesize;
@@ -535,7 +533,8 @@ static int mcryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
         inst->alg.finup  = mcryptd_hash_finup_enqueue;
         inst->alg.export = mcryptd_hash_export;
         inst->alg.import = mcryptd_hash_import;
-        inst->alg.setkey = mcryptd_hash_setkey;
+        if (crypto_hash_alg_has_setkey(halg))
+                inst->alg.setkey = mcryptd_hash_setkey;
         inst->alg.digest = mcryptd_hash_digest_enqueue;
 
         err = ahash_register_instance(tmpl, inst);