Fixed some typos, courtesy of codespell

diff --git a/conf/options/charon.opt b/conf/options/charon.opt
index 5d64d1f930b6c08c1efbff69b5623fbc200dba97..00949222a76472123521b1992d3633473096e8f8 100644 (file)
--- a/conf/options/charon.opt
+++ b/conf/options/charon.opt
@@ -375,6 +375,9 @@ charon.receive_delay_type = 0
 charon.replay_window = 32
        Size of the AH/ESP replay window, in packets.
 
+charon.reqid_base = 1
+       Value of the first reqid to be automatically assigned to a CHILD_SA.
+
 charon.retransmit_base = 1.8
        Base to use for calculating exponential back off, see IKEv2 RETRANSMISSION
        in **strongswan.conf**(5).
@@ -405,9 +408,6 @@ charon.routing_table
 charon.routing_table_prio
        Priority of the routing table.
 
-charon.reqid_base = 1
-       Value of the first reqid to be automatically assigned to a CHILD_SA.
-
 charon.rsa_pss = no
        Whether to use RSA with PSS padding instead of PKCS#1 padding by default.
 

diff --git a/conf/plugins/resolve.opt b/conf/plugins/resolve.opt
index 3a20214695919334c158c275f0a592f76e51da4d..b5b393358383724447a5e622364d52472ba5205c 100644 (file)
--- a/conf/plugins/resolve.opt
+++ b/conf/plugins/resolve.opt
@@ -17,4 +17,4 @@ charon.plugins.resolve.resolvconf.path = /sbin/resolvconf
 
        If not configured, **resolvconf**(8) will be used if found at the default
        location.  Otherwise, the file in _charon.plugins.resolve.file_ will be
-       modfied directly.
+       modified directly.

diff --git a/src/libstrongswan/threading/thread.c b/src/libstrongswan/threading/thread.c
index d132c940aab363f8e48002ec7d5dd11a8a3472cb..b8e2ce42dee3af652987637a3a5cd4c6ec3bf5c8 100644 (file)
--- a/src/libstrongswan/threading/thread.c
+++ b/src/libstrongswan/threading/thread.c
@@ -308,7 +308,7 @@ static void thread_cleanup(private_thread_t *this)
  * Main function wrapper for threads.
  *
  * Excluded from AddressSanitizer because some newer versions have an issue that
- * causes an "AddressSanitizer CHECK failed" error for cancelled threads.
+ * causes an "AddressSanitizer CHECK failed" error for canceled threads.
  */
 ADDRESS_SANITIZER_EXCLUDE
 static void *thread_main(private_thread_t *this)

diff --git a/src/swanctl/swanctl.conf.5.head.in b/src/swanctl/swanctl.conf.5.head.in
index 8ac7b1e6baa94573919be08894ecf2f3fa9e30d7..f030b5a149b5c45f35d948e1fd19304937caa870 100644 (file)
--- a/src/swanctl/swanctl.conf.5.head.in
+++ b/src/swanctl/swanctl.conf.5.head.in
@@ -6,7 +6,7 @@ swanctl.conf is the configuration file used by the
 .BR swanctl (8)
 tool to load configurations and credentials into the strongSwan IKE daemon.
 
-For a description of the basic file syntax, including numer/time formats, or how
+For a description of the basic file syntax, including number/time formats, or how
 to reference sections or split the configuration in multiple files by including
 other files, refer to
 .BR strongswan.conf (5).

diff --git a/src/swanctl/swanctl.opt b/src/swanctl/swanctl.opt
index 92da6103724c2c68cdef19b6f9660e94747a998e..92774414567a5efdb33c2128670da66efaf8eb55 100644 (file)
--- a/src/swanctl/swanctl.opt
+++ b/src/swanctl/swanctl.opt
@@ -302,7 +302,7 @@ connections.<conn>.if_id_in = 0
        config, see there for details.
 
        The special value _%unique_ allocates a unique interface ID per IKE_SA,
-       which is inherited by all its CHILD_SAs (unless overriden there), beyond
+       which is inherited by all its CHILD_SAs (unless overridden there), beyond
        that the value _%unique-dir_ assigns a different unique interface ID for
        each direction (in/out).
 
@@ -313,7 +313,7 @@ connections.<conn>.if_id_out = 0
        config, see there for details.
 
        The special value _%unique_ allocates a unique interface ID per IKE_SA,
-       which is inherited by all its CHILD_SAs (unless overriden there), beyond
+       which is inherited by all its CHILD_SAs (unless overridden there), beyond
        that the value _%unique-dir_ assigns a different unique interface ID for
        each direction (in/out).
 

diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/description.txt b/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/description.txt
index 26de3c98290a07c70e2a34c90e95775cff9f0d37..e1af766c25419a9e627a115c0c0c1620646d8c0e 100644 (file)
--- a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/description.txt
+++ b/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/description.txt
@@ -1,5 +1,5 @@
 The roadwarriors <b>carol</b> and <b>dave</b> set up a connection to gateway <b>moon</b>.
-At the outset the gateway does not send an AUTH payload thus signalling
+At the outset the gateway does not send an AUTH payload thus signaling
 a mutual <b>EAP-only</b> authentication.
 <p/>
 Next the clients use the GSM <i>Subscriber Identity Module</i> (<b>EAP-SIM</b>)

diff --git a/testing/tests/ikev2/rw-eap-sim-only-radius/description.txt b/testing/tests/ikev2/rw-eap-sim-only-radius/description.txt
index 26de3c98290a07c70e2a34c90e95775cff9f0d37..e1af766c25419a9e627a115c0c0c1620646d8c0e 100644 (file)
--- a/testing/tests/ikev2/rw-eap-sim-only-radius/description.txt
+++ b/testing/tests/ikev2/rw-eap-sim-only-radius/description.txt
@@ -1,5 +1,5 @@
 The roadwarriors <b>carol</b> and <b>dave</b> set up a connection to gateway <b>moon</b>.
-At the outset the gateway does not send an AUTH payload thus signalling
+At the outset the gateway does not send an AUTH payload thus signaling
 a mutual <b>EAP-only</b> authentication.
 <p/>
 Next the clients use the GSM <i>Subscriber Identity Module</i> (<b>EAP-SIM</b>)