From 062357dc6ef1b632b0fe8001672be76c97637121 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 10 Feb 2020 19:21:14 +0100 Subject: ipsec: fix AES-GCM block size Type: fix Change-Id: I0c9640dab2c0eaba369bc8f3ff7ae56d8e97e170 Signed-off-by: Damjan Marion (cherry picked from commit f1ecb6555326f8a7d5bba6f56aa676f064675dc0) --- src/vnet/ipsec/ipsec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c index 9f3e1d36507..a84f6d30bde 100644 --- a/src/vnet/ipsec/ipsec.c +++ b/src/vnet/ipsec/ipsec.c @@ -361,21 +361,24 @@ ipsec_init (vlib_main_t * vm) a->enc_op_id = VNET_CRYPTO_OP_AES_128_GCM_ENC; a->dec_op_id = VNET_CRYPTO_OP_AES_128_GCM_DEC; a->alg = VNET_CRYPTO_ALG_AES_128_GCM; - a->iv_size = a->block_size = 8; + a->iv_size = 8; + a->block_size = 16; a->icv_size = 16; a = im->crypto_algs + IPSEC_CRYPTO_ALG_AES_GCM_192; a->enc_op_id = VNET_CRYPTO_OP_AES_192_GCM_ENC; a->dec_op_id = VNET_CRYPTO_OP_AES_192_GCM_DEC; a->alg = VNET_CRYPTO_ALG_AES_192_GCM; - a->iv_size = a->block_size = 8; + a->iv_size = 8; + a->block_size = 16; a->icv_size = 16; a = im->crypto_algs + IPSEC_CRYPTO_ALG_AES_GCM_256; a->enc_op_id = VNET_CRYPTO_OP_AES_256_GCM_ENC; a->dec_op_id = VNET_CRYPTO_OP_AES_256_GCM_DEC; a->alg = VNET_CRYPTO_ALG_AES_256_GCM; - a->iv_size = a->block_size = 8; + a->iv_size = 8; + a->block_size = 16; a->icv_size = 16; vec_validate (im->integ_algs, IPSEC_INTEG_N_ALG - 1); -- cgit 1.2.3-korg