[CRYPTO] digest: Remove old HMAC implementation

This patch removes the old HMAC implementation now that nobody uses it
anymore.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/crypto/Kconfig b/crypto/Kconfig
index f07d9237950f55d1b4707ac7553138b5e738e53f..1e2f39c211801adb4a8d80eaa288647cc524ba3d 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -33,7 +33,7 @@ config CRYPTO_MANAGER
          cbc(aes).
 
 config CRYPTO_HMAC
-       bool "HMAC support"
+       tristate "HMAC support"
        select CRYPTO_HASH
        help
          HMAC: Keyed-Hashing for Message Authentication (RFC2104).

diff --git a/crypto/digest.c b/crypto/digest.c
index 5873063db8400677d69b26e7dc22ab7f89bd92eb..0155a94e4b15432b636559124370436fa8edf5af 100644 (file)
--- a/crypto/digest.c
+++ b/crypto/digest.c
@@ -191,10 +191,9 @@ int crypto_init_digest_ops(struct crypto_tfm *tfm)
        ops->setkey     = dalg->dia_setkey ? setkey : nosetkey;
        ops->digestsize = dalg->dia_digestsize;
        
-       return crypto_alloc_hmac_block(tfm);
+       return 0;
 }
 
 void crypto_exit_digest_ops(struct crypto_tfm *tfm)
 {
-       crypto_free_hmac_block(tfm);
 }

diff --git a/crypto/hmac.c b/crypto/hmac.c
index eac77e2947407082dd8da78946296c1895403ea5..f403b6946047161db8ea6a11e023f51d9598c0cb 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);

diff --git a/crypto/internal.h b/crypto/internal.h
index 93d9b10ff91451ab69bdfd52f47d0de62580e09e..2da6ad4f3593a064a035e9ba796c2c530a269876 100644 (file)
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -73,19 +73,6 @@ static inline void crypto_yield(u32 flags)
                cond_resched();
 }
 
-#ifdef CONFIG_CRYPTO_HMAC
-int crypto_alloc_hmac_block(struct crypto_tfm *tfm);
-void crypto_free_hmac_block(struct crypto_tfm *tfm);
-#else
-static inline int crypto_alloc_hmac_block(struct crypto_tfm *tfm)
-{
-       return 0;
-}
-
-static inline void crypto_free_hmac_block(struct crypto_tfm *tfm)
-{ }
-#endif
-
 #ifdef CONFIG_PROC_FS
 void __init crypto_init_proc(void);
 void __exit crypto_exit_proc(void);

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 40c0aab8ad4c94ad02cdda019683a72134540b25..929fb9ad131475e37c52008e412e9506fe4938e1 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -295,9 +295,6 @@ struct hash_tfm {
                      unsigned int nsg, u8 *out);
        int (*setkey)(struct crypto_hash *tfm, const u8 *key,
                      unsigned int keylen);
-#ifdef CONFIG_CRYPTO_HMAC
-       void *hmac_block;
-#endif
        unsigned int digestsize;
 };
 
@@ -872,18 +869,5 @@ static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
        return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);
 }
 
-/*
- * HMAC support.
- */
-#ifdef CONFIG_CRYPTO_HMAC
-void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen);
-void crypto_hmac_update(struct crypto_tfm *tfm,
-                        struct scatterlist *sg, unsigned int nsg);
-void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
-                       unsigned int *keylen, u8 *out);
-void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
-                 struct scatterlist *sg, unsigned int nsg, u8 *out);
-#endif /* CONFIG_CRYPTO_HMAC */
-
 #endif /* _LINUX_CRYPTO_H */