Commit 87bdc48d authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Get rid of ipv6_{auth,esp,comp}_hdr 



This patch removes the duplicate ipv6_{auth,esp,comp}_hdr structures since
they're identical to the IPv4 versions.  Duplicating them would only create
problems for ourselves later when we need to add things like extended
sequence numbers.

I've also added transport header type conversion headers for these types
which are now used by the transforms.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37fedd3a

include/linux/ipv6.h

+0 −21
Original line number Diff line number Diff line
@@ -96,27 +96,6 @@ struct ipv6_destopt_hao { 
	struct in6_addr		addr;

} __attribute__ ((__packed__));



struct ipv6_auth_hdr {

	__u8  nexthdr;

	__u8  hdrlen;           /* This one is measured in 32 bit units! */

	__be16 reserved;

	__be32 spi;

	__be32 seq_no;           /* Sequence number */

	__u8  auth_data[0];     /* Length variable but >=4. Mind the 64 bit alignment! */

};



struct ipv6_esp_hdr {

	__be32 spi;

	__be32 seq_no;           /* Sequence number */

	__u8  enc_data[0];      /* Length variable but >=8. Mind the 64 bit alignment! */

};



struct ipv6_comp_hdr {

	__u8 nexthdr;

	__u8 flags;

	__be16 cpi;

};



/*

 *	IPv6 fixed header

 *

include/net/ah.h

+7 −0
Original line number Diff line number Diff line
@@ -38,4 +38,11 @@ out: 
	return err;

}



struct ip_auth_hdr;



static inline struct ip_auth_hdr *ip_auth_hdr(const struct sk_buff *skb)

{

	return (struct ip_auth_hdr *)skb_transport_header(skb);

}



#endif

include/net/esp.h

+7 −0
Original line number Diff line number Diff line
@@ -53,4 +53,11 @@ static inline int esp_mac_digest(struct esp_data *esp, struct sk_buff *skb, 
	return crypto_hash_final(&desc, esp->auth.work_icv);

}



struct ip_esp_hdr;



static inline struct ip_esp_hdr *ip_esp_hdr(const struct sk_buff *skb)

{

	return (struct ip_esp_hdr *)skb_transport_header(skb);

}



#endif

include/net/ipcomp.h

+10 −1
Original line number Diff line number Diff line 
#ifndef _NET_IPCOMP_H

#define _NET_IPCOMP_H



#include <linux/crypto.h>

#include <linux/types.h>



#define IPCOMP_SCRATCH_SIZE     65400



struct crypto_comp;



struct ipcomp_data {

	u16 threshold;

	struct crypto_comp **tfms;

};



struct ip_comp_hdr;

struct sk_buff;



static inline struct ip_comp_hdr *ip_comp_hdr(const struct sk_buff *skb)

{

	return (struct ip_comp_hdr *)skb_transport_header(skb);

}



#endif

net/ipv4/ah4.c

+9 −9
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb) 
			goto error;

	}



	ah = (struct ip_auth_hdr *)skb_transport_header(skb);

	ah = ip_auth_hdr(skb);

	ah->nexthdr = *skb_mac_header(skb);

	*skb_mac_header(skb) = IPPROTO_AH;
@@ -93,8 +93,7 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb) 
	top_iph->check = 0;



	ahp = x->data;

	ah->hdrlen  = (XFRM_ALIGN8(sizeof(struct ip_auth_hdr) +

				   ahp->icv_trunc_len) >> 2) - 2;

	ah->hdrlen  = (XFRM_ALIGN8(sizeof(*ah) + ahp->icv_trunc_len) >> 2) - 2;



	ah->reserved = 0;

	ah->spi = x->id.spi;
@@ -134,15 +133,15 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) 
	struct ah_data *ahp;

	char work_buf[60];



	if (!pskb_may_pull(skb, sizeof(struct ip_auth_hdr)))

	if (!pskb_may_pull(skb, sizeof(*ah)))

		goto out;



	ah = (struct ip_auth_hdr *)skb->data;

	ahp = x->data;

	ah_hlen = (ah->hdrlen + 2) << 2;



	if (ah_hlen != XFRM_ALIGN8(sizeof(struct ip_auth_hdr) + ahp->icv_full_len) &&

	    ah_hlen != XFRM_ALIGN8(sizeof(struct ip_auth_hdr) + ahp->icv_trunc_len))

	if (ah_hlen != XFRM_ALIGN8(sizeof(*ah) + ahp->icv_full_len) &&

	    ah_hlen != XFRM_ALIGN8(sizeof(*ah) + ahp->icv_trunc_len))

		goto out;



	if (!pskb_may_pull(skb, ah_hlen))
@@ -266,7 +265,8 @@ static int ah_init_state(struct xfrm_state *x) 
	if (!ahp->work_icv)

		goto error;



	x->props.header_len = XFRM_ALIGN8(sizeof(struct ip_auth_hdr) + ahp->icv_trunc_len);

	x->props.header_len = XFRM_ALIGN8(sizeof(struct ip_auth_hdr) +

					  ahp->icv_trunc_len);

	if (x->props.mode == XFRM_MODE_TUNNEL)

		x->props.header_len += sizeof(struct iphdr);

	x->data = ahp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE