diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-03-28 21:40:48 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2019-03-28 23:29:22 +0000 |
| commit | a03d18238350f9941357caca28957395ad737810 (patch) | |
| tree | 1a87522460cc9d2c1e349daff7b4f0f709704d29 /src/vnet/ipsec | |
| parent | 1e3aa5e213c23588981ee17d1413a0441a40527a (diff) | |
crypto: add vnet_crypto_op_init (...)
Change-Id: I2018d8367bb010e1ab30d9c7c23d9501fc38a2e5
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet/ipsec')
| -rw-r--r-- | src/vnet/ipsec/esp.h | 2 | ||||
| -rw-r--r-- | src/vnet/ipsec/esp_decrypt.c | 3 | ||||
| -rw-r--r-- | src/vnet/ipsec/esp_encrypt.c | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/vnet/ipsec/esp.h b/src/vnet/ipsec/esp.h index 2f734aa05ce..6ba2e7c7579 100644 --- a/src/vnet/ipsec/esp.h +++ b/src/vnet/ipsec/esp.h @@ -96,7 +96,7 @@ hmac_calc (vlib_main_t * vm, ipsec_sa_t * sa, u8 * data, int data_len, if (PREDICT_FALSE (sa->integ_op_type == 0)) return 0; - op->op = sa->integ_op_type; + vnet_crypto_op_init (op, sa->integ_op_type); op->key = sa->integ_key.data; op->key_len = sa->integ_key.len; op->src = data; diff --git a/src/vnet/ipsec/esp_decrypt.c b/src/vnet/ipsec/esp_decrypt.c index 93666194e4f..b354a9e5037 100644 --- a/src/vnet/ipsec/esp_decrypt.c +++ b/src/vnet/ipsec/esp_decrypt.c @@ -87,11 +87,10 @@ esp_decrypt_cbc (vlib_main_t * vm, ipsec_sa_t * sa, { vnet_crypto_op_t _op, *op = &_op; - if (PREDICT_FALSE (sa->crypto_dec_op_type == VNET_CRYPTO_OP_NONE)) return; - op->op = sa->crypto_dec_op_type; + vnet_crypto_op_init (op, sa->crypto_dec_op_type); op->iv = iv; op->src = in; op->dst = out; diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c index fc1fe392f16..c2069e52b33 100644 --- a/src/vnet/ipsec/esp_encrypt.c +++ b/src/vnet/ipsec/esp_encrypt.c @@ -429,7 +429,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { vnet_crypto_op_t *op; vec_add2_aligned (ptd->crypto_ops, op, 1, CLIB_CACHE_LINE_BYTES); - op->op = sa0->crypto_enc_op_type; + vnet_crypto_op_init (op, sa0->crypto_enc_op_type); op->iv = payload - iv_sz; op->src = op->dst = payload; op->key = sa0->crypto_key.data; @@ -442,14 +442,13 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { vnet_crypto_op_t *op; vec_add2_aligned (ptd->integ_ops, op, 1, CLIB_CACHE_LINE_BYTES); - op->op = sa0->integ_op_type; + vnet_crypto_op_init (op, sa0->integ_op_type); op->src = payload - iv_sz - sizeof (esp_header_t); op->dst = payload + payload_len - icv_sz; op->key = sa0->integ_key.data; op->key_len = sa0->integ_key.len; op->hmac_trunc_len = icv_sz; op->len = payload_len - icv_sz + iv_sz + sizeof (esp_header_t); - op->flags = 0; op->user_data = b - bufs; if (ipsec_sa_is_set_USE_ESN (sa0)) { |