X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fesp.h;h=b1736453b93f97fdc9c293b380376cd8a5c95707;hb=e5d34919b;hp=070726faa3435dde9f11c781cb1184f8823a0911;hpb=d1bed687231bb64cf7761da37431ba61bc32b6d8;p=vpp.git

diff --git a/src/vnet/ipsec/esp.h b/src/vnet/ipsec/esp.h
index 070726faa34..b1736453b93 100644
--- a/src/vnet/ipsec/esp.h
+++ b/src/vnet/ipsec/esp.h
@@ -21,7 +21,11 @@
 
 typedef struct
 {
-  u32 spi;
+  union
+  {
+    u32 spi;
+    u8 spi_bytes[4];
+  };
   u32 seq;
   u8 data[0];
 } esp_header_t;
@@ -101,35 +105,6 @@ esp_seq_advance (ipsec_sa_t * sa)
   return 0;
 }
 
-
-always_inline unsigned int
-hmac_calc (vlib_main_t * vm, ipsec_sa_t * sa, u8 * data, int data_len,
-	   u8 * signature)
-{
-  vnet_crypto_op_t _op, *op = &_op;
-
-  if (PREDICT_FALSE (sa->integ_op_id == 0))
-    return 0;
-
-  vnet_crypto_op_init (op, sa->integ_op_id);
-  op->key_index = sa->integ_key_index;
-  op->src = data;
-  op->len = data_len;
-  op->digest = signature;
-  op->digest_len = sa->integ_icv_size;
-
-  if (ipsec_sa_is_set_USE_ESN (sa))
-    {
-      u32 seq_hi = clib_host_to_net_u32 (sa->seq_hi);
-
-      op->len += 4;
-      clib_memcpy (data + data_len, &seq_hi, 4);
-    }
-
-  vnet_crypto_process_ops (vm, op, 1);
-  return sa->integ_icv_size;
-}
-
 always_inline void
 esp_aad_fill (vnet_crypto_op_t * op,
 	      const esp_header_t * esp, const ipsec_sa_t * sa)
@@ -137,18 +112,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__ */