commit b966e8bfdd3c63e2436ab6e5d250c8b1bf4dd102
author Damjan Marion <damarion@cisco.com> Wed Mar 20 16:07:09 2019 +0100
committer Neale Ranns <nranns@cisco.com> Wed Mar 20 17:23:04 2019 +0000
tree 7f3faba13dd462adc577bdc9798da99c209bee9c
parent c372dc2190f2376f9b816f71120354fd53732fa7

ipsec: keep crypto data inside SA

Change-Id: Ie8986bd3652d25c4befe681cea77df95aba37ebc
Signed-off-by: Damjan Marion <damarion@cisco.com>

src/vnet/ipsec/ah_decrypt.c

diff --git a/src/vnet/ipsec/ah_decrypt.c b/src/vnet/ipsec/ah_decrypt.c
index 2488fa9..b128dfa 100644
--- a/src/vnet/ipsec/ah_decrypt.c
+++ b/src/vnet/ipsec/ah_decrypt.c
@@ -172,7 +172,7 @@
 	    (&ipsec_sa_counters, thread_index, sa_index0,
 	     1, i_b0->current_length);
 
-	  icv_size = im->integ_algs[sa0->integ_alg].trunc_size;
+	  icv_size = sa0->integ_trunc_size;
 	  if (PREDICT_TRUE (sa0->integ_alg != IPSEC_INTEG_ALG_NONE))
 	    {
 	      u8 sig[64];
@@ -203,9 +203,7 @@
 		  icv_padding_len =
 		    ah_calc_icv_padding_len (icv_size, 0 /* is_ipv6 */ );
 		}
-	      hmac_calc (vm, sa0->integ_alg, sa0->integ_key.data,
-			 sa0->integ_key.len, (u8 *) ih4, i_b0->current_length,
-			 sig, sa0->use_esn, sa0->seq_hi);
+	      hmac_calc (vm, sa0, (u8 *) ih4, i_b0->current_length, sig);
 
 	      if (PREDICT_FALSE (memcmp (digest, sig, icv_size)))
 		{