[CRYPTO] users: Use crypto_hash interface instead of crypto_digest

This patch converts all remaining crypto_digest users to use the new
crypto_hash interface.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 22 insertions, 12 deletions

diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index 495d8667419a..e7a0eb4fca60 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -65,12 +65,13 @@ MODULE_LICENSE("Dual BSD/GPL");
 MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE));
 MODULE_VERSION("1.0.2");
 
-static void
+static unsigned int
 setup_sg(struct scatterlist *sg, const void *address, unsigned int length)
 {
         sg[0].page = virt_to_page(address);
         sg[0].offset = offset_in_page(address);
         sg[0].length = length;
+        return length;
 }
 
 #define SHA1_PAD_SIZE 40
@@ -97,7 +98,7 @@ static inline void sha_pad_init(struct sha_pad *shapad)
  */
 struct ppp_mppe_state {
         struct crypto_blkcipher *arc4;
-        struct crypto_tfm *sha1;
+        struct crypto_hash *sha1;
         unsigned char *sha1_digest;
         unsigned char master_key[MPPE_MAX_KEY_LEN];
         unsigned char session_key[MPPE_MAX_KEY_LEN];
@@ -137,14 +138,21 @@ struct ppp_mppe_state {
  */
 static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *InterimKey)
 {
+        struct hash_desc desc;
         struct scatterlist sg[4];
+        unsigned int nbytes;
 
-        setup_sg(&sg[0], state->master_key, state->keylen);
-        setup_sg(&sg[1], sha_pad->sha_pad1, sizeof(sha_pad->sha_pad1));
-        setup_sg(&sg[2], state->session_key, state->keylen);
-        setup_sg(&sg[3], sha_pad->sha_pad2, sizeof(sha_pad->sha_pad2));
+        nbytes = setup_sg(&sg[0], state->master_key, state->keylen);
+        nbytes += setup_sg(&sg[1], sha_pad->sha_pad1,
+                           sizeof(sha_pad->sha_pad1));
+        nbytes += setup_sg(&sg[2], state->session_key, state->keylen);
+        nbytes += setup_sg(&sg[3], sha_pad->sha_pad2,
+                           sizeof(sha_pad->sha_pad2));
 
-        crypto_digest_digest (state->sha1, sg, 4, state->sha1_digest);
+        desc.tfm = state->sha1;
+        desc.flags = 0;
+
+        crypto_hash_digest(&desc, sg, nbytes, state->sha1_digest);
 
         memcpy(InterimKey, state->sha1_digest, state->keylen);
 }
@@ -204,11 +212,13 @@ static void *mppe_alloc(unsigned char *options, int optlen)
                 goto out_free;
         }
 
-        state->sha1 = crypto_alloc_tfm("sha1", 0);
-        if (!state->sha1)
+        state->sha1 = crypto_alloc_hash("sha1", 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(state->sha1)) {
+                state->sha1 = NULL;
                 goto out_free;
+        }
 
-        digestsize = crypto_tfm_alg_digestsize(state->sha1);
+        digestsize = crypto_hash_digestsize(state->sha1);
         if (digestsize < MPPE_MAX_KEY_LEN)
                 goto out_free;
 
@@ -233,7 +243,7 @@ static void *mppe_alloc(unsigned char *options, int optlen)
             if (state->sha1_digest)
                 kfree(state->sha1_digest);
             if (state->sha1)
-                crypto_free_tfm(state->sha1);
+                crypto_free_hash(state->sha1);
             if (state->arc4)
                 crypto_free_blkcipher(state->arc4);
             kfree(state);
@@ -251,7 +261,7 @@ static void mppe_free(void *arg)
             if (state->sha1_digest)
                 kfree(state->sha1_digest);
             if (state->sha1)
-                crypto_free_tfm(state->sha1);
+                crypto_free_hash(state->sha1);
             if (state->arc4)
                 crypto_free_blkcipher(state->arc4);
             kfree(state);