IPsec: modify post-decrypt buf len calculation

[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 dfc86d4..8272bb0 100644 (file)
--- a/src/vnet/ipsec/esp_decrypt.c
+++ b/src/vnet/ipsec/esp_decrypt.c
@@ -266,7 +266,6 @@ esp_decrypt_inline (vlib_main_t * vm,
               */
              op->iv -= sizeof (sa0->salt);
              clib_memcpy_fast (op->iv, &sa0->salt, sizeof (sa0->salt));
-             op->iv_len = cpd.iv_sz + sizeof (sa0->salt);
 
              op->tag = payload + len;
              op->tag_len = 16;
@@ -370,7 +369,7 @@ esp_decrypt_inline (vlib_main_t * vm,
       sa0 = vec_elt_at_index (im->sad, pd->sa_index);
       u8 *payload = b[0]->data + pd->current_data;
 
-      ipsec_sa_anti_replay_advance (sa0, &((esp_header_t *) payload)->seq);
+      ipsec_sa_anti_replay_advance (sa0, ((esp_header_t *) payload)->seq);
 
       esp_footer_t *f = (esp_footer_t *) (b[0]->data + pd->current_data +
                                          pd->current_length - sizeof (*f) -
@@ -425,13 +424,13 @@ esp_decrypt_inline (vlib_main_t * vm,
            {
              next[0] = ESP_DECRYPT_NEXT_IP4_INPUT;
              b[0]->current_data = pd->current_data + adv;
-             b[0]->current_length = pd->current_length + adv - tail;
+             b[0]->current_length = pd->current_length - adv - tail;
            }
          else if (f->next_header == IP_PROTOCOL_IPV6)
            {
              next[0] = ESP_DECRYPT_NEXT_IP6_INPUT;
              b[0]->current_data = pd->current_data + adv;
-             b[0]->current_length = pd->current_length + adv - tail;
+             b[0]->current_length = pd->current_length - adv - tail;
            }
          else
            {