X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fesp.h;h=f36f52a4752976a6fb8a2ea8c342632bb970bf02;hb=f2922422d972644e67d1ca989e40cd0100ecb06d;hp=052bbfc1d8880ffac6b2d2c6175c5d3eea1c8fd4;hpb=47feb1146ec3b0e1cf2ebd83cd5211e1df261194;p=vpp.git

diff --git a/src/vnet/ipsec/esp.h b/src/vnet/ipsec/esp.h
index 052bbfc1d88..f36f52a4752 100644
--- a/src/vnet/ipsec/esp.h
+++ b/src/vnet/ipsec/esp.h
@@ -112,8 +112,7 @@ hmac_calc (vlib_main_t * vm, ipsec_sa_t * sa, u8 * data, int data_len,
     return 0;
 
   vnet_crypto_op_init (op, sa->integ_op_id);
-  op->key = sa->integ_key.data;
-  op->key_len = sa->integ_key.len;
+  op->key_index = sa->integ_key_index;
   op->src = data;
   op->len = data_len;
   op->digest = signature;
@@ -138,18 +137,21 @@ esp_aad_fill (vnet_crypto_op_t * op,
   esp_aead_t *aad;
 
   aad = (esp_aead_t *) op->aad;
-  clib_memcpy_fast (aad, esp, 8);
+  aad->data[0] = esp->spi;
 
   if (ipsec_sa_is_set_USE_ESN (sa))
     {
       /* SPI, seq-hi, seq-low */
-      aad->data[2] = aad->data[1];
       aad->data[1] = clib_host_to_net_u32 (sa->seq_hi);
+      aad->data[2] = esp->seq;
       op->aad_len = 12;
     }
   else
-    /* SPI, seq-low */
-    op->aad_len = 8;
+    {
+      /* SPI, seq-low */
+      aad->data[1] = esp->seq;
+      op->aad_len = 8;
+    }
 }
 #endif /* __ESP_H__ */