Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ipsec: add support for AES CTR
[vpp.git]
/
test
/
template_ipsec.py
diff --git
a/test/template_ipsec.py
b/test/template_ipsec.py
index
129f220
..
918c993
100644
(file)
--- a/
test/template_ipsec.py
+++ b/
test/template_ipsec.py
@@
-28,14
+28,14
@@
class IPsecIPv4Params:
self.remote_tun_if_host6 = '1111::1'
self.scapy_tun_sa_id = 100
self.remote_tun_if_host6 = '1111::1'
self.scapy_tun_sa_id = 100
- self.scapy_tun_spi = 100
1
+ self.scapy_tun_spi = 100
0
self.vpp_tun_sa_id = 200
self.vpp_tun_sa_id = 200
- self.vpp_tun_spi =
1
000
+ self.vpp_tun_spi =
2
000
self.scapy_tra_sa_id = 300
self.scapy_tra_sa_id = 300
- self.scapy_tra_spi =
2001
+ self.scapy_tra_spi =
3000
self.vpp_tra_sa_id = 400
self.vpp_tra_sa_id = 400
- self.vpp_tra_spi =
2
000
+ self.vpp_tra_spi =
4
000
self.auth_algo_vpp_id = (VppEnum.vl_api_ipsec_integ_alg_t.
IPSEC_API_INTEG_ALG_SHA1_96)
self.auth_algo_vpp_id = (VppEnum.vl_api_ipsec_integ_alg_t.
IPSEC_API_INTEG_ALG_SHA1_96)
@@
-94,7
+94,7
@@
class IPsecIPv6Params:
def mk_scapy_crypt_key(p):
def mk_scapy_crypt_key(p):
- if p.crypt_algo
== "AES-GCM"
:
+ if p.crypt_algo
in ("AES-GCM", "AES-CTR")
:
return p.crypt_key + struct.pack("!I", p.salt)
else:
return p.crypt_key
return p.crypt_key + struct.pack("!I", p.salt)
else:
return p.crypt_key
@@
-798,7
+798,7
@@
class IpsecTun4(object):
"incorrect SA in counts: expected %d != %d" %
(count, pkts))
pkts = p.tun_sa_out.get_stats(worker)['packets']
"incorrect SA in counts: expected %d != %d" %
(count, pkts))
pkts = p.tun_sa_out.get_stats(worker)['packets']
- self.assertEqual(pkts,
count
,
+ self.assertEqual(pkts,
n_frags
,
"incorrect SA out counts: expected %d != %d" %
(count, pkts))
"incorrect SA out counts: expected %d != %d" %
(count, pkts))