Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
dpdk: add support for DPDK 17.11
[vpp.git]
/
src
/
plugins
/
dpdk
/
ipsec
/
esp_decrypt.c
diff --git
a/src/plugins/dpdk/ipsec/esp_decrypt.c
b/src/plugins/dpdk/ipsec/esp_decrypt.c
index
ab98d56
..
6815f53
100644
(file)
--- a/
src/plugins/dpdk/ipsec/esp_decrypt.c
+++ b/
src/plugins/dpdk/ipsec/esp_decrypt.c
@@
-170,13
+170,7
@@
dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
cipher_alg = vec_elt_at_index (dcm->cipher_algs, sa0->crypto_alg);
auth_alg = vec_elt_at_index (dcm->auth_algs, sa0->integ_alg);
cipher_alg = vec_elt_at_index (dcm->cipher_algs, sa0->crypto_alg);
auth_alg = vec_elt_at_index (dcm->auth_algs, sa0->integ_alg);
-#if DPDK_NO_AEAD
- is_aead = (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128 ||
- sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_192 ||
- sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_256);
-#else
is_aead = (cipher_alg->type == RTE_CRYPTO_SYM_XFORM_AEAD);
is_aead = (cipher_alg->type == RTE_CRYPTO_SYM_XFORM_AEAD);
-#endif
if (is_aead)
auth_alg = cipher_alg;
if (is_aead)
auth_alg = cipher_alg;
@@
-291,11
+285,7
@@
dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
u32 *_iv = (u32 *) iv;
crypto_set_icb (icb, sa0->salt, _iv[0], _iv[1]);
u32 *_iv = (u32 *) iv;
crypto_set_icb (icb, sa0->salt, _iv[0], _iv[1]);
-#if DPDK_NO_AEAD
- iv_size = 16;
-#else
iv_size = 12;
iv_size = 12;
-#endif
}
if (is_aead)
}
if (is_aead)
@@
-470,13
+460,7
@@
dpdk_esp_decrypt_post_node_fn (vlib_main_t * vm,
cipher_alg = vec_elt_at_index (dcm->cipher_algs, sa0->crypto_alg);
auth_alg = vec_elt_at_index (dcm->auth_algs, sa0->integ_alg);
cipher_alg = vec_elt_at_index (dcm->cipher_algs, sa0->crypto_alg);
auth_alg = vec_elt_at_index (dcm->auth_algs, sa0->integ_alg);
-#if DPDK_NO_AEAD
- is_aead = (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128 ||
- sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_192 ||
- sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_256);
-#else
is_aead = cipher_alg->type == RTE_CRYPTO_SYM_XFORM_AEAD;
is_aead = cipher_alg->type == RTE_CRYPTO_SYM_XFORM_AEAD;
-#endif
if (is_aead)
auth_alg = cipher_alg;
if (is_aead)
auth_alg = cipher_alg;