diff options
author | Christian Poessinger <christian@poessinger.com> | 2022-10-01 12:35:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-01 12:35:19 +0200 |
commit | 8248aaaa7952db580a199bd36202e7f26c19ec88 (patch) | |
tree | d45d2368574f67693866309a86f4a6b6ab9e014e /src/op_mode | |
parent | 4105b464491f72aa87765aa3b072fb56ace71b89 (diff) | |
parent | 542a964d7207a052e04cb843c1ea4c7a68a981c9 (diff) | |
download | vyos-1x-8248aaaa7952db580a199bd36202e7f26c19ec88.tar.gz vyos-1x-8248aaaa7952db580a199bd36202e7f26c19ec88.zip |
Merge pull request #1568 from dmbaturin/abbr-consistency
T4722: consistent use of the official spelling for RADIUS and IPsec
Diffstat (limited to 'src/op_mode')
-rwxr-xr-x | src/op_mode/ikev2_profile_generator.py | 8 | ||||
-rwxr-xr-x | src/op_mode/vpn_ike_sa.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/op_mode/ikev2_profile_generator.py b/src/op_mode/ikev2_profile_generator.py index 21561d16f..a22f04c45 100755 --- a/src/op_mode/ikev2_profile_generator.py +++ b/src/op_mode/ikev2_profile_generator.py @@ -119,7 +119,7 @@ config_base = ipsec_base + ['remote-access', 'connection'] pki_base = ['pki'] conf = ConfigTreeQuery() if not conf.exists(config_base): - exit('IPSec remote-access is not configured!') + exit('IPsec remote-access is not configured!') profile_name = 'VyOS IKEv2 Profile' if args.profile: @@ -131,7 +131,7 @@ if args.name: conn_base = config_base + [args.connection] if not conf.exists(conn_base): - exit(f'IPSec remote-access connection "{args.connection}" does not exist!') + exit(f'IPsec remote-access connection "{args.connection}" does not exist!') data = conf.get_config_dict(conn_base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True) @@ -178,7 +178,7 @@ for _, proposal in ike_proposal.items(): proposal['hash'] in set(vyos2client_integrity) and proposal['dh_group'] in set(supported_dh_groups)): - # We 're-code' from the VyOS IPSec proposals to the Apple naming scheme + # We 're-code' from the VyOS IPsec proposals to the Apple naming scheme proposal['encryption'] = vyos2client_cipher[ proposal['encryption'] ] proposal['hash'] = vyos2client_integrity[ proposal['hash'] ] @@ -191,7 +191,7 @@ count = 1 for _, proposal in esp_proposals.items(): if {'encryption', 'hash'} <= set(proposal): if proposal['encryption'] in set(vyos2client_cipher) and proposal['hash'] in set(vyos2client_integrity): - # We 're-code' from the VyOS IPSec proposals to the Apple naming scheme + # We 're-code' from the VyOS IPsec proposals to the Apple naming scheme proposal['encryption'] = vyos2client_cipher[ proposal['encryption'] ] proposal['hash'] = vyos2client_integrity[ proposal['hash'] ] diff --git a/src/op_mode/vpn_ike_sa.py b/src/op_mode/vpn_ike_sa.py index 00f34564a..4b44c5c15 100755 --- a/src/op_mode/vpn_ike_sa.py +++ b/src/op_mode/vpn_ike_sa.py @@ -71,7 +71,7 @@ if __name__ == '__main__': args = parser.parse_args() if not process_named_running('charon'): - print("IPSec Process NOT Running") + print("IPsec Process NOT Running") sys.exit(0) ike_sa(args.peer, args.nat) |