ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl plugin 3des routine iv_len fix

Browse Source 
Since 3DES has 8 bytes of initialization vector and
code contains hardcode for 16 bytes, check added to
determine if crypto algorythm is 3DES_CBC and set
corresponding iv_len param

Change-Id: Iac50c8a8241e321e3b4d576c88f2496852bd905c
Signed-off-by: Vladimir Ratnikov <vratnikov@netgate.com>
This commit is contained in:
Vladimir Ratnikov
2019-05-17 09:17:59 -04:00
committed by Neale Ranns
parent d1a5b2dcfa
commit f48050785f
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/crypto_openssl/main.c
View File

@ -70,9 +70,15 @@ openssl_ops_enc_cbc (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,
vnet_crypto_op_t *op = ops[i]; vnet_crypto_op_t *op = ops[i];
vnet_crypto_key_t *key = vnet_crypto_get_key (op->key_index); vnet_crypto_key_t *key = vnet_crypto_get_key (op->key_index);
int out_len; int out_len;
int iv_len;
if (op->op == VNET_CRYPTO_OP_3DES_CBC_ENC)
iv_len = 8;
else
iv_len = 16;
if (op->flags & VNET_CRYPTO_OP_FLAG_INIT_IV) if (op->flags & VNET_CRYPTO_OP_FLAG_INIT_IV)
RAND_bytes (op->iv, 16); RAND_bytes (op->iv, iv_len);
EVP_EncryptInit_ex (ctx, cipher, NULL, key->data, op->iv); EVP_EncryptInit_ex (ctx, cipher, NULL, key->data, op->iv);
EVP_EncryptUpdate (ctx, op->dst, &out_len, op->src, op->len); EVP_EncryptUpdate (ctx, op->dst, &out_len, op->src, op->len);

12
test/test_ipsec_esp.py
View File

@ -363,7 +363,7 @@ class TestIpsecEspAll(ConfigIpsecESP,
super(TestIpsecEspAll, self).tearDown() super(TestIpsecEspAll, self).tearDown()
def test_crypto_algs(self): def test_crypto_algs(self):
"""All engines AES-[CBC, GCM]-[128, 192, 256] w/ & w/o ESN""" """All engines AES-[CBC, GCM]-[128, 192, 256] 3DES-CBC w/ & w/o ESN"""
# foreach VPP crypto engine # foreach VPP crypto engine
engines = ["ia32", "ipsecmb", "openssl"] engines = ["ia32", "ipsecmb", "openssl"]
@ -416,7 +416,15 @@ class TestIpsecEspAll(ConfigIpsecESP,
'scapy-crypto': "AES-CBC", 'scapy-crypto': "AES-CBC",
'scapy-integ': "HMAC-SHA1-96", 'scapy-integ': "HMAC-SHA1-96",
'salt': 0, 'salt': 0,
'key': "JPjyOWBeVEQiMe7hJPjyOWBeVEQiMe7h"}] 'key': "JPjyOWBeVEQiMe7hJPjyOWBeVEQiMe7h"},
{'vpp-crypto': (VppEnum.vl_api_ipsec_crypto_alg_t.
IPSEC_API_CRYPTO_ALG_3DES_CBC),
'vpp-integ': (VppEnum.vl_api_ipsec_integ_alg_t.
IPSEC_API_INTEG_ALG_SHA1_96),
'scapy-crypto': "3DES",
'scapy-integ': "HMAC-SHA1-96",
'salt': 0,
'key': "JPjyOWBeVEQiMe7h00112233"}]
# with and without ESN # with and without ESN
flags = [0, flags = [0,