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

[linux-drm-fsl-dcu.git] / crypto / hmac.c

diff --git a/crypto/hmac.c b/crypto/hmac.c
index eac77e2947407082dd8da78946296c1895403ea5..44187c5ee5933cbf9195ec799d337053ef0e0b8e 100644 (file)
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -29,107 +29,6 @@ struct hmac_ctx {
        struct crypto_hash *child;
 };
 
-static void hash_key(struct crypto_tfm *tfm, u8 *key, unsigned int keylen)
-{
-       struct scatterlist tmp;
-       
-       sg_set_buf(&tmp, key, keylen);
-       crypto_digest_digest(tfm, &tmp, 1, key);
-}
-
-int crypto_alloc_hmac_block(struct crypto_tfm *tfm)
-{
-       int ret = 0;
-
-       BUG_ON(!crypto_tfm_alg_blocksize(tfm));
-       
-       tfm->crt_hash.hmac_block = kmalloc(crypto_tfm_alg_blocksize(tfm),
-                                          GFP_KERNEL);
-       if (tfm->crt_hash.hmac_block == NULL)
-               ret = -ENOMEM;
-
-       return ret;
-               
-}
-
-void crypto_free_hmac_block(struct crypto_tfm *tfm)
-{
-       kfree(tfm->crt_hash.hmac_block);
-}
-
-void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen)
-{
-       unsigned int i;
-       struct scatterlist tmp;
-       char *ipad = tfm->crt_hash.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);
-
-       for (i = 0; i < crypto_tfm_alg_blocksize(tfm); i++)
-               ipad[i] ^= 0x36;
-
-       sg_set_buf(&tmp, ipad, crypto_tfm_alg_blocksize(tfm));
-       
-       crypto_digest_init(tfm);
-       crypto_digest_update(tfm, &tmp, 1);
-}
-
-void crypto_hmac_update(struct crypto_tfm *tfm,
-                        struct scatterlist *sg, unsigned int nsg)
-{
-       crypto_digest_update(tfm, sg, nsg);
-}
-
-void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
-                       unsigned int *keylen, u8 *out)
-{
-       unsigned int i;
-       struct scatterlist tmp;
-       char *opad = tfm->crt_hash.hmac_block;
-       
-       if (*keylen > crypto_tfm_alg_blocksize(tfm)) {
-               hash_key(tfm, key, *keylen);
-               *keylen = crypto_tfm_alg_digestsize(tfm);
-       }
-
-       crypto_digest_final(tfm, out);
-
-       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;
-
-       sg_set_buf(&tmp, opad, crypto_tfm_alg_blocksize(tfm));
-
-       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);
-}
-
-void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
-                 struct scatterlist *sg, unsigned int nsg, u8 *out)
-{
-       crypto_hmac_init(tfm, key, keylen);
-       crypto_hmac_update(tfm, sg, nsg);
-       crypto_hmac_final(tfm, key, keylen, out);
-}
-
-EXPORT_SYMBOL_GPL(crypto_hmac_init);
-EXPORT_SYMBOL_GPL(crypto_hmac_update);
-EXPORT_SYMBOL_GPL(crypto_hmac_final);
-EXPORT_SYMBOL_GPL(crypto_hmac);
-
 static inline void *align_ptr(void *p, unsigned int align)
 {
        return (void *)ALIGN((unsigned long)p, align);
@@ -193,13 +92,17 @@ static int hmac_init(struct hash_desc *pdesc)
        struct hmac_ctx *ctx = align_ptr(ipad + bs * 2 + ds, sizeof(void *));
        struct hash_desc desc;
        struct scatterlist tmp;
+       int err;
 
        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);
+       err = crypto_hash_init(&desc);
+       if (unlikely(err))
+               return err;
+
+       return crypto_hash_update(&desc, &tmp, bs);
 }
 
 static int hmac_update(struct hash_desc *pdesc,
@@ -224,13 +127,17 @@ static int hmac_final(struct hash_desc *pdesc, u8 *out)
        struct hmac_ctx *ctx = align_ptr(digest + ds, sizeof(void *));
        struct hash_desc desc;
        struct scatterlist tmp;
+       int err;
 
        desc.tfm = ctx->child;
        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
        sg_set_buf(&tmp, opad, bs + ds);
 
-       return unlikely(crypto_hash_final(&desc, digest)) ?:
-              crypto_hash_digest(&desc, &tmp, bs + ds, out);
+       err = crypto_hash_final(&desc, digest);
+       if (unlikely(err))
+               return err;
+
+       return crypto_hash_digest(&desc, &tmp, bs + ds, out);
 }
 
 static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
@@ -246,6 +153,7 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
        struct hash_desc desc;
        struct scatterlist sg1[2];
        struct scatterlist sg2[1];
+       int err;
 
        desc.tfm = ctx->child;
        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -255,21 +163,25 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *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);
+       err = crypto_hash_digest(&desc, sg1, nbytes + bs, digest);
+       if (unlikely(err))
+               return err;
+
+       return crypto_hash_digest(&desc, sg2, bs + ds, out);
 }
 
 static int hmac_init_tfm(struct crypto_tfm *tfm)
 {
+       struct crypto_hash *hash;
        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);
+       hash = crypto_spawn_hash(spawn);
+       if (IS_ERR(hash))
+               return PTR_ERR(hash);
 
-       ctx->child = crypto_hash_cast(tfm);
+       ctx->child = hash;
        return 0;
 }