Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

Conflicts:

	crypto/Kconfig

7 files changed, 125 insertions, 14 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 07090e9f9bcf..3d1a1e27944f 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -12,9 +12,7 @@ source "crypto/async_tx/Kconfig"
 #
 # Cryptographic API Configuration
 #
-menu "Cryptographic options"
-
-config CRYPTO
+menuconfig CRYPTO
         bool "Cryptographic API"
         help
           This option provides the core Cryptographic API.
@@ -473,5 +471,3 @@ config CRYPTO_TEST
 source "drivers/crypto/Kconfig"
 
 endif   # if CRYPTO
-
-endmenu
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 9348ddd84a56..1c166b47b4cc 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -19,16 +19,41 @@
 #include <linux/module.h>
 #include <linux/seq_file.h>
 
+static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key, unsigned int keylen)
+{
+        struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
+        unsigned long alignmask = crypto_ablkcipher_alignmask(tfm);
+        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 = cipher->setkey(tfm, alignbuffer, keylen);
+        memset(alignbuffer, 0, absize);
+        kfree(buffer);
+        return ret;
+}
+
 static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
                   unsigned int keylen)
 {
         struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
+        unsigned long alignmask = crypto_ablkcipher_alignmask(tfm);
 
         if (keylen < cipher->min_keysize || keylen > cipher->max_keysize) {
                 crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
                 return -EINVAL;
         }
 
+        if ((unsigned long)key & alignmask)
+                return setkey_unaligned(tfm, key, keylen);
+
         return cipher->setkey(tfm, key, keylen);
 }
 
@@ -66,8 +91,10 @@ static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg)
         seq_printf(m, "min keysize  : %u\n", ablkcipher->min_keysize);
         seq_printf(m, "max keysize  : %u\n", ablkcipher->max_keysize);
         seq_printf(m, "ivsize       : %u\n", ablkcipher->ivsize);
-        seq_printf(m, "qlen         : %u\n", ablkcipher->queue->qlen);
-        seq_printf(m, "max qlen     : %u\n", ablkcipher->queue->max_qlen);
+        if (ablkcipher->queue) {
+                seq_printf(m, "qlen         : %u\n", ablkcipher->queue->qlen);
+                seq_printf(m, "max qlen     : %u\n", ablkcipher->queue->max_qlen);
+        }
 }
 
 const struct crypto_type crypto_ablkcipher_type = {
diff --git a/crypto/algapi.c b/crypto/algapi.c
index f137a432061f..38aa9e994703 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -34,7 +34,7 @@ void crypto_larval_error(const char *name, u32 type, u32 mask)
         if (alg) {
                 if (crypto_is_larval(alg)) {
                         struct crypto_larval *larval = (void *)alg;
-                        complete(&larval->completion);
+                        complete_all(&larval->completion);
                 }
                 crypto_mod_put(alg);
         }
@@ -164,7 +164,7 @@ static int __crypto_register_alg(struct crypto_alg *alg,
                                 continue;
 
                         larval->adult = alg;
-                        complete(&larval->completion);
+                        complete_all(&larval->completion);
                         continue;
                 }
 
diff --git a/crypto/api.c b/crypto/api.c
index 33734fd9198f..4ccc5af6c265 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -144,7 +144,7 @@ static void crypto_larval_kill(struct crypto_alg *alg)
         down_write(&crypto_alg_sem);
         list_del(&alg->cra_list);
         up_write(&crypto_alg_sem);
-        complete(&larval->completion);
+        complete_all(&larval->completion);
         crypto_alg_put(alg);
 }
 
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 8edf40c835a7..40a3dcff15bb 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -336,16 +336,41 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc,
         return blkcipher_walk_next(desc, walk);
 }
 
+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
+{
+        struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
+        unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
+        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 = cipher->setkey(tfm, alignbuffer, keylen);
+        memset(alignbuffer, 0, absize);
+        kfree(buffer);
+        return ret;
+}
+
 static int setkey(struct crypto_tfm *tfm, const u8 *key,
                   unsigned int keylen)
 {
         struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
+        unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
 
         if (keylen < cipher->min_keysize || keylen > cipher->max_keysize) {
                 tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
                 return -EINVAL;
         }
 
+        if ((unsigned long)key & alignmask)
+                return setkey_unaligned(tfm, key, keylen);
+
         return cipher->setkey(tfm, key, keylen);
 }
 
diff --git a/crypto/cipher.c b/crypto/cipher.c
index 333aab2f0277..0b2650c2014b 100644
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -20,16 +20,43 @@
 #include <linux/string.h>
 #include "internal.h"
 
+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
+{
+        struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
+        unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
+        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 = cia->cia_setkey(tfm, alignbuffer, keylen);
+        memset(alignbuffer, 0, absize);
+        kfree(buffer);
+        return ret;
+
+}
+
 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
 {
         struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
-        
+        unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
+
         tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
         if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize) {
                 tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
                 return -EINVAL;
-        } else
-                return cia->cia_setkey(tfm, key, keylen);
+        }
+
+        if ((unsigned long)key & alignmask)
+                return setkey_unaligned(tfm, key, keylen);
+
+        return cia->cia_setkey(tfm, key, keylen);
 }
 
 static void cipher_crypt_unaligned(void (*fn)(struct crypto_tfm *, u8 *,
diff --git a/crypto/hash.c b/crypto/hash.c
index 4ccd22deef39..4d75ca7b57b2 100644
--- 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, absize);
+        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,7 +70,7 @@ 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;