aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2017-08-07 17:22:01 +0200
committerTobias Brunner <tobias@strongswan.org>2017-08-07 17:22:01 +0200
commitca280574baae12159973785b11b48de4b50ee39f (patch)
treed510362b9bb9fe91f74527c896585c86cae37d1a
parentc11d13c4b94a2f0533344a200de2bd8d106ecb97 (diff)
downloadstrongswan-ca280574baae12159973785b11b48de4b50ee39f.tar.bz2
strongswan-ca280574baae12159973785b11b48de4b50ee39f.tar.xz
Fixed some typos, courtesy of codespell
-rw-r--r--NEWS2
-rw-r--r--conf/options/charon.opt2
-rw-r--r--src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c2
-rw-r--r--src/libcharon/encoding/generator.c2
-rw-r--r--src/libcharon/encoding/message.h8
-rw-r--r--src/libcharon/encoding/payloads/encodings.h2
-rw-r--r--src/libcharon/plugins/eap_radius/eap_radius_accounting.c2
-rw-r--r--src/libcharon/plugins/vici/ruby/lib/vici.rb2
-rw-r--r--src/libimcv/swid_gen/swid_gen.h4
-rw-r--r--src/libstrongswan/crypto/crypto_tester.h2
-rw-r--r--src/libstrongswan/tests/test_suite.c2
-rw-r--r--src/libtls/tls.h2
-rw-r--r--src/libtls/tls_aead.h2
13 files changed, 17 insertions, 17 deletions
diff --git a/NEWS b/NEWS
index dc9bd6824..3e6a050da 100644
--- 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 3593c6a5f..900b9b46b 100644
--- 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 b43507caf..809814b53 100644
--- 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 41aacd4ed..dee1a3f73 100644
--- 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 8c4372974..732fd9b54 100644
--- 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 442bf7489..9ff23753a 100644
--- 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 0c302af51..e1f5be06a 100644
--- 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 bcf1a17be..f846a14af 100644
--- 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 06ca0a341..c143f292d 100644
--- 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 34dfa9489..1b02cb469 100644
--- 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 0af34c847..8541cdaef 100644
--- 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 f3dc198cf..f832ef50e 100644
--- 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 8b5cda5a7..389a498a5 100644
--- 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
*/