diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/op_mode/show_ipsec_sa.py | 17 | 
1 files changed, 14 insertions, 3 deletions
| diff --git a/src/op_mode/show_ipsec_sa.py b/src/op_mode/show_ipsec_sa.py index 0828743e8..e319cc38d 100755 --- a/src/op_mode/show_ipsec_sa.py +++ b/src/op_mode/show_ipsec_sa.py @@ -82,13 +82,24 @@ for sa in sas:                  pkts_str = re.sub(r'B', r'', pkts_str)                  enc = isa["encr-alg"].decode() -                key_size = isa["encr-keysize"].decode() -                hash = isa["integ-alg"].decode() +                if "encr-keysize" in isa: +                    key_size = isa["encr-keysize"].decode() +                else: +                    key_size = "" +                if "integ-alg" in isa: +                    hash = isa["integ-alg"].decode() +                else: +                    hash = ""                  if "dh-group" in isa:                      dh_group = isa["dh-group"].decode()                  else:                      dh_group = "" -                proposal = "{0}_{1}/{2}".format(enc, key_size, hash) + +                proposal = enc +                if key_size: +                    proposal = "{0}_{1}".format(proposal, key_size) +                if hash: +                    proposal = "{0}/{1}".format(proposal, hash)                  if dh_group:                      proposal = "{0}/{1}".format(proposal, dh_group) | 
