[IPSEC] ESP: Use block ciphers where applicable

[linux-2.6] / net / ipv6 / esp6.c

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 22f04607903759bd59eae8c1d11b49d3c58c1582..46a7e687948eced50158700a8b0f677e4b0debca 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -24,7 +24,7 @@
  *     This file is derived from net/ipv4/esp.c
  */
 
-#include <linux/config.h>
+#include <linux/err.h>
 #include <linux/module.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
@@ -45,7 +45,8 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
        int hdr_len;
        struct ipv6hdr *top_iph;
        struct ipv6_esp_hdr *esph;
-       struct crypto_tfm *tfm;
+       struct crypto_blkcipher *tfm;
+       struct blkcipher_desc desc;
        struct esp_data *esp;
        struct sk_buff *trailer;
        int blksize;
@@ -68,7 +69,9 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
 
        alen = esp->auth.icv_trunc_len;
        tfm = esp->conf.tfm;
-       blksize = ALIGN(crypto_tfm_alg_blocksize(tfm), 4);
+       desc.tfm = tfm;
+       desc.flags = 0;
+       blksize = ALIGN(crypto_blkcipher_blocksize(tfm), 4);
        clen = ALIGN(clen + 2, blksize);
        if (esp->conf.padlen)
                clen = ALIGN(clen, esp->conf.padlen);
@@ -97,7 +100,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
        xfrm_aevent_doreplay(x);
 
        if (esp->conf.ivlen)
-               crypto_cipher_set_iv(tfm, esp->conf.ivec, crypto_tfm_alg_ivsize(tfm));
+               crypto_blkcipher_set_iv(tfm, esp->conf.ivec, esp->conf.ivlen);
 
        do {
                struct scatterlist *sg = &esp->sgbuf[0];
@@ -108,14 +111,17 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
                                goto error;
                }
                skb_to_sgvec(skb, sg, esph->enc_data+esp->conf.ivlen-skb->data, clen);
-               crypto_cipher_encrypt(tfm, sg, sg, clen);
+               err = crypto_blkcipher_encrypt(&desc, sg, sg, clen);
                if (unlikely(sg != &esp->sgbuf[0]))
                        kfree(sg);
        } while (0);
 
+       if (unlikely(err))
+               goto error;
+
        if (esp->conf.ivlen) {
-               memcpy(esph->enc_data, esp->conf.ivec, crypto_tfm_alg_ivsize(tfm));
-               crypto_cipher_get_iv(tfm, esp->conf.ivec, crypto_tfm_alg_ivsize(tfm));
+               memcpy(esph->enc_data, esp->conf.ivec, esp->conf.ivlen);
+               crypto_blkcipher_get_iv(tfm, esp->conf.ivec, esp->conf.ivlen);
        }
 
        if (esp->auth.icv_full_len) {
@@ -124,8 +130,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
                pskb_put(skb, trailer, alen);
        }
 
-       err = 0;
-
 error:
        return err;
 }
@@ -135,32 +139,26 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
        struct ipv6hdr *iph;
        struct ipv6_esp_hdr *esph;
        struct esp_data *esp = x->data;
+       struct crypto_blkcipher *tfm = esp->conf.tfm;
+       struct blkcipher_desc desc = { .tfm = tfm };
        struct sk_buff *trailer;
-       int blksize = ALIGN(crypto_tfm_alg_blocksize(esp->conf.tfm), 4);
+       int blksize = ALIGN(crypto_blkcipher_blocksize(tfm), 4);
        int alen = esp->auth.icv_trunc_len;
        int elen = skb->len - sizeof(struct ipv6_esp_hdr) - esp->conf.ivlen - alen;
 
        int hdr_len = skb->h.raw - skb->nh.raw;
        int nfrags;
-       unsigned char *tmp_hdr = NULL;
        int ret = 0;
 
        if (!pskb_may_pull(skb, sizeof(struct ipv6_esp_hdr))) {
                ret = -EINVAL;
-               goto out_nofree;
+               goto out;
        }
 
        if (elen <= 0 || (elen & (blksize-1))) {
                ret = -EINVAL;
-               goto out_nofree;
-       }
-
-       tmp_hdr = kmalloc(hdr_len, GFP_ATOMIC);
-       if (!tmp_hdr) {
-               ret = -ENOMEM;
-               goto out_nofree;
+               goto out;
        }
-       memcpy(tmp_hdr, skb->nh.raw, hdr_len);
 
        /* If integrity check is required, do this. */
         if (esp->auth.icv_full_len) {
@@ -191,7 +189,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
 
        /* Get ivec. This can be wrong, check against another impls. */
        if (esp->conf.ivlen)
-               crypto_cipher_set_iv(esp->conf.tfm, esph->enc_data, crypto_tfm_alg_ivsize(esp->conf.tfm));
+               crypto_blkcipher_set_iv(tfm, esph->enc_data, esp->conf.ivlen);
 
         {
                u8 nexthdr[2];
@@ -206,9 +204,11 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
                        }
                }
                skb_to_sgvec(skb, sg, sizeof(struct ipv6_esp_hdr) + esp->conf.ivlen, elen);
-               crypto_cipher_decrypt(esp->conf.tfm, sg, sg, elen);
+               ret = crypto_blkcipher_decrypt(&desc, sg, sg, elen);
                if (unlikely(sg != &esp->sgbuf[0]))
                        kfree(sg);
+               if (unlikely(ret))
+                       goto out;
 
                if (skb_copy_bits(skb, skb->len-alen-2, nexthdr, 2))
                        BUG();
@@ -222,23 +222,19 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
                /* ... check padding bits here. Silly. :-) */ 
 
                pskb_trim(skb, skb->len - alen - padlen - 2);
-               skb->h.raw = skb_pull(skb, sizeof(struct ipv6_esp_hdr) + esp->conf.ivlen);
-               skb->nh.raw += sizeof(struct ipv6_esp_hdr) + esp->conf.ivlen;
-               memcpy(skb->nh.raw, tmp_hdr, hdr_len);
-               skb->nh.ipv6h->payload_len = htons(skb->len - sizeof(struct ipv6hdr));
                ret = nexthdr[1];
        }
 
+       skb->h.raw = __skb_pull(skb, sizeof(*esph) + esp->conf.ivlen) - hdr_len;
+
 out:
-       kfree(tmp_hdr);
-out_nofree:
        return ret;
 }
 
 static u32 esp6_get_max_size(struct xfrm_state *x, int mtu)
 {
        struct esp_data *esp = x->data;
-       u32 blksize = ALIGN(crypto_tfm_alg_blocksize(esp->conf.tfm), 4);
+       u32 blksize = ALIGN(crypto_blkcipher_blocksize(esp->conf.tfm), 4);
 
        if (x->props.mode) {
                mtu = ALIGN(mtu + 2, blksize);
@@ -279,7 +275,7 @@ static void esp6_destroy(struct xfrm_state *x)
        if (!esp)
                return;
 
-       crypto_free_tfm(esp->conf.tfm);
+       crypto_free_blkcipher(esp->conf.tfm);
        esp->conf.tfm = NULL;
        kfree(esp->conf.ivec);
        esp->conf.ivec = NULL;
@@ -293,6 +289,7 @@ static void esp6_destroy(struct xfrm_state *x)
 static int esp6_init_state(struct xfrm_state *x)
 {
        struct esp_data *esp = NULL;
+       struct crypto_blkcipher *tfm;
 
        /* null auth and encryption can have zero length keys */
        if (x->aalg) {
@@ -340,13 +337,11 @@ static int esp6_init_state(struct xfrm_state *x)
        }
        esp->conf.key = x->ealg->alg_key;
        esp->conf.key_len = (x->ealg->alg_key_len+7)/8;
-       if (x->props.ealgo == SADB_EALG_NULL)
-               esp->conf.tfm = crypto_alloc_tfm(x->ealg->alg_name, CRYPTO_TFM_MODE_ECB);
-       else
-               esp->conf.tfm = crypto_alloc_tfm(x->ealg->alg_name, CRYPTO_TFM_MODE_CBC);
-       if (esp->conf.tfm == NULL)
+       tfm = crypto_alloc_blkcipher(x->ealg->alg_name, 0, CRYPTO_ALG_ASYNC);
+       if (IS_ERR(tfm))
                goto error;
-       esp->conf.ivlen = crypto_tfm_alg_ivsize(esp->conf.tfm);
+       esp->conf.tfm = tfm;
+       esp->conf.ivlen = crypto_blkcipher_ivsize(tfm);
        esp->conf.padlen = 0;
        if (esp->conf.ivlen) {
                esp->conf.ivec = kmalloc(esp->conf.ivlen, GFP_KERNEL);
@@ -354,7 +349,7 @@ static int esp6_init_state(struct xfrm_state *x)
                        goto error;
                get_random_bytes(esp->conf.ivec, esp->conf.ivlen);
        }
-       if (crypto_cipher_setkey(esp->conf.tfm, esp->conf.key, esp->conf.key_len))
+       if (crypto_blkcipher_setkey(tfm, esp->conf.key, esp->conf.key_len))
                goto error;
        x->props.header_len = sizeof(struct ipv6_esp_hdr) + esp->conf.ivlen;
        if (x->props.mode)