summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-06-19 21:37:53 +0200
committerGitHub <noreply@github.com>2024-06-19 21:37:53 +0200
commit59db786301768d7dcc417ee2b8bb5afe30ae3c37 (patch)
tree30c3eefdb8333631ef82980707e7055c59007343 /src/conf_mode
parente0850e5715c45fcaa19feab382f89c40add304a1 (diff)
parent53e628e9b2c99632f4026b5093ad4693511cb75e (diff)
downloadvyos-1x-59db786301768d7dcc417ee2b8bb5afe30ae3c37.tar.gz
vyos-1x-59db786301768d7dcc417ee2b8bb5afe30ae3c37.zip
Merge pull request #3688 from vyos/mergify/bp/circinus-stream/pr-3685
macsec: T5447: fix error message syntax - there is no tx and rx key, only key (backport #3685)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces_macsec.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/conf_mode/interfaces_macsec.py b/src/conf_mode/interfaces_macsec.py
index eb0ca9a8b..3ede4377a 100755
--- a/src/conf_mode/interfaces_macsec.py
+++ b/src/conf_mode/interfaces_macsec.py
@@ -103,9 +103,9 @@ def verify(macsec):
# Logic to check static configuration
if dict_search('security.static', macsec) != None:
- # tx-key must be defined
+ # key must be defined
if dict_search('security.static.key', macsec) == None:
- raise ConfigError('Static MACsec tx-key must be defined.')
+ raise ConfigError('Static MACsec key must be defined.')
tx_len = len(dict_search('security.static.key', macsec))
@@ -119,12 +119,12 @@ def verify(macsec):
if 'peer' not in macsec['security']['static']:
raise ConfigError('Must have at least one peer defined for static MACsec')
- # For every enabled peer, make sure a MAC and rx-key is defined
+ # For every enabled peer, make sure a MAC and key is defined
for peer, peer_config in macsec['security']['static']['peer'].items():
if 'disable' not in peer_config and ('mac' not in peer_config or 'key' not in peer_config):
- raise ConfigError('Every enabled MACsec static peer must have a MAC address and rx-key defined.')
+ raise ConfigError('Every enabled MACsec static peer must have a MAC address and key defined!')
- # check rx-key length against cipher suite
+ # check key length against cipher suite
rx_len = len(peer_config['key'])
if dict_search('security.cipher', macsec) == 'gcm-aes-128' and rx_len != GCM_AES_128_LEN: