2 files changed, 38 insertions, 25 deletions

diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index d60ce9b49b4f..407a17495b61 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -54,7 +54,7 @@ struct ieee80211_tkip_data {
         int key_idx;
 
         struct crypto_blkcipher *tfm_arc4;
-        struct crypto_tfm *tfm_michael;
+        struct crypto_hash *tfm_michael;
 
         /* scratch buffers for virt_to_page() (crypto API) */
         u8 rx_hdr[16], tx_hdr[16];
@@ -95,10 +95,12 @@ static void *ieee80211_tkip_init(int key_idx)
                 goto fail;
         }
 
-        priv->tfm_michael = crypto_alloc_tfm("michael_mic", 0);
-        if (priv->tfm_michael == NULL) {
+        priv->tfm_michael = crypto_alloc_hash("michael_mic", 0,
+                                              CRYPTO_ALG_ASYNC);
+        if (IS_ERR(priv->tfm_michael)) {
                 printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
                        "crypto API michael_mic\n");
+                priv->tfm_michael = NULL;
                 goto fail;
         }
 
@@ -107,7 +109,7 @@ static void *ieee80211_tkip_init(int key_idx)
       fail:
         if (priv) {
                 if (priv->tfm_michael)
-                        crypto_free_tfm(priv->tfm_michael);
+                        crypto_free_hash(priv->tfm_michael);
                 if (priv->tfm_arc4)
                         crypto_free_blkcipher(priv->tfm_arc4);
                 kfree(priv);
@@ -120,7 +122,7 @@ static void ieee80211_tkip_deinit(void *priv)
 {
         struct ieee80211_tkip_data *_priv = priv;
         if (_priv && _priv->tfm_michael)
-                crypto_free_tfm(_priv->tfm_michael);
+                crypto_free_hash(_priv->tfm_michael);
         if (_priv && _priv->tfm_arc4)
                 crypto_free_blkcipher(_priv->tfm_arc4);
         kfree(priv);
@@ -485,6 +487,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 static int michael_mic(struct ieee80211_tkip_data *tkey, u8 * key, u8 * hdr,
                        u8 * data, size_t data_len, u8 * mic)
 {
+        struct hash_desc desc;
         struct scatterlist sg[2];
 
         if (tkey->tfm_michael == NULL) {
@@ -499,12 +502,12 @@ static int michael_mic(struct ieee80211_tkip_data *tkey, u8 * key, u8 * hdr,
         sg[1].offset = offset_in_page(data);
         sg[1].length = data_len;
 
-        crypto_digest_init(tkey->tfm_michael);
-        crypto_digest_setkey(tkey->tfm_michael, key, 8);
-        crypto_digest_update(tkey->tfm_michael, sg, 2);
-        crypto_digest_final(tkey->tfm_michael, mic);
+        if (crypto_hash_setkey(tkey->tfm_michael, key, 8))
+                return -1;
 
-        return 0;
+        desc.tfm = tkey->tfm_michael;
+        desc.flags = 0;
+        return crypto_hash_digest(&desc, sg, data_len + 16, mic);
 }
 
 static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr)
@@ -628,7 +631,7 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 * seq, void *priv)
 {
         struct ieee80211_tkip_data *tkey = priv;
         int keyidx;
-        struct crypto_tfm *tfm = tkey->tfm_michael;
+        struct crypto_hash *tfm = tkey->tfm_michael;
         struct crypto_blkcipher *tfm2 = tkey->tfm_arc4;
 
         keyidx = tkey->key_idx;
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 57192dfe3065..e11a40b25cce 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -34,6 +34,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/err.h>
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
@@ -199,11 +200,9 @@ out:
 static int
 checksummer(struct scatterlist *sg, void *data)
 {
-        struct crypto_tfm *tfm = (struct crypto_tfm *)data;
+        struct hash_desc *desc = data;
 
-        crypto_digest_update(tfm, sg, 1);
-
-        return 0;
+        return crypto_hash_update(desc, sg, sg->length);
 }
 
 /* checksum the plaintext data and hdrlen bytes of the token header */
@@ -212,8 +211,9 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
                    int body_offset, struct xdr_netobj *cksum)
 {
         char                            *cksumname;
-        struct crypto_tfm               *tfm = NULL; /* XXX add to ctx? */
+        struct hash_desc                desc; /* XXX add to ctx? */
         struct scatterlist              sg[1];
+        int err;
 
         switch (cksumtype) {
                 case CKSUMTYPE_RSA_MD5:
@@ -224,18 +224,28 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
                                 " unsupported checksum %d", cksumtype);
                         return GSS_S_FAILURE;
         }
-        if (!(tfm = crypto_alloc_tfm(cksumname, CRYPTO_TFM_REQ_MAY_SLEEP)))
+        desc.tfm = crypto_alloc_hash(cksumname, 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(desc.tfm))
                 return GSS_S_FAILURE;
-        cksum->len = crypto_tfm_alg_digestsize(tfm);
+        cksum->len = crypto_hash_digestsize(desc.tfm);
+        desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
-        crypto_digest_init(tfm);
+        err = crypto_hash_init(&desc);
+        if (err)
+                goto out;
         sg_set_buf(sg, header, hdrlen);
-        crypto_digest_update(tfm, sg, 1);
-        process_xdr_buf(body, body_offset, body->len - body_offset,
-                        checksummer, tfm);
-        crypto_digest_final(tfm, cksum->data);
-        crypto_free_tfm(tfm);
-        return 0;
+        err = crypto_hash_update(&desc, sg, hdrlen);
+        if (err)
+                goto out;
+        err = process_xdr_buf(body, body_offset, body->len - body_offset,
+                              checksummer, &desc);
+        if (err)
+                goto out;
+        err = crypto_hash_final(&desc, cksum->data);
+
+out:
+        crypto_free_hash(desc.tfm);
+        return err ? GSS_S_FAILURE : 0;
 }
 
 EXPORT_SYMBOL(make_checksum);