1 files changed, 203 insertions, 75 deletions

diff --git a/crypto/hmac.c b/crypto/hmac.c
index 46120dee5ada..f403b6946047 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -4,121 +4,249 @@
  * HMAC: Keyed-Hashing for Message Authentication (RFC2104).
  *
  * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+ * Copyright (c) 2006 Herbert Xu <herbert@gondor.apana.org.au>
  *
  * The HMAC implementation is derived from USAGI.
  * Copyright (c) 2002 Kazunori Miyazawa <miyazawa@linux-ipv6.org> / USAGI
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option) 
+ * Software Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
  */
-#include <linux/crypto.h>
-#include <linux/mm.h>
-#include <linux/highmem.h>
-#include <linux/slab.h>
+
+#include <crypto/algapi.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/scatterlist.h>
-#include "internal.h"
+#include <linux/slab.h>
+#include <linux/string.h>
 
-static void hash_key(struct crypto_tfm *tfm, u8 *key, unsigned int keylen)
+struct hmac_ctx {
+        struct crypto_hash *child;
+};
+
+static inline void *align_ptr(void *p, unsigned int align)
 {
-        struct scatterlist tmp;
-        
-        sg_set_buf(&tmp, key, keylen);
-        crypto_digest_digest(tfm, &tmp, 1, key);
+        return (void *)ALIGN((unsigned long)p, align);
 }
 
-int crypto_alloc_hmac_block(struct crypto_tfm *tfm)
+static inline struct hmac_ctx *hmac_ctx(struct crypto_hash *tfm)
 {
-        int ret = 0;
+        return align_ptr(crypto_hash_ctx_aligned(tfm) +
+                         crypto_hash_blocksize(tfm) * 2 +
+                         crypto_hash_digestsize(tfm), sizeof(void *));
+}
+
+static int hmac_setkey(struct crypto_hash *parent,
+                       const u8 *inkey, unsigned int keylen)
+{
+        int bs = crypto_hash_blocksize(parent);
+        int ds = crypto_hash_digestsize(parent);
+        char *ipad = crypto_hash_ctx_aligned(parent);
+        char *opad = ipad + bs;
+        char *digest = opad + bs;
+        struct hmac_ctx *ctx = align_ptr(digest + ds, sizeof(void *));
+        struct crypto_hash *tfm = ctx->child;
+        unsigned int i;
+
+        if (keylen > bs) {
+                struct hash_desc desc;
+                struct scatterlist tmp;
+                int err;
+
+                desc.tfm = tfm;
+                desc.flags = crypto_hash_get_flags(parent);
+                desc.flags &= CRYPTO_TFM_REQ_MAY_SLEEP;
+                sg_set_buf(&tmp, inkey, keylen);
 
-        BUG_ON(!crypto_tfm_alg_blocksize(tfm));
-        
-        tfm->crt_digest.dit_hmac_block = kmalloc(crypto_tfm_alg_blocksize(tfm),
-                                                 GFP_KERNEL);
-        if (tfm->crt_digest.dit_hmac_block == NULL)
-                ret = -ENOMEM;
+                err = crypto_hash_digest(&desc, &tmp, keylen, digest);
+                if (err)
+                        return err;
 
-        return ret;
-                
+                inkey = digest;
+                keylen = ds;
+        }
+
+        memcpy(ipad, inkey, keylen);
+        memset(ipad + keylen, 0, bs - keylen);
+        memcpy(opad, ipad, bs);
+
+        for (i = 0; i < bs; i++) {
+                ipad[i] ^= 0x36;
+                opad[i] ^= 0x5c;
+        }
+
+        return 0;
 }
 
-void crypto_free_hmac_block(struct crypto_tfm *tfm)
+static int hmac_init(struct hash_desc *pdesc)
 {
-        kfree(tfm->crt_digest.dit_hmac_block);
+        struct crypto_hash *parent = pdesc->tfm;
+        int bs = crypto_hash_blocksize(parent);
+        int ds = crypto_hash_digestsize(parent);
+        char *ipad = crypto_hash_ctx_aligned(parent);
+        struct hmac_ctx *ctx = align_ptr(ipad + bs * 2 + ds, sizeof(void *));
+        struct hash_desc desc;
+        struct scatterlist tmp;
+
+        desc.tfm = ctx->child;
+        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+        sg_set_buf(&tmp, ipad, bs);
+
+        return unlikely(crypto_hash_init(&desc)) ?:
+               crypto_hash_update(&desc, &tmp, 1);
 }
 
-void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen)
+static int hmac_update(struct hash_desc *pdesc,
+                       struct scatterlist *sg, unsigned int nbytes)
 {
-        unsigned int i;
+        struct hmac_ctx *ctx = hmac_ctx(pdesc->tfm);
+        struct hash_desc desc;
+
+        desc.tfm = ctx->child;
+        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+
+        return crypto_hash_update(&desc, sg, nbytes);
+}
+
+static int hmac_final(struct hash_desc *pdesc, u8 *out)
+{
+        struct crypto_hash *parent = pdesc->tfm;
+        int bs = crypto_hash_blocksize(parent);
+        int ds = crypto_hash_digestsize(parent);
+        char *opad = crypto_hash_ctx_aligned(parent) + bs;
+        char *digest = opad + bs;
+        struct hmac_ctx *ctx = align_ptr(digest + ds, sizeof(void *));
+        struct hash_desc desc;
         struct scatterlist tmp;
-        char *ipad = tfm->crt_digest.dit_hmac_block;
-        
-        if (*keylen > crypto_tfm_alg_blocksize(tfm)) {
-                hash_key(tfm, key, *keylen);
-                *keylen = crypto_tfm_alg_digestsize(tfm);
-        }
 
-        memset(ipad, 0, crypto_tfm_alg_blocksize(tfm));
-        memcpy(ipad, key, *keylen);
+        desc.tfm = ctx->child;
+        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+        sg_set_buf(&tmp, opad, bs + ds);
 
-        for (i = 0; i < crypto_tfm_alg_blocksize(tfm); i++)
-                ipad[i] ^= 0x36;
+        return unlikely(crypto_hash_final(&desc, digest)) ?:
+               crypto_hash_digest(&desc, &tmp, bs + ds, out);
+}
 
-        sg_set_buf(&tmp, ipad, crypto_tfm_alg_blocksize(tfm));
-        
-        crypto_digest_init(tfm);
-        crypto_digest_update(tfm, &tmp, 1);
+static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
+                       unsigned int nbytes, u8 *out)
+{
+        struct crypto_hash *parent = pdesc->tfm;
+        int bs = crypto_hash_blocksize(parent);
+        int ds = crypto_hash_digestsize(parent);
+        char *ipad = crypto_hash_ctx_aligned(parent);
+        char *opad = ipad + bs;
+        char *digest = opad + bs;
+        struct hmac_ctx *ctx = align_ptr(digest + ds, sizeof(void *));
+        struct hash_desc desc;
+        struct scatterlist sg1[2];
+        struct scatterlist sg2[1];
+
+        desc.tfm = ctx->child;
+        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+
+        sg_set_buf(sg1, ipad, bs);
+        sg1[1].page = (void *)sg;
+        sg1[1].length = 0;
+        sg_set_buf(sg2, opad, bs + ds);
+
+        return unlikely(crypto_hash_digest(&desc, sg1, nbytes + bs, digest)) ?:
+               crypto_hash_digest(&desc, sg2, bs + ds, out);
 }
 
-void crypto_hmac_update(struct crypto_tfm *tfm,
-                        struct scatterlist *sg, unsigned int nsg)
+static int hmac_init_tfm(struct crypto_tfm *tfm)
 {
-        crypto_digest_update(tfm, sg, nsg);
+        struct crypto_instance *inst = (void *)tfm->__crt_alg;
+        struct crypto_spawn *spawn = crypto_instance_ctx(inst);
+        struct hmac_ctx *ctx = hmac_ctx(__crypto_hash_cast(tfm));
+
+        tfm = crypto_spawn_tfm(spawn);
+        if (IS_ERR(tfm))
+                return PTR_ERR(tfm);
+
+        ctx->child = crypto_hash_cast(tfm);
+        return 0;
 }
 
-void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
-                       unsigned int *keylen, u8 *out)
+static void hmac_exit_tfm(struct crypto_tfm *tfm)
 {
-        unsigned int i;
-        struct scatterlist tmp;
-        char *opad = tfm->crt_digest.dit_hmac_block;
-        
-        if (*keylen > crypto_tfm_alg_blocksize(tfm)) {
-                hash_key(tfm, key, *keylen);
-                *keylen = crypto_tfm_alg_digestsize(tfm);
-        }
+        struct hmac_ctx *ctx = hmac_ctx(__crypto_hash_cast(tfm));
+        crypto_free_hash(ctx->child);
+}
 
-        crypto_digest_final(tfm, out);
+static void hmac_free(struct crypto_instance *inst)
+{
+        crypto_drop_spawn(crypto_instance_ctx(inst));
+        kfree(inst);
+}
 
-        memset(opad, 0, crypto_tfm_alg_blocksize(tfm));
-        memcpy(opad, key, *keylen);
-                
-        for (i = 0; i < crypto_tfm_alg_blocksize(tfm); i++)
-                opad[i] ^= 0x5c;
+static struct crypto_instance *hmac_alloc(void *param, unsigned int len)
+{
+        struct crypto_instance *inst;
+        struct crypto_alg *alg;
+
+        alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_HASH,
+                                  CRYPTO_ALG_TYPE_HASH_MASK | CRYPTO_ALG_ASYNC);
+        if (IS_ERR(alg))
+                return ERR_PTR(PTR_ERR(alg));
+
+        inst = crypto_alloc_instance("hmac", alg);
+        if (IS_ERR(inst))
+                goto out_put_alg;
+
+        inst->alg.cra_flags = CRYPTO_ALG_TYPE_HASH;
+        inst->alg.cra_priority = alg->cra_priority;
+        inst->alg.cra_blocksize = alg->cra_blocksize;
+        inst->alg.cra_alignmask = alg->cra_alignmask;
+        inst->alg.cra_type = &crypto_hash_type;
+
+        inst->alg.cra_hash.digestsize =
+                (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+                CRYPTO_ALG_TYPE_HASH ? alg->cra_hash.digestsize :
+                                       alg->cra_digest.dia_digestsize;
+
+        inst->alg.cra_ctxsize = sizeof(struct hmac_ctx) +
+                                ALIGN(inst->alg.cra_blocksize * 2 +
+                                      inst->alg.cra_hash.digestsize,
+                                      sizeof(void *));
+
+        inst->alg.cra_init = hmac_init_tfm;
+        inst->alg.cra_exit = hmac_exit_tfm;
+
+        inst->alg.cra_hash.init = hmac_init;
+        inst->alg.cra_hash.update = hmac_update;
+        inst->alg.cra_hash.final = hmac_final;
+        inst->alg.cra_hash.digest = hmac_digest;
+        inst->alg.cra_hash.setkey = hmac_setkey;
+
+out_put_alg:
+        crypto_mod_put(alg);
+        return inst;
+}
 
-        sg_set_buf(&tmp, opad, crypto_tfm_alg_blocksize(tfm));
+static struct crypto_template hmac_tmpl = {
+        .name = "hmac",
+        .alloc = hmac_alloc,
+        .free = hmac_free,
+        .module = THIS_MODULE,
+};
 
-        crypto_digest_init(tfm);
-        crypto_digest_update(tfm, &tmp, 1);
-        
-        sg_set_buf(&tmp, out, crypto_tfm_alg_digestsize(tfm));
-        
-        crypto_digest_update(tfm, &tmp, 1);
-        crypto_digest_final(tfm, out);
+static int __init hmac_module_init(void)
+{
+        return crypto_register_template(&hmac_tmpl);
 }
 
-void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
-                 struct scatterlist *sg, unsigned int nsg, u8 *out)
+static void __exit hmac_module_exit(void)
 {
-        crypto_hmac_init(tfm, key, keylen);
-        crypto_hmac_update(tfm, sg, nsg);
-        crypto_hmac_final(tfm, key, keylen, out);
+        crypto_unregister_template(&hmac_tmpl);
 }
 
-EXPORT_SYMBOL_GPL(crypto_hmac_init);
-EXPORT_SYMBOL_GPL(crypto_hmac_update);
-EXPORT_SYMBOL_GPL(crypto_hmac_final);
-EXPORT_SYMBOL_GPL(crypto_hmac);
+module_init(hmac_module_init);
+module_exit(hmac_module_exit);
 
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("HMAC hash algorithm");