crypto: add support for AEAD and AES-GCM

[vpp.git] / src / vnet / ipsec / esp_decrypt.c

diff --git a/src/vnet/ipsec/esp_decrypt.c b/src/vnet/ipsec/esp_decrypt.c
index 3e09d9d..9b24e5a 100644 (file)
--- a/src/vnet/ipsec/esp_decrypt.c
+++ b/src/vnet/ipsec/esp_decrypt.c
@@ -157,7 +157,7 @@ esp_decrypt_inline (vlib_main_t * vm,
        {
          current_sa_index = vnet_buffer (b[0])->ipsec.sad_index;
          sa0 = pool_elt_at_index (im->sad, current_sa_index);
-         cpd.icv_sz = sa0->integ_trunc_size;
+         cpd.icv_sz = sa0->integ_icv_size;
          cpd.iv_sz = sa0->crypto_iv_size;
          cpd.flags = sa0->flags;
          cpd.sa_index = current_sa_index;
@@ -202,14 +202,14 @@ esp_decrypt_inline (vlib_main_t * vm,
          vnet_crypto_op_t *op;
          vec_add2_aligned (ptd->integ_ops, op, 1, CLIB_CACHE_LINE_BYTES);
 
-         vnet_crypto_op_init (op, sa0->integ_op_type);
+         vnet_crypto_op_init (op, sa0->integ_op_id);
          op->key = sa0->integ_key.data;
          op->key_len = sa0->integ_key.len;
          op->src = payload;
-         op->hmac_trunc_len = cpd.icv_sz;
          op->flags = VNET_CRYPTO_OP_FLAG_HMAC_CHECK;
          op->user_data = b - bufs;
-         op->dst = payload + len;
+         op->digest = payload + len;
+         op->digest_len = cpd.icv_sz;
          op->len = len;
          if (PREDICT_TRUE (sa0->flags & IPSEC_SA_FLAG_USE_ESN))
            {
@@ -226,11 +226,11 @@ esp_decrypt_inline (vlib_main_t * vm,
       payload += esp_sz;
       len -= esp_sz;
 
-      if (sa0->crypto_enc_op_type != VNET_CRYPTO_OP_NONE)
+      if (sa0->crypto_enc_op_id != VNET_CRYPTO_OP_NONE)
        {
          vnet_crypto_op_t *op;
          vec_add2_aligned (ptd->crypto_ops, op, 1, CLIB_CACHE_LINE_BYTES);
-         vnet_crypto_op_init (op, sa0->crypto_dec_op_type);
+         vnet_crypto_op_init (op, sa0->crypto_dec_op_id);
          op->key = sa0->crypto_key.data;
          op->iv = payload;
          op->src = op->dst = payload += cpd.iv_sz;
@@ -271,7 +271,6 @@ esp_decrypt_inline (vlib_main_t * vm,
          op++;
        }
     }
-
   if ((n = vec_len (ptd->crypto_ops)))
     {
       vnet_crypto_op_t *op = ptd->crypto_ops;
@@ -396,7 +395,7 @@ esp_decrypt_inline (vlib_main_t * vm,
            }
        }
 
-      if (vnet_buffer (b[0])->ipsec.flags & IPSEC_FLAG_IPSEC_GRE_TUNNEL)
+      if (PREDICT_FALSE (ipsec_sa_is_set_IS_GRE (sa0)))
        next[0] = ESP_DECRYPT_NEXT_IPSEC_GRE_INPUT;
 
     trace: