6 files changed, 35 insertions, 15 deletions

diff --git a/crypto/digest.c b/crypto/digest.c
index d9b6ac9dbf8d..062d0a5a2c89 100644
--- a/crypto/digest.c
+++ b/crypto/digest.c
@@ -27,6 +27,7 @@ static void update(struct crypto_tfm *tfm,
                    struct scatterlist *sg, unsigned int nsg)
 {
         unsigned int i;
+        unsigned int alignmask = crypto_tfm_alg_alignmask(tfm);
 
         for (i = 0; i < nsg; i++) {
 
@@ -38,12 +39,24 @@ static void update(struct crypto_tfm *tfm,
                         unsigned int bytes_from_page = min(l, ((unsigned int)
                                                            (PAGE_SIZE)) - 
                                                            offset);
-                        char *p = crypto_kmap(pg, 0) + offset;
+                        char *src = crypto_kmap(pg, 0);
+                        char *p = src + offset;
 
+                        if (unlikely(offset & alignmask)) {
+                                unsigned int bytes =
+                                        alignmask + 1 - (offset & alignmask);
+                                bytes = min(bytes, bytes_from_page);
+                                tfm->__crt_alg->cra_digest.dia_update
+                                                (crypto_tfm_ctx(tfm), p,
+                                                 bytes);
+                                p += bytes;
+                                bytes_from_page -= bytes;
+                                l -= bytes;
+                        }
                         tfm->__crt_alg->cra_digest.dia_update
                                         (crypto_tfm_ctx(tfm), p,
                                          bytes_from_page);
-                        crypto_kunmap(p, 0);
+                        crypto_kunmap(src, 0);
                         crypto_yield(tfm);
                         offset = 0;
                         pg++;
@@ -54,7 +67,15 @@ static void update(struct crypto_tfm *tfm,
 
 static void final(struct crypto_tfm *tfm, u8 *out)
 {
-        tfm->__crt_alg->cra_digest.dia_final(crypto_tfm_ctx(tfm), out);
+        unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
+        if (unlikely((unsigned long)out & alignmask)) {
+                unsigned int size = crypto_tfm_alg_digestsize(tfm);
+                u8 buffer[size + alignmask];
+                u8 *dst = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
+                tfm->__crt_alg->cra_digest.dia_final(crypto_tfm_ctx(tfm), dst);
+                memcpy(out, dst, size);
+        } else
+                tfm->__crt_alg->cra_digest.dia_final(crypto_tfm_ctx(tfm), out);
 }
 
 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
@@ -69,18 +90,9 @@ static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
 static void digest(struct crypto_tfm *tfm,
                    struct scatterlist *sg, unsigned int nsg, u8 *out)
 {
-        unsigned int i;
-
-        tfm->crt_digest.dit_init(tfm);
-                
-        for (i = 0; i < nsg; i++) {
-                char *p = crypto_kmap(sg[i].page, 0) + sg[i].offset;
-                tfm->__crt_alg->cra_digest.dia_update(crypto_tfm_ctx(tfm),
-                                                      p, sg[i].length);
-                crypto_kunmap(p, 0);
-                crypto_yield(tfm);
-        }
-        crypto_digest_final(tfm, out);
+        init(tfm);
+        update(tfm, sg, nsg);
+        final(tfm, out);
 }
 
 int crypto_init_digest_flags(struct crypto_tfm *tfm, u32 flags)
diff --git a/crypto/michael_mic.c b/crypto/michael_mic.c
index 4f6ab23e14ad..701f859ed767 100644
--- a/crypto/michael_mic.c
+++ b/crypto/michael_mic.c
@@ -145,6 +145,7 @@ static struct crypto_alg michael_mic_alg = {
         .cra_blocksize  = 8,
         .cra_ctxsize    = sizeof(struct michael_mic_ctx),
         .cra_module     = THIS_MODULE,
+        .cra_alignmask  = 3,
         .cra_list       = LIST_HEAD_INIT(michael_mic_alg.cra_list),
         .cra_u          = { .digest = {
         .dia_digestsize = 8,
diff --git a/crypto/sha1.c b/crypto/sha1.c
index 21571ed35b7e..b96f57d95a82 100644
--- a/crypto/sha1.c
+++ b/crypto/sha1.c
@@ -112,6 +112,7 @@ static struct crypto_alg alg = {
         .cra_blocksize  =       SHA1_HMAC_BLOCK_SIZE,
         .cra_ctxsize    =       sizeof(struct sha1_ctx),
         .cra_module     =       THIS_MODULE,
+        .cra_alignmask  =       3,
         .cra_list       =       LIST_HEAD_INIT(alg.cra_list),
         .cra_u          =       { .digest = {
         .dia_digestsize =       SHA1_DIGEST_SIZE,
diff --git a/crypto/sha256.c b/crypto/sha256.c
index 9d5ef674d6a9..d62264a8a33e 100644
--- a/crypto/sha256.c
+++ b/crypto/sha256.c
@@ -313,6 +313,7 @@ static struct crypto_alg alg = {
         .cra_blocksize  =       SHA256_HMAC_BLOCK_SIZE,
         .cra_ctxsize    =       sizeof(struct sha256_ctx),
         .cra_module     =       THIS_MODULE,
+        .cra_alignmask  =       3,
         .cra_list       =       LIST_HEAD_INIT(alg.cra_list),
         .cra_u          =       { .digest = {
         .dia_digestsize =       SHA256_DIGEST_SIZE,
diff --git a/crypto/sha512.c b/crypto/sha512.c
index 3e6e9392310c..7dbec4f6b947 100644
--- a/crypto/sha512.c
+++ b/crypto/sha512.c
@@ -281,6 +281,7 @@ static struct crypto_alg sha512 = {
         .cra_blocksize  = SHA512_HMAC_BLOCK_SIZE,
         .cra_ctxsize    = sizeof(struct sha512_ctx),
         .cra_module     = THIS_MODULE,
+        .cra_alignmask  = 3,
         .cra_list       = LIST_HEAD_INIT(sha512.cra_list),
         .cra_u          = { .digest = {
                                 .dia_digestsize = SHA512_DIGEST_SIZE,
@@ -295,6 +296,7 @@ static struct crypto_alg sha384 = {
         .cra_flags      = CRYPTO_ALG_TYPE_DIGEST,
         .cra_blocksize  = SHA384_HMAC_BLOCK_SIZE,
         .cra_ctxsize    = sizeof(struct sha512_ctx),
+        .cra_alignmask  = 3,
         .cra_module     = THIS_MODULE,
         .cra_list       = LIST_HEAD_INIT(sha384.cra_list),
         .cra_u          = { .digest = {
diff --git a/crypto/tgr192.c b/crypto/tgr192.c
index 2d8e44f6fbe9..1eae1bb7e495 100644
--- a/crypto/tgr192.c
+++ b/crypto/tgr192.c
@@ -627,6 +627,7 @@ static struct crypto_alg tgr192 = {
         .cra_blocksize = TGR192_BLOCK_SIZE,
         .cra_ctxsize = sizeof(struct tgr192_ctx),
         .cra_module = THIS_MODULE,
+        .cra_alignmask = 7,
         .cra_list = LIST_HEAD_INIT(tgr192.cra_list),
         .cra_u = {.digest = {
                              .dia_digestsize = TGR192_DIGEST_SIZE,
@@ -641,6 +642,7 @@ static struct crypto_alg tgr160 = {
         .cra_blocksize = TGR192_BLOCK_SIZE,
         .cra_ctxsize = sizeof(struct tgr192_ctx),
         .cra_module = THIS_MODULE,
+        .cra_alignmask = 7,
         .cra_list = LIST_HEAD_INIT(tgr160.cra_list),
         .cra_u = {.digest = {
                              .dia_digestsize = TGR160_DIGEST_SIZE,
@@ -655,6 +657,7 @@ static struct crypto_alg tgr128 = {
         .cra_blocksize = TGR192_BLOCK_SIZE,
         .cra_ctxsize = sizeof(struct tgr192_ctx),
         .cra_module = THIS_MODULE,
+        .cra_alignmask = 7,
         .cra_list = LIST_HEAD_INIT(tgr128.cra_list),
         .cra_u = {.digest = {
                              .dia_digestsize = TGR128_DIGEST_SIZE,