ipsec: esp-encrypt rework

[vpp.git] / src / vnet / ipsec / esp.h

diff --git a/src/vnet/ipsec/esp.h b/src/vnet/ipsec/esp.h
index 1730038..063b74b 100644 (file)
--- a/src/vnet/ipsec/esp.h
+++ b/src/vnet/ipsec/esp.h
@@ -55,7 +55,9 @@ typedef CLIB_PACKED (struct {
 /* *INDENT-ON* */
 
 #define ESP_WINDOW_SIZE                (64)
-#define ESP_SEQ_MAX            (4294967295UL)
+#define ESP_SEQ_MAX            (4294967295UL)
+#define ESP_MAX_BLOCK_SIZE     (16)
+#define ESP_MAX_ICV_SIZE       (16)
 
 u8 *format_esp_header (u8 * s, va_list * args);
 
@@ -205,35 +207,32 @@ esp_seq_advance (ipsec_sa_t * sa)
 
 
 always_inline unsigned int
-hmac_calc (vlib_main_t * vm, ipsec_integ_alg_t alg, u8 * key, int key_len,
-          u8 * data, int data_len, u8 * signature, u8 use_esn, u32 seq_hi)
+hmac_calc (vlib_main_t * vm, ipsec_sa_t * sa, u8 * data, int data_len,
+          u8 * signature)
 {
-  ipsec_main_t *im = &ipsec_main;
   vnet_crypto_op_t _op, *op = &_op;
-  ASSERT (alg < IPSEC_INTEG_N_ALG);
 
-  if (PREDICT_FALSE (im->integ_algs[alg].op_type == 0))
+  if (PREDICT_FALSE (sa->integ_op_type == 0))
     return 0;
 
-  op->op = im->integ_algs[alg].op_type;
-  op->key = key;
-  op->key_len = key_len;
+  op->op = sa->integ_op_type;
+  op->key = sa->integ_key.data;
+  op->key_len = sa->integ_key.len;
   op->src = data;
   op->len = data_len;
   op->dst = signature;
-#if 0
+  op->hmac_trunc_len = sa->integ_trunc_size;
 
-  HMAC_Init_ex (ctx, key, key_len, md, NULL);
-
-  HMAC_Update (ctx, data, data_len);
+  if (sa->use_esn)
+    {
+      u32 seq_hi = clib_host_to_net_u32 (sa->seq_hi);
 
-  if (PREDICT_TRUE (use_esn))
-    HMAC_Update (ctx, (u8 *) & seq_hi, sizeof (seq_hi));
-  HMAC_Final (ctx, signature, &len);
+      op->len += 4;
+      clib_memcpy (data + data_len, &seq_hi, 4);
+    }
 
-#endif
   vnet_crypto_process_ops (vm, op, 1);
-  return im->integ_algs[alg].trunc_size;
+  return sa->integ_trunc_size;
 }
 
 #endif /* __ESP_H__ */