crypto: shash - optimize the default digest and finup

[linux-2.6-block.git] / crypto / shash.c

diff --git a/crypto/shash.c b/crypto/shash.c
index 1fadb6b59bdcc1afdd61b280813249327b4025d5..d99dc2f94c65f52afd770ced9751f6750d872c03 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -191,6 +191,15 @@ static int shash_finup_unaligned(struct shash_desc *desc, const u8 *data,
               shash_final_unaligned(desc, out);
 }
 
+static int shash_default_finup(struct shash_desc *desc, const u8 *data,
+                              unsigned int len, u8 *out)
+{
+       struct shash_alg *shash = crypto_shash_alg(desc->tfm);
+
+       return shash->update(desc, data, len) ?:
+              shash->final(desc, out);
+}
+
 int crypto_shash_finup(struct shash_desc *desc, const u8 *data,
                       unsigned int len, u8 *out)
 {
@@ -224,6 +233,15 @@ static int shash_digest_unaligned(struct shash_desc *desc, const u8 *data,
               shash_final_unaligned(desc, out);
 }
 
+static int shash_default_digest(struct shash_desc *desc, const u8 *data,
+                               unsigned int len, u8 *out)
+{
+       struct shash_alg *shash = crypto_shash_alg(desc->tfm);
+
+       return shash->init(desc) ?:
+              shash->finup(desc, data, len, out);
+}
+
 int crypto_shash_digest(struct shash_desc *desc, const u8 *data,
                        unsigned int len, u8 *out)
 {
@@ -656,9 +674,9 @@ static int shash_prepare_alg(struct shash_alg *alg)
        base->cra_flags |= CRYPTO_ALG_TYPE_SHASH;
 
        if (!alg->finup)
-               alg->finup = shash_finup_unaligned;
+               alg->finup = shash_default_finup;
        if (!alg->digest)
-               alg->digest = shash_digest_unaligned;
+               alg->digest = shash_default_digest;
        if (!alg->export) {
                alg->export = shash_default_export;
                alg->import = shash_default_import;