Merge remote-tracking branch 'edac-amd/for-next'

[karo-tx-linux.git] / net / mac802154 / llsec.c

diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c
index a13d02b7cee47401357f1fd7ff5e0dc74becc9ad..6a3e1c2181d3a960febf400594d9c60d3c44e700 100644 (file)
--- a/net/mac802154/llsec.c
+++ b/net/mac802154/llsec.c
@@ -17,9 +17,9 @@
 #include <linux/err.h>
 #include <linux/bug.h>
 #include <linux/completion.h>
-#include <linux/crypto.h>
 #include <linux/ieee802154.h>
 #include <crypto/aead.h>
+#include <crypto/skcipher.h>
 
 #include "ieee802154_i.h"
 #include "llsec.h"
@@ -144,18 +144,18 @@ llsec_key_alloc(const struct ieee802154_llsec_key *template)
                        goto err_tfm;
        }
 
-       key->tfm0 = crypto_alloc_blkcipher("ctr(aes)", 0, CRYPTO_ALG_ASYNC);
+       key->tfm0 = crypto_alloc_skcipher("ctr(aes)", 0, CRYPTO_ALG_ASYNC);
        if (IS_ERR(key->tfm0))
                goto err_tfm;
 
-       if (crypto_blkcipher_setkey(key->tfm0, template->key,
-                                   IEEE802154_LLSEC_KEY_SIZE))
+       if (crypto_skcipher_setkey(key->tfm0, template->key,
+                                  IEEE802154_LLSEC_KEY_SIZE))
                goto err_tfm0;
 
        return key;
 
 err_tfm0:
-       crypto_free_blkcipher(key->tfm0);
+       crypto_free_skcipher(key->tfm0);
 err_tfm:
        for (i = 0; i < ARRAY_SIZE(key->tfm); i++)
                if (key->tfm[i])
@@ -175,7 +175,7 @@ static void llsec_key_release(struct kref *ref)
        for (i = 0; i < ARRAY_SIZE(key->tfm); i++)
                crypto_free_aead(key->tfm[i]);
 
-       crypto_free_blkcipher(key->tfm0);
+       crypto_free_skcipher(key->tfm0);
        kzfree(key);
 }
 
@@ -620,15 +620,17 @@ llsec_do_encrypt_unauth(struct sk_buff *skb, const struct mac802154_llsec *sec,
 {
        u8 iv[16];
        struct scatterlist src;
-       struct blkcipher_desc req = {
-               .tfm = key->tfm0,
-               .info = iv,
-               .flags = 0,
-       };
+       SKCIPHER_REQUEST_ON_STACK(req, key->tfm0);
+       int err;
 
        llsec_geniv(iv, sec->params.hwaddr, &hdr->sec);
        sg_init_one(&src, skb->data, skb->len);
-       return crypto_blkcipher_encrypt_iv(&req, &src, &src, skb->len);
+       skcipher_request_set_tfm(req, key->tfm0);
+       skcipher_request_set_callback(req, 0, NULL, NULL);
+       skcipher_request_set_crypt(req, &src, &src, skb->len, iv);
+       err = crypto_skcipher_encrypt(req);
+       skcipher_request_zero(req);
+       return err;
 }
 
 static struct crypto_aead*
@@ -830,11 +832,8 @@ llsec_do_decrypt_unauth(struct sk_buff *skb, const struct mac802154_llsec *sec,
        unsigned char *data;
        int datalen;
        struct scatterlist src;
-       struct blkcipher_desc req = {
-               .tfm = key->tfm0,
-               .info = iv,
-               .flags = 0,
-       };
+       SKCIPHER_REQUEST_ON_STACK(req, key->tfm0);
+       int err;
 
        llsec_geniv(iv, dev_addr, &hdr->sec);
        data = skb_mac_header(skb) + skb->mac_len;
@@ -842,7 +841,13 @@ llsec_do_decrypt_unauth(struct sk_buff *skb, const struct mac802154_llsec *sec,
 
        sg_init_one(&src, data, datalen);
 
-       return crypto_blkcipher_decrypt_iv(&req, &src, &src, datalen);
+       skcipher_request_set_tfm(req, key->tfm0);
+       skcipher_request_set_callback(req, 0, NULL, NULL);
+       skcipher_request_set_crypt(req, &src, &src, datalen, iv);
+
+       err = crypto_skcipher_decrypt(req);
+       skcipher_request_zero(req);
+       return err;
 }
 
 static int