diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-03-29 13:47:54 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2019-04-07 11:19:35 +0200 |
| commit | 060bfb987a277624e5644de2fcbee1196c2c76e8 (patch) | |
| tree | 2ca6ccf57c09c5e016f9613b0e0e75f8e49475eb /src/vnet/ipsec/ipsec.c | |
| parent | dc43bcd8abef2cee4eebdc94d9a82c0194ba00fb (diff) | |
crypto: add support for AEAD and AES-GCM
Change-Id: Iff6f81a49b9cff5522fbb4914d47472423eac5db
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet/ipsec/ipsec.c')
| -rw-r--r-- | src/vnet/ipsec/ipsec.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c index 9719d3a2d09..dc2f4cdbb60 100644 --- a/src/vnet/ipsec/ipsec.c +++ b/src/vnet/ipsec/ipsec.c @@ -269,51 +269,51 @@ ipsec_init (vlib_main_t * vm) vec_validate (im->crypto_algs, IPSEC_CRYPTO_N_ALG - 1); a = im->crypto_algs + IPSEC_CRYPTO_ALG_DES_CBC; - a->enc_op_type = VNET_CRYPTO_OP_DES_CBC_ENC; - a->dec_op_type = VNET_CRYPTO_OP_DES_CBC_DEC; + a->enc_op_id = VNET_CRYPTO_OP_DES_CBC_ENC; + a->dec_op_id = VNET_CRYPTO_OP_DES_CBC_DEC; a->iv_size = a->block_size = 8; a = im->crypto_algs + IPSEC_CRYPTO_ALG_3DES_CBC; - a->enc_op_type = VNET_CRYPTO_OP_3DES_CBC_ENC; - a->dec_op_type = VNET_CRYPTO_OP_3DES_CBC_DEC; + a->enc_op_id = VNET_CRYPTO_OP_3DES_CBC_ENC; + a->dec_op_id = VNET_CRYPTO_OP_3DES_CBC_DEC; a->iv_size = a->block_size = 8; a = im->crypto_algs + IPSEC_CRYPTO_ALG_AES_CBC_128; - a->enc_op_type = VNET_CRYPTO_OP_AES_128_CBC_ENC; - a->dec_op_type = VNET_CRYPTO_OP_AES_128_CBC_DEC; + a->enc_op_id = VNET_CRYPTO_OP_AES_128_CBC_ENC; + a->dec_op_id = VNET_CRYPTO_OP_AES_128_CBC_DEC; a->iv_size = a->block_size = 16; a = im->crypto_algs + IPSEC_CRYPTO_ALG_AES_CBC_192; - a->enc_op_type = VNET_CRYPTO_OP_AES_192_CBC_ENC; - a->dec_op_type = VNET_CRYPTO_OP_AES_192_CBC_DEC; + a->enc_op_id = VNET_CRYPTO_OP_AES_192_CBC_ENC; + a->dec_op_id = VNET_CRYPTO_OP_AES_192_CBC_DEC; a->iv_size = a->block_size = 16; a = im->crypto_algs + IPSEC_CRYPTO_ALG_AES_CBC_256; - a->enc_op_type = VNET_CRYPTO_OP_AES_256_CBC_ENC; - a->dec_op_type = VNET_CRYPTO_OP_AES_256_CBC_DEC; + a->enc_op_id = VNET_CRYPTO_OP_AES_256_CBC_ENC; + a->dec_op_id = VNET_CRYPTO_OP_AES_256_CBC_DEC; a->iv_size = a->block_size = 16; vec_validate (im->integ_algs, IPSEC_INTEG_N_ALG - 1); ipsec_main_integ_alg_t *i; i = &im->integ_algs[IPSEC_INTEG_ALG_SHA1_96]; - i->op_type = VNET_CRYPTO_OP_SHA1_HMAC; + i->op_id = VNET_CRYPTO_OP_SHA1_HMAC; i->icv_size = 12; i = &im->integ_algs[IPSEC_INTEG_ALG_SHA_256_96]; - i->op_type = VNET_CRYPTO_OP_SHA1_HMAC; + i->op_id = VNET_CRYPTO_OP_SHA1_HMAC; i->icv_size = 12; i = &im->integ_algs[IPSEC_INTEG_ALG_SHA_256_128]; - i->op_type = VNET_CRYPTO_OP_SHA256_HMAC; + i->op_id = VNET_CRYPTO_OP_SHA256_HMAC; i->icv_size = 16; i = &im->integ_algs[IPSEC_INTEG_ALG_SHA_384_192]; - i->op_type = VNET_CRYPTO_OP_SHA384_HMAC; + i->op_id = VNET_CRYPTO_OP_SHA384_HMAC; i->icv_size = 24; i = &im->integ_algs[IPSEC_INTEG_ALG_SHA_512_256]; - i->op_type = VNET_CRYPTO_OP_SHA512_HMAC; + i->op_id = VNET_CRYPTO_OP_SHA512_HMAC; i->icv_size = 32; vec_validate_aligned (im->ptd, vlib_num_workers (), CLIB_CACHE_LINE_BYTES); |