Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / crypto / hash.c

diff --git a/crypto/hash.c b/crypto/hash.c
index 12c4514..4fd470b 100644 (file)
--- a/crypto/hash.c
+++ b/crypto/hash.c
@@ -22,6 +22,42 @@ static unsigned int crypto_hash_ctxsize(struct crypto_alg *alg, u32 type,
        return alg->cra_ctxsize;
 }
 
+static int hash_setkey_unaligned(struct crypto_hash *crt, const u8 *key,
+                                unsigned int keylen)
+{
+       struct crypto_tfm *tfm = crypto_hash_tfm(crt);
+       struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+       unsigned long alignmask = crypto_hash_alignmask(crt);
+       int ret;
+       u8 *buffer, *alignbuffer;
+       unsigned long absize;
+
+       absize = keylen + alignmask;
+       buffer = kmalloc(absize, GFP_ATOMIC);
+       if (!buffer)
+               return -ENOMEM;
+
+       alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
+       memcpy(alignbuffer, key, keylen);
+       ret = alg->setkey(crt, alignbuffer, keylen);
+       memset(alignbuffer, 0, keylen);
+       kfree(buffer);
+       return ret;
+}
+
+static int hash_setkey(struct crypto_hash *crt, const u8 *key,
+               unsigned int keylen)
+{
+       struct crypto_tfm *tfm = crypto_hash_tfm(crt);
+       struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+       unsigned long alignmask = crypto_hash_alignmask(crt);
+
+       if ((unsigned long)key & alignmask)
+               return hash_setkey_unaligned(crt, key, keylen);
+
+       return alg->setkey(crt, key, keylen);
+}
+
 static int crypto_init_hash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
 {
        struct hash_tfm *crt = &tfm->crt_hash;
@@ -34,14 +70,14 @@ static int crypto_init_hash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
        crt->update = alg->update;
        crt->final = alg->final;
        crt->digest = alg->digest;
-       crt->setkey = alg->setkey;
+       crt->setkey = hash_setkey;
        crt->digestsize = alg->digestsize;
 
        return 0;
 }
 
 static void crypto_hash_show(struct seq_file *m, struct crypto_alg *alg)
-       __attribute_used__;
+       __attribute__ ((unused));
 static void crypto_hash_show(struct seq_file *m, struct crypto_alg *alg)
 {
        seq_printf(m, "type         : hash\n");