aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/esp4.c
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2011-03-07 19:06:31 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-13 23:22:28 -0400
commit1ce3644ade9c865c755bf0f6a4e109b7bb6eb60f (patch)
tree14ce0727337a43d1fa28432d01189d1a5f4269c7 /net/ipv4/esp4.c
parent9736acf395d3608583a7be70f62800b494fa103c (diff)
xfrm: Use separate low and high order bits of the sequence numbers in xfrm_skb_cb
To support IPsec extended sequence numbers, we split the output sequence numbers of xfrm_skb_cb in low and high order 32 bits and we add the high order 32 bits to the input sequence numbers. All users are updated accordingly. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/esp4.c')
-rw-r--r--net/ipv4/esp4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index e42a905180f0..882dbbb7d799 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -215,7 +215,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
215 } 215 }
216 216
217 esph->spi = x->id.spi; 217 esph->spi = x->id.spi;
218 esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output); 218 esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
219 219
220 sg_init_table(sg, nfrags); 220 sg_init_table(sg, nfrags);
221 skb_to_sgvec(skb, sg, 221 skb_to_sgvec(skb, sg,
@@ -227,7 +227,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
227 aead_givcrypt_set_crypt(req, sg, sg, clen, iv); 227 aead_givcrypt_set_crypt(req, sg, sg, clen, iv);
228 aead_givcrypt_set_assoc(req, asg, sizeof(*esph)); 228 aead_givcrypt_set_assoc(req, asg, sizeof(*esph));
229 aead_givcrypt_set_giv(req, esph->enc_data, 229 aead_givcrypt_set_giv(req, esph->enc_data,
230 XFRM_SKB_CB(skb)->seq.output); 230 XFRM_SKB_CB(skb)->seq.output.low);
231 231
232 ESP_SKB_CB(skb)->tmp = tmp; 232 ESP_SKB_CB(skb)->tmp = tmp;
233 err = crypto_aead_givencrypt(req); 233 err = crypto_aead_givencrypt(req);