Fixed some typos, courtesy of codespell

diff --git a/NEWS b/NEWS
index dc9bd68246d38735914011e1c6767cc27c2d6539..3e6a050da19c68fbb63c699204b28e13320bcad4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -915,7 +915,7 @@ strongswan-5.0.0
   keying protocols. The feature-set of IKEv1 in charon is almost on par with
   pluto, but currently does not support AH or bundled AH+ESP SAs. Beside
   RSA/ECDSA, PSK and XAuth, charon also supports the Hybrid authentication
-  mode. Informations for interoperability and migration is available at
+  mode. Information for interoperability and migration is available at
   http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1.
 
 - Charon's bus_t has been refactored so that loggers and other listeners are

diff --git a/conf/options/charon.opt b/conf/options/charon.opt
index 3593c6a5f968bccb88cc0aefe07a241e2387c13b..900b9b46b8c041e73754e9a97be9167b3fc42145 100644 (file)
--- a/conf/options/charon.opt
+++ b/conf/options/charon.opt
@@ -271,7 +271,7 @@ charon.port_nat_t = 4500
        port will be allocated.
 
 charon.prefer_best_path = no
-       Wether to prefer updating SAs to the path with the best route.
+       Whether to prefer updating SAs to the path with the best route.
 
        By default, charon keeps SAs on the routing path with addresses it
        previously used if that path is still usable. By setting this option to

diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
index b43507cafb37f6d9ba5b9f583d6daa5359019c1b..809814b5355d29589510666e75a5655c8eb6d79a 100644 (file)
--- a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
@@ -435,7 +435,7 @@ METHOD(listener_t, ike_updown, bool,
 {
        /* this callback is only registered during initiation, so if the IKE_SA
         * goes down we assume some kind of authentication error, more specific
-        * errors are catched in the alert() handler */
+        * errors are caught in the alert() handler */
        if (this->ike_sa == ike_sa && !up)
        {
                charonservice->update_status(charonservice,

diff --git a/src/libcharon/encoding/generator.c b/src/libcharon/encoding/generator.c
index 41aacd4edbcb2440d086fc90105acf1355770b1e..dee1a3f73aa705d360aad2f0842698df71e8ed81 100644 (file)
--- a/src/libcharon/encoding/generator.c
+++ b/src/libcharon/encoding/generator.c
@@ -86,7 +86,7 @@ struct private_generator_t {
        uint8_t current_bit;
 
        /**
-        * Associated data struct to read informations from.
+        * Associated data struct to read information from.
         */
        void *data_struct;
 

diff --git a/src/libcharon/encoding/message.h b/src/libcharon/encoding/message.h
index 8c4372974d62a3a719a4e422f452f66bab4e2e50..732fd9b54e1bd5d1f820ea246839131f7c9cd7de 100644 (file)
--- a/src/libcharon/encoding/message.h
+++ b/src/libcharon/encoding/message.h
@@ -312,7 +312,7 @@ struct message_t {
        status_t (*add_fragment)(message_t *this, message_t *fragment);
 
        /**
-        * Gets the source host informations.
+        * Gets the source host information.
         *
         * @warning Returned host_t object is not getting cloned,
         * do not destroy nor modify.
@@ -322,7 +322,7 @@ struct message_t {
        host_t * (*get_source) (message_t *this);
 
        /**
-        * Sets the source host informations.
+        * Sets the source host information.
         *
         * @warning host_t object is not getting cloned and gets destroyed by
         *                      message_t.destroy or next call of message_t.set_source.
@@ -332,7 +332,7 @@ struct message_t {
        void (*set_source) (message_t *this, host_t *host);
 
        /**
-        * Gets the destination host informations.
+        * Gets the destination host information.
         *
         * @warning Returned host_t object is not getting cloned,
         * do not destroy nor modify.
@@ -342,7 +342,7 @@ struct message_t {
        host_t * (*get_destination) (message_t *this);
 
        /**
-        * Sets the destination host informations.
+        * Sets the destination host information.
         *
         * @warning host_t object is not getting cloned and gets destroyed by
         *                      message_t.destroy or next call of message_t.set_destination.

diff --git a/src/libcharon/encoding/payloads/encodings.h b/src/libcharon/encoding/payloads/encodings.h
index 442bf74891993656a8de00f9093f05fb2d141328..9ff23753a728a9f48dee49106fc2ebd1b0a45a03 100644 (file)
--- a/src/libcharon/encoding/payloads/encodings.h
+++ b/src/libcharon/encoding/payloads/encodings.h
@@ -37,7 +37,7 @@ typedef struct encoding_rule_t encoding_rule_t;
  * Header is parsed like a payload and gets its one payload_id
  * from PRIVATE USE space. Also the substructures
  * of specific payload types get their own payload_id
- * from PRIVATE_USE space. See IKEv2-Draft for more informations.
+ * from PRIVATE_USE space. See IKEv2-Draft for more information.
  */
 enum encoding_type_t {
 

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
index 0c302af51df8bdcd5f0365ab5c8bcb9a269cd960..e1f5be06a239819f9526a718164c28d9d4f7029c 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
@@ -477,7 +477,7 @@ static entry_t* get_or_create_entry(private_eap_radius_accounting_t *this,
                        .interim = {
                                .last = now,
                        },
-                       /* default terminate cause, if none other catched */
+                       /* default terminate cause, if none other caught */
                        .cause = ACCT_CAUSE_USER_REQUEST,
                );
                snprintf(entry->sid, sizeof(entry->sid), "%u-%u", this->prefix, unique);

diff --git a/src/libcharon/plugins/vici/ruby/lib/vici.rb b/src/libcharon/plugins/vici/ruby/lib/vici.rb
index bcf1a17be7255311235b83838a17909c7f429643..f846a14afd4d0a452ed353049c88190607818ec0 100644 (file)
--- a/src/libcharon/plugins/vici/ruby/lib/vici.rb
+++ b/src/libcharon/plugins/vici/ruby/lib/vici.rb
@@ -550,7 +550,7 @@ module Vici
     # Listen for a set of event messages. This call is blocking, and invokes
     # the passed closure for each event received. The closure receives the
     # event name and the event message as argument. To stop listening, the
-    # closure may raise a StopEventListening exception, the only catched
+    # closure may raise a StopEventListening exception, the only caught
     # exception.
     def listen_events(events, &block)
       self.class.instance_eval do

diff --git a/src/libimcv/swid_gen/swid_gen.h b/src/libimcv/swid_gen/swid_gen.h
index 06ca0a3419db865e4b5a0d750e30cb6f91f5fbb7..c143f292d49a873e2889b8de4c9dd28a099eb57c 100644 (file)
--- a/src/libimcv/swid_gen/swid_gen.h
+++ b/src/libimcv/swid_gen/swid_gen.h
@@ -37,7 +37,7 @@ struct swid_gen_t {
         * @param package               Package name (can be NULL)
         * @param version               Package version (can be NULL)
         * @param full                  Generate full SWID tags with file information
-        * @param pretty                Generate SWID tags with pretty formating
+        * @param pretty                Generate SWID tags with pretty formatting
         * @return                              SWID tag
         */
        char* (*generate_tag)(swid_gen_t *this, char *sw_id, char *package,
@@ -48,7 +48,7 @@ struct swid_gen_t {
         *
         * @param sw_id_only    Return software identifier only
         * @param full                  Generate full SWID tags with file information
-        * @param pretty                Generate SWID tags with pretty formating
+        * @param pretty                Generate SWID tags with pretty formatting
         * @return                              Tag enumerator (sw_id, tag)
         */
        enumerator_t* (*create_tag_enumerator)(swid_gen_t *this, bool sw_id_only,

diff --git a/src/libstrongswan/crypto/crypto_tester.h b/src/libstrongswan/crypto/crypto_tester.h
index 34dfa948904fd9b66b72033fcb519468a733ace1..1b02cb4690687b380cde320fa1dce9d6ab0d2c7d 100644 (file)
--- a/src/libstrongswan/crypto/crypto_tester.h
+++ b/src/libstrongswan/crypto/crypto_tester.h
@@ -83,7 +83,7 @@ struct signer_test_vector_t {
        size_t len;
        /** input data */
        u_char *data;
-       /** expected output, with ouput size of the tested algorithm */
+       /** expected output, with output size of the tested algorithm */
        u_char *mac;
 };
 

diff --git a/src/libstrongswan/tests/test_suite.c b/src/libstrongswan/tests/test_suite.c
index 0af34c847f2268208fc0364175e3f13d72c90f39..8541cdaefcaaf9201a582f7bee53fef660053248 100644 (file)
--- a/src/libstrongswan/tests/test_suite.c
+++ b/src/libstrongswan/tests/test_suite.c
@@ -381,7 +381,7 @@ void test_setup_handler()
        sigaction(SIGSEGV, &action, NULL);
        sigaction(SIGILL, &action, NULL);
        sigaction(SIGBUS, &action, NULL);
-       /* ignore ALRM/USR1, these are catched by main thread only */
+       /* ignore ALRM/USR1, these are caught by main thread only */
        action.sa_handler = SIG_IGN;
        sigaction(SIGALRM, &action, NULL);
        sigaction(SIGUSR1, &action, NULL);

diff --git a/src/libtls/tls.h b/src/libtls/tls.h
index f3dc198cfe46c5136086f6333013e1f0900a271b..f832ef50e42324de7967894528c1b41e6b6e9ada 100644 (file)
--- a/src/libtls/tls.h
+++ b/src/libtls/tls.h
@@ -169,7 +169,7 @@ struct tls_t {
         * Query upper layer for one or more TLS records, build fragments.
         *
         * The TLS stack automatically fragments the records to the given buffer
-        * size. Fragmentation is indicated by the reclen ouput parameter and
+        * size. Fragmentation is indicated by the reclen output parameter and
         * the return value. For the first fragment of a TLS record, a non-zero
         * record length is returned in reclen. If more fragments follow, NEED_MORE
         * is returned. A return value of ALREADY_DONE indicates that the final

diff --git a/src/libtls/tls_aead.h b/src/libtls/tls_aead.h
index 8b5cda5a74057673e11853e55daad197c380d109..389a498a54c05212915d148ffcc1bd3d849995da 100644 (file)
--- a/src/libtls/tls_aead.h
+++ b/src/libtls/tls_aead.h
@@ -75,7 +75,7 @@ struct tls_aead_t {
        size_t (*get_mac_key_size)(tls_aead_t *this);
 
        /**
-        * Get the encrytion key size, if used.
+        * Get the encryption key size, if used.
         *
         * @return              key size, in bytes, 0 if not used
         */