summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-07-29 17:10:30 +0100
committerGitHub <noreply@github.com>2024-07-29 17:10:30 +0100
commit9149c657dfdb4d8297aba3ef1ed1346e670b071b (patch)
tree6294700b01ceeb3114e3a1b0a228f81ac0192467 /src/conf_mode
parentf7eae255a38316b7e00a23f0ff1ea84fda156e01 (diff)
parentb62b2f5f8a9c4f0a7dc26bce1f15843651119256 (diff)
downloadvyos-1x-9149c657dfdb4d8297aba3ef1ed1346e670b071b.tar.gz
vyos-1x-9149c657dfdb4d8297aba3ef1ed1346e670b071b.zip
Merge pull request #3823 from srividya0208/T6571
OpenVPN CLI-option: T6571: rename ncp-ciphers with data-ciphers
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces_openvpn.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conf_mode/interfaces_openvpn.py b/src/conf_mode/interfaces_openvpn.py
index 320ab7b7b..a03bd5959 100755
--- a/src/conf_mode/interfaces_openvpn.py
+++ b/src/conf_mode/interfaces_openvpn.py
@@ -322,8 +322,8 @@ def verify(openvpn):
if v4addr in openvpn['local_address'] and 'subnet_mask' not in openvpn['local_address'][v4addr]:
raise ConfigError('Must specify IPv4 "subnet-mask" for local-address')
- if dict_search('encryption.ncp_ciphers', openvpn):
- raise ConfigError('NCP ciphers can only be used in client or server mode')
+ if dict_search('encryption.data_ciphers', openvpn):
+ raise ConfigError('Cipher negotiation can only be used in client or server mode')
else:
# checks for client-server or site-to-site bridged
@@ -520,7 +520,7 @@ def verify(openvpn):
if dict_search('encryption.cipher', openvpn):
raise ConfigError('"encryption cipher" option is deprecated for TLS mode. '
- 'Use "encryption ncp-ciphers" instead')
+ 'Use "encryption data-ciphers" instead')
if dict_search('encryption.cipher', openvpn) == 'none':
print('Warning: "encryption none" was specified!')