crypto: shash - Move finup/digest null checks to registration time

[mirror_ubuntu-bionic-kernel.git] / crypto / shash.c

diff --git a/crypto/shash.c b/crypto/shash.c
index 14a3b707a31f281dae7b3096f869c0931ba2aaf3..f7fcc652ff3260996b1ec13afe8474a3b09e25b4 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -142,8 +142,7 @@ int crypto_shash_finup(struct shash_desc *desc, const u8 *data,
        struct shash_alg *shash = crypto_shash_alg(tfm);
        unsigned long alignmask = crypto_shash_alignmask(tfm);
 
-       if (((unsigned long)data | (unsigned long)out) & alignmask ||
-           !shash->finup)
+       if (((unsigned long)data | (unsigned long)out) & alignmask)
                return shash_finup_unaligned(desc, data, len, out);
 
        return shash->finup(desc, data, len, out);
@@ -164,8 +163,7 @@ int crypto_shash_digest(struct shash_desc *desc, const u8 *data,
        struct shash_alg *shash = crypto_shash_alg(tfm);
        unsigned long alignmask = crypto_shash_alignmask(tfm);
 
-       if (((unsigned long)data | (unsigned long)out) & alignmask ||
-           !shash->digest)
+       if (((unsigned long)data | (unsigned long)out) & alignmask)
                return shash_digest_unaligned(desc, data, len, out);
 
        return shash->digest(desc, data, len, out);
@@ -488,6 +486,10 @@ static int shash_prepare_alg(struct shash_alg *alg)
        base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;
        base->cra_flags |= CRYPTO_ALG_TYPE_SHASH;
 
+       if (!alg->finup)
+               alg->finup = shash_finup_unaligned;
+       if (!alg->digest)
+               alg->digest = shash_digest_unaligned;
        if (!alg->import)
                alg->import = shash_no_import;
        if (!alg->export)