T4722: consistently use the "IPsec" spelling for IPsec

3 files changed, 8 insertions, 8 deletions

diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py
index c9061366d..77a425f8b 100755
--- a/src/conf_mode/vpn_ipsec.py
+++ b/src/conf_mode/vpn_ipsec.py
@@ -265,7 +265,7 @@ def verify(ipsec):
 
                     ike = ra_conf['ike_group']
                     if dict_search(f'ike_group.{ike}.key_exchange', ipsec) != 'ikev2':
-                        raise ConfigError('IPSec remote-access connections requires IKEv2!')
+                        raise ConfigError('IPsec remote-access connections requires IKEv2!')
 
                 else:
                     raise ConfigError(f"Missing ike-group on {name} remote-access config")
@@ -308,10 +308,10 @@ def verify(ipsec):
                     for pool in ra_conf['pool']:
                         if pool == 'dhcp':
                             if dict_search('remote_access.dhcp.server', ipsec) == None:
-                                raise ConfigError('IPSec DHCP server is not configured!')
+                                raise ConfigError('IPsec DHCP server is not configured!')
                         elif pool == 'radius':
                             if dict_search('remote_access.radius.server', ipsec) == None:
-                                raise ConfigError('IPSec RADIUS server is not configured!')
+                                raise ConfigError('IPsec RADIUS server is not configured!')
 
                             if dict_search('authentication.client_mode', ra_conf) != 'eap-radius':
                                 raise ConfigError('RADIUS IP pool requires eap-radius client authentication!')
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)