From: Josh Soref
Date: Wed, 5 Feb 2020 04:30:52 +0000 (-0500)
Subject: Spelling fixes
X-Git-Tag: 5.8.3dr1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3ab7a48cca065d43f61bb218cd5a9e0edac55d4;p=thirdparty%2Fstrongswan.git
Spelling fixes
* accumulating
* acquire
* alignment
* appropriate
* argument
* assign
* attribute
* authenticate
* authentication
* authenticator
* authority
* auxiliary
* brackets
* callback
* camellia
* can't
* cancelability
* certificate
* choinyambuu
* chunk
* collector
* collision
* communicating
* compares
* compatibility
* compressed
* confidentiality
* configuration
* connection
* consistency
* constraint
* construction
* constructor
* database
* decapsulated
* declaration
* decrypt
* derivative
* destination
* destroyed
* details
* devised
* dynamic
* ecapsulation
* encoded
* encoding
* encrypted
* enforcing
* enumerator
* establishment
* excluded
* exclusively
* exited
* expecting
* expire
* extension
* filter
* firewall
* foundation
* fulfillment
* gateways
* hashing
* hashtable
* heartbeats
* identifier
* identifiers
* identities
* identity
* implementers
* indicating
* initialize
* initiate
* initiation
* initiator
* inner
* instantiate
* legitimate
* libraries
* libstrongswan
* logger
* malloc
* manager
* manually
* measurement
* mechanism
* message
* network
* nonexistent
* object
* occurrence
* optional
* outgoing
* packages
* packets
* padding
* particular
* passphrase
* payload
* periodically
* policies
* possible
* previously
* priority
* proposal
* protocol
* provide
* provider
* pseudo
* pseudonym
* public
* qualifier
* quantum
* quintuplets
* reached
* reading
* recommendation to
* recommendation
* recursive
* reestablish
* referencing
* registered
* rekeying
* reliable
* replacing
* representing
* represents
* request
* request
* resolver
* result
* resulting
* resynchronization
* retriable
* revocation
* right
* rollback
* rule
* rules
* runtime
* scenario
* scheduled
* security
* segment
* service
* setting
* signature
* specific
* specified
* speed
* started
* steffen
* strongswan
* subjectaltname
* supported
* threadsafe
* traffic
* tremendously
* treshold
* unique
* uniqueness
* unknown
* until
* upper
* using
* validator
* verification
* version
* version
* warrior
Closes strongswan/strongswan#164.
---
diff --git a/NEWS b/NEWS
index c0c79551c5..2dc1e5422a 100644
--- a/NEWS
+++ b/NEWS
@@ -188,7 +188,7 @@ strongswan-5.7.0
for low-exponent keys (i.e. with e=3). CVE-2018-16151 has been assigned to
the problem of accepting random bytes after the OID of the hash function in
such signatures, and CVE-2018-16152 has been assigned to the issue of not
- verifying that the parameters in the ASN.1 algorithmIdentitifer structure is
+ verifying that the parameters in the ASN.1 algorithmIdentifier structure is
empty. Other flaws that don't lead to a vulnerability directly (e.g. not
checking for at least 8 bytes of padding) have no separate CVE assigned.
@@ -694,7 +694,7 @@ strongswan-5.3.3
- In the bliss plugin the c_indices derivation using a SHA-512 based random
oracle has been fixed, generalized and standardized by employing the MGF1 mask
- generation function with SHA-512. As a consequence BLISS signatures unsing the
+ generation function with SHA-512. As a consequence BLISS signatures using the
improved oracle are not compatible with the earlier implementation.
- Support for auto=route with right=%any for transport mode connections has
@@ -1269,7 +1269,7 @@ strongswan-5.0.1
- The PA-TNC and PB-TNC protocols can now process huge data payloads
>64 kB by distributing PA-TNC attributes over multiple PA-TNC messages
and these messages over several PB-TNC batches. As long as no
- consolidated recommandation from all IMVs can be obtained, the TNC
+ consolidated recommendation from all IMVs can be obtained, the TNC
server requests more client data by sending an empty SDATA batch.
- The rightgroups2 ipsec.conf option can require group membership during
@@ -1991,7 +1991,7 @@ strongswan-4.3.1
- The nm plugin also accepts CA certificates for gateway authentication. If
a CA certificate is configured, strongSwan uses the entered gateway address
- as its idenitity, requiring the gateways certificate to contain the same as
+ as its identity, requiring the gateways certificate to contain the same as
subjectAltName. This allows a gateway administrator to deploy the same
certificates to Windows 7 and NetworkManager clients.
@@ -2038,7 +2038,7 @@ strongswan-4.3.0
Initiators and responders can use several authentication rounds (e.g. RSA
followed by EAP) to authenticate. The new ipsec.conf leftauth/rightauth and
leftauth2/rightauth2 parameters define own authentication rounds or setup
- constraints for the remote peer. See the ipsec.conf man page for more detials.
+ constraints for the remote peer. See the ipsec.conf man page for more details.
- If glibc printf hooks (register_printf_function) are not available,
strongSwan can use the vstr string library to run on non-glibc systems.
@@ -2784,7 +2784,7 @@ strongswan-4.0.4
- Added support for preshared keys in IKEv2. PSK keys configured in
ipsec.secrets are loaded. The authby parameter specifies the authentication
- method to authentificate ourself, the other peer may use PSK or RSA.
+ method to authenticate ourself, the other peer may use PSK or RSA.
- Changed retransmission policy to respect the keyingtries parameter.
@@ -2922,7 +2922,7 @@ strongswan-2.7.0
left|rightfirewall keyword causes the automatic insertion
and deletion of ACCEPT rules for tunneled traffic upon
the successful setup and teardown of an IPsec SA, respectively.
- left|rightfirwall can be used with KLIPS under any Linux 2.4
+ left|rightfirewall can be used with KLIPS under any Linux 2.4
kernel or with NETKEY under a Linux kernel version >= 2.6.16
in conjunction with iptables >= 1.3.5. For NETKEY under a Linux
kernel version < 2.6.16 which does not support IPsec policy
@@ -3043,7 +3043,7 @@ strongswan-2.6.0
to replace the various shell and awk starter scripts (setup, _plutoload,
_plutostart, _realsetup, _startklips, _confread, and auto). Since
ipsec.conf is now parsed only once, the starting of multiple tunnels is
- accelerated tremedously.
+ accelerated tremendously.
- Added support of %defaultroute to the ipsec starter. If the IP address
changes, a HUP signal to the ipsec starter will automatically
@@ -3177,9 +3177,9 @@ strongswan-2.5.1
- Under the native IPsec of the Linux 2.6 kernel, a %trap eroute
installed either by setting auto=route in ipsec.conf or by
- a connection put into hold, generates an XFRM_AQUIRE event
+ a connection put into hold, generates an XFRM_ACQUIRE event
for each packet that wants to use the not-yet existing
- tunnel. Up to now each XFRM_AQUIRE event led to an entry in
+ tunnel. Up to now each XFRM_ACQUIRE event led to an entry in
the Quick Mode queue, causing multiple IPsec SA to be
established in rapid succession. Starting with strongswan-2.5.1
only a single IPsec SA is established per host-pair connection.
diff --git a/README_LEGACY.md b/README_LEGACY.md
index 251a304c73..9840c7760a 100644
--- a/README_LEGACY.md
+++ b/README_LEGACY.md
@@ -639,7 +639,7 @@ following entries are required in `/etc/ipsec.conf`:
conn rw1
right=%any
- righsubnet=10.4.0.5/32
+ rightsubnet=10.4.0.5/32
conn rw2
right=%any
diff --git a/conf/plugins/load-tester.opt b/conf/plugins/load-tester.opt
index e68adecc63..812f13d4ac 100644
--- a/conf/plugins/load-tester.opt
+++ b/conf/plugins/load-tester.opt
@@ -25,7 +25,7 @@ charon.plugins.load-tester.crl
certificates.
charon.plugins.load-tester.delay = 0
- Delay between initiatons for each thread.
+ Delay between initiations for each thread.
charon.plugins.load-tester.delete_after_established = no
Delete an IKE_SA as soon as it has been established.
@@ -66,7 +66,7 @@ charon.plugins.load-tester.initiators = 0
Number of concurrent initiator threads to use in load test.
charon.plugins.load-tester.initiator_auth = pubkey
- Authentication method(s) the intiator uses.
+ Authentication method(s) the initiator uses.
charon.plugins.load-tester.initiator_id =
Initiator ID used in load test.
diff --git a/conf/strongswan.conf.5.tail.in b/conf/strongswan.conf.5.tail.in
index 4dd177ca04..baad476d1f 100644
--- a/conf/strongswan.conf.5.tail.in
+++ b/conf/strongswan.conf.5.tail.in
@@ -74,7 +74,7 @@ libtls library messages
libipsec library messages
.TP
.B lib
-libstrongwan library messages
+libstrongswan library messages
.TP
.B tnc
Trusted Network Connect
diff --git a/configure.ac b/configure.ac
index 10a3a9dca4..1aa8cdcc0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ ARG_WITH_SUBST([piddir], [/var/run], [set path for PID and UNIX sock
ARG_WITH_SUBST([ipsecdir], [${libexecdir%/}/ipsec], [set installation path for ipsec tools])
ARG_WITH_SUBST([ipseclibdir], [${libdir%/}/ipsec], [set installation path for ipsec libraries])
ARG_WITH_SUBST([plugindir], [${ipseclibdir%/}/plugins], [set the installation path of plugins])
-ARG_WITH_SUBST([imcvdir], [${ipseclibdir%/}/imcvs], [set the installation path of IMC and IMV dynamic librariers])
+ARG_WITH_SUBST([imcvdir], [${ipseclibdir%/}/imcvs], [set the installation path of IMC and IMV dynamic libraries])
ARG_WITH_SUBST([nm-ca-dir], [/usr/share/ca-certificates], [directory the NM backend uses to look up trusted root certificates])
ARG_WITH_SUBST([swanctldir], [${sysconfdir}/swanctl], [base directory for swanctl configuration files and credentials])
ARG_WITH_SUBST([linux-headers], [\${top_srcdir}/src/include], [set directory of linux header files to use])
@@ -1035,7 +1035,7 @@ if test x$tss_tss2 = xtrue; then
AC_SUBST(tss2_LIBS, "$tss2_sys_LIBS")
else
PKG_CHECK_MODULES(tss2_tabrmd, [tcti-tabrmd],
- [tss2_tabrmd=true; AC_DEFINE([TSS2_TCTI_TABRMD], [], [use TCTI Access Broker and Resource Mamager])],
+ [tss2_tabrmd=true; AC_DEFINE([TSS2_TCTI_TABRMD], [], [use TCTI Access Broker and Resource Manager])],
[tss2_tabrmd=false])
PKG_CHECK_MODULES(tss2_socket, [tcti-socket],
[tss2_socket=true; AC_DEFINE([TSS2_TCTI_SOCKET], [], [use TCTI Sockets])],
diff --git a/src/charon-nm/nm/nm_backend.c b/src/charon-nm/nm/nm_backend.c
index 75db8c6b35..379a2f30b7 100644
--- a/src/charon-nm/nm/nm_backend.c
+++ b/src/charon-nm/nm/nm_backend.c
@@ -44,7 +44,7 @@ struct nm_backend_t {
nm_creds_t *creds;
/**
- * attribute handler regeisterd at the daemon
+ * attribute handler registered at the daemon
*/
nm_handler_t *handler;
};
diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
index ca608b12fa..5e539b3fe9 100644
--- a/src/charon-nm/nm/nm_service.c
+++ b/src/charon-nm/nm/nm_service.c
@@ -561,7 +561,7 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection,
return FALSE;
}
}
- /* ... or certificate/private key authenitcation */
+ /* ... or certificate/private key authentication */
else if ((str = nm_setting_vpn_get_data_item(vpn, "usercert")))
{
public_key_t *public;
diff --git a/src/charon-tkm/src/tkm/tkm_listener.c b/src/charon-tkm/src/tkm/tkm_listener.c
index bb4fd27984..36b9771a1b 100644
--- a/src/charon-tkm/src/tkm/tkm_listener.c
+++ b/src/charon-tkm/src/tkm/tkm_listener.c
@@ -45,7 +45,7 @@ struct private_tkm_listener_t {
/**
* Return id of remote identity.
*
- * TODO: Replace this with the lookup for the remote identitiy id.
+ * TODO: Replace this with the lookup for the remote identity id.
*
* Currently the reqid of the first child SA in peer config of IKE SA is
* returned. Might choose wrong reqid if IKE SA has multiple child configs
diff --git a/src/conftest/README b/src/conftest/README
index ad3339835b..22f32bec73 100644
--- a/src/conftest/README
+++ b/src/conftest/README
@@ -108,7 +108,7 @@ The following CHILD_SA specific configuration options are supported:
lts: Local side traffic selectors, comma separated CIDR subnets
rts: Remote side traffic selectors, comma separated CIDR subnets
transport: Propose IPsec transport mode instead of tunnel mode
- tfc_padding: Inject Traffic Flow Confidentialty bytes to align packets to the
+ tfc_padding: Inject Traffic Flow Confidentiality bytes to align packets to the
given length
proposal: CHILD_SA proposal list, same syntax as IKE_SA proposal list
@@ -271,7 +271,7 @@ Currently, the following hooks are defined with the following options:
request: yes to set in request, no in response
id: IKEv2 message identifier of message to mangle
from: proposal number to mangle
- to: new porposal number to set instead of from
+ to: new proposal number to set instead of from
set_reserved: set arbitrary reserved bits/bytes in payloads
request: yes to set in request, no in response
id: IKEv2 message identifier of message to mangle
diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index d10f3c7b7d..cbbe0e9def 100644
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -129,7 +129,7 @@ static bool load_cert(settings_t *settings, bool trusted)
}
/**
- * Load certificates from the confiuguration file
+ * Load certificates from the configuration file
*/
static bool load_certs(settings_t *settings, char *dir)
{
@@ -163,7 +163,7 @@ static bool load_certs(settings_t *settings, char *dir)
}
/**
- * Load private keys from the confiuguration file
+ * Load private keys from the configuration file
*/
static bool load_keys(settings_t *settings, char *dir)
{
diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c
index fa3f7d78b0..4be9453653 100644
--- a/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c
+++ b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c
@@ -38,7 +38,7 @@ struct private_kernel_android_ipsec_t {
};
/**
- * Callback registrered with libipsec.
+ * Callback registered with libipsec.
*/
static void expire(uint8_t protocol, uint32_t spi, host_t *dst, bool hard)
{
diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac
index 61a3a77c46..2854bf9c8e 100644
--- a/src/frontends/gnome/configure.ac
+++ b/src/frontends/gnome/configure.ac
@@ -68,7 +68,7 @@ AC_ARG_ENABLE(
)
AC_ARG_WITH(
[libnm-glib],
- AS_HELP_STRING([--without-libnm-glib], [build NetworkManager-strongswan without libnm-glib comatibility]),
+ AS_HELP_STRING([--without-libnm-glib], [build NetworkManager-strongswan without libnm-glib compatibility]),
[with_libnm_glib=no],
[with_libnm_glib=yes]
)
diff --git a/src/frontends/gnome/properties/nm-strongswan-dialog.ui b/src/frontends/gnome/properties/nm-strongswan-dialog.ui
index 43332356ab..3a04d6e0ac 100644
--- a/src/frontends/gnome/properties/nm-strongswan-dialog.ui
+++ b/src/frontends/gnome/properties/nm-strongswan-dialog.ui
@@ -27,7 +27,7 @@
-
-
+ TrueFalse12
@@ -351,7 +351,7 @@
-
+ TrueFalse12
diff --git a/src/include/linux/xfrm.h b/src/include/linux/xfrm.h
index 82f394a3be..805071799d 100644
--- a/src/include/linux/xfrm.h
+++ b/src/include/linux/xfrm.h
@@ -219,7 +219,7 @@ enum {
#define XFRM_NR_MSGTYPES (XFRM_MSG_MAX + 1 - XFRM_MSG_BASE)
/*
- * Generic LSM security context for comunicating to user space
+ * Generic LSM security context for communicating to user space
* NOTE: Same format as sadb_x_sec_ctx
*/
struct xfrm_user_sec_ctx {
diff --git a/src/libcharon/attributes/attribute_handler.h b/src/libcharon/attributes/attribute_handler.h
index cc09befe8c..675b3fa59d 100644
--- a/src/libcharon/attributes/attribute_handler.h
+++ b/src/libcharon/attributes/attribute_handler.h
@@ -37,7 +37,7 @@ struct attribute_handler_t {
/**
* Handle a configuration attribute.
*
- * After receiving a configuration attriubte, it is passed to each
+ * After receiving a configuration attribute, it is passed to each
* attribute handler until it is handled.
*
* @param ike_sa IKE_SA under which attribute is received
diff --git a/src/libcharon/attributes/attribute_manager.c b/src/libcharon/attributes/attribute_manager.c
index 7e82c0c956..9d327ee6b1 100644
--- a/src/libcharon/attributes/attribute_manager.c
+++ b/src/libcharon/attributes/attribute_manager.c
@@ -233,7 +233,7 @@ typedef struct {
enumerator_t *inner;
/** IKE_SA to request attributes for */
ike_sa_t *ike_sa;
- /** virtual IPs we are requesting along with attriubutes */
+ /** virtual IPs we are requesting along with attributes */
linked_list_t *vips;
} initiator_enumerator_t;
diff --git a/src/libcharon/attributes/mem_pool.c b/src/libcharon/attributes/mem_pool.c
index 6acf490bef..9fca4645c8 100644
--- a/src/libcharon/attributes/mem_pool.c
+++ b/src/libcharon/attributes/mem_pool.c
@@ -85,7 +85,7 @@ typedef struct {
* Lease entry.
*/
typedef struct {
- /* identitiy reference */
+ /* identity reference */
identification_t *id;
/* array of online leases, as unique_lease_t */
array_t *online;
diff --git a/src/libcharon/bus/bus.h b/src/libcharon/bus/bus.h
index 8a97e8dfc7..abf95a4c9a 100644
--- a/src/libcharon/bus/bus.h
+++ b/src/libcharon/bus/bus.h
@@ -461,7 +461,7 @@ struct bus_t {
* CHILD_SA migration hook.
*
* @param new ID of new SA when called for the old, NULL otherwise
- * @param uniue unique ID of new SA when called for the old, 0 otherwise
+ * @param unique unique ID of new SA when called for the old, 0 otherwise
*/
void (*children_migrate)(bus_t *this, ike_sa_id_t *new, uint32_t unique);
diff --git a/src/libcharon/config/child_cfg.c b/src/libcharon/config/child_cfg.c
index e0aee8b6a5..d4fb37cdca 100644
--- a/src/libcharon/config/child_cfg.c
+++ b/src/libcharon/config/child_cfg.c
@@ -114,12 +114,12 @@ struct private_child_cfg_t {
uint32_t reqid;
/**
- * Optionl interface ID to use for inbound CHILD_SA
+ * Optional interface ID to use for inbound CHILD_SA
*/
uint32_t if_id_in;
/**
- * Optionl interface ID to use for outbound CHILD_SA
+ * Optional interface ID to use for outbound CHILD_SA
*/
uint32_t if_id_out;
diff --git a/src/libcharon/config/child_cfg.h b/src/libcharon/config/child_cfg.h
index 13ec6d87b5..b176d67bd9 100644
--- a/src/libcharon/config/child_cfg.h
+++ b/src/libcharon/config/child_cfg.h
@@ -96,7 +96,7 @@ struct child_cfg_t {
/**
* Select a proposal from a supplied list.
*
- * Returned propsal is newly created and must be destroyed after usage.
+ * Returned proposal is newly created and must be destroyed after usage.
*
* @param proposals list from which proposals are selected
* @param flags flags to consider during proposal selection
@@ -124,7 +124,7 @@ struct child_cfg_t {
* side, one for the remote side.
* If a list with traffic selectors is supplied, these are used to narrow
* down the traffic selector list to the greatest common divisor.
- * Some traffic selector may be "dymamic", meaning they are narrowed down
+ * Some traffic selector may be "dynamic", meaning they are narrowed down
* to a specific address (host-to-host or virtual-IP setups). Use
* the "host" parameter to narrow such traffic selectors to that address.
* Resulted list and its traffic selectors must be destroyed after use.
diff --git a/src/libcharon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c
index 58e791f34b..2350ad5016 100644
--- a/src/libcharon/config/peer_cfg.c
+++ b/src/libcharon/config/peer_cfg.c
@@ -156,12 +156,12 @@ struct private_peer_cfg_t {
linked_list_t *remote_auth;
/**
- * Optionl interface ID to use for inbound CHILD_SA
+ * Optional interface ID to use for inbound CHILD_SA
*/
uint32_t if_id_in;
/**
- * Optionl interface ID to use for outbound CHILD_SA
+ * Optional interface ID to use for outbound CHILD_SA
*/
uint32_t if_id_out;
diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
index f4431266e7..b80e809c2c 100644
--- a/src/libcharon/config/peer_cfg.h
+++ b/src/libcharon/config/peer_cfg.h
@@ -134,7 +134,7 @@ struct peer_cfg_t {
ike_version_t (*get_ike_version)(peer_cfg_t *this);
/**
- * Get the IKE config to use for initiaton.
+ * Get the IKE config to use for initiation.
*
* @return the IKE config to use
*/
diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index db87c7093c..9ad985fb29 100644
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -150,7 +150,7 @@
* synchronization:
* Each IKE_SA must be checked out strictly and checked in again after use. The
* manager guarantees that only one thread may check out a single IKE_SA. This
- * allows us to write the (complex) IKE_SAs routines non-threadsave.
+ * allows us to write the (complex) IKE_SAs routines non-threadsafe.
* The IKE_SA contain the state and the logic of each IKE_SA and handle the
* messages.
*
diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index 819f771e56..0fc14a9e2a 100644
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -78,9 +78,9 @@ typedef struct {
/* Payload type */
payload_type_t type;
/* Minimal occurrence of this payload. */
- size_t min_occurence;
+ size_t min_occurrence;
/* Max occurrence of this payload. */
- size_t max_occurence;
+ size_t max_occurrence;
/* TRUE if payload must be encrypted */
bool encrypted;
/* If payload occurs, the message rule is fulfilled */
@@ -1653,7 +1653,7 @@ static ike_header_t *create_header(private_message_t *this)
/**
* Generates the message, if needed, wraps the payloads in an encrypted payload.
*
- * The generator and the possible enrypted payload are returned. The latter
+ * The generator and the possible encrypted payload are returned. The latter
* is not yet encrypted (but the transform is set). It is also not added to
* the payload list (so unless there are unencrypted payloads that list will
* be empty afterwards).
@@ -2600,11 +2600,11 @@ static status_t verify(private_message_t *this)
found++;
DBG2(DBG_ENC, "found payload of type %N",
payload_type_names, type);
- if (found > rule->max_occurence)
+ if (found > rule->max_occurrence)
{
DBG1(DBG_ENC, "payload of type %N more than %d times (%d) "
"occurred in current message", payload_type_names,
- type, rule->max_occurence, found);
+ type, rule->max_occurrence, found);
enumerator->destroy(enumerator);
return VERIFY_ERROR;
}
@@ -2612,10 +2612,10 @@ static status_t verify(private_message_t *this)
}
enumerator->destroy(enumerator);
- if (!complete && found < rule->min_occurence)
+ if (!complete && found < rule->min_occurrence)
{
DBG1(DBG_ENC, "payload of type %N not occurred %d times (%d)",
- payload_type_names, rule->type, rule->min_occurence, found);
+ payload_type_names, rule->type, rule->min_occurrence, found);
return VERIFY_ERROR;
}
if (found && rule->sufficient)
diff --git a/src/libcharon/encoding/parser.c b/src/libcharon/encoding/parser.c
index 9169ba202c..de66ad4677 100644
--- a/src/libcharon/encoding/parser.c
+++ b/src/libcharon/encoding/parser.c
@@ -391,7 +391,7 @@ METHOD(parser_t, parse_payload, status_t,
/* base pointer for output, avoids casting in every rule */
output = pld;
- /* parse the payload with its own rulse */
+ /* parse the payload with its own rules */
rule_count = pld->get_encoding_rules(pld, &this->rules);
for (rule_number = 0; rule_number < rule_count; rule_number++)
{
@@ -618,7 +618,7 @@ METHOD(parser_t, parse_payload, status_t,
return PARSE_ERROR;
}
}
- /* process next rulue */
+ /* process next rule */
rule++;
}
diff --git a/src/libcharon/encoding/payloads/cp_payload.h b/src/libcharon/encoding/payloads/cp_payload.h
index 122dc4f832..32ce58dd62 100644
--- a/src/libcharon/encoding/payloads/cp_payload.h
+++ b/src/libcharon/encoding/payloads/cp_payload.h
@@ -58,7 +58,7 @@ struct cp_payload_t {
/**
* Creates an enumerator of stored configuration_attribute_t objects.
*
- * @return enumerator over configration_attribute_T
+ * @return enumerator over configuration_attribute_t
*/
enumerator_t *(*create_attribute_enumerator) (cp_payload_t *this);
diff --git a/src/libcharon/encoding/payloads/eap_payload.c b/src/libcharon/encoding/payloads/eap_payload.c
index c2900aa4ea..005d14d7a8 100644
--- a/src/libcharon/encoding/payloads/eap_payload.c
+++ b/src/libcharon/encoding/payloads/eap_payload.c
@@ -83,7 +83,7 @@ static encoding_rule_t encodings[] = {
{ RESERVED_BIT, offsetof(private_eap_payload_t, reserved[6]) },
/* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_eap_payload_t, payload_length) },
- /* chunt to data, starting at "code" */
+ /* chunk to data, starting at "code" */
{ CHUNK_DATA, offsetof(private_eap_payload_t, data) },
};
diff --git a/src/libcharon/encoding/payloads/encodings.h b/src/libcharon/encoding/payloads/encodings.h
index 5adff32855..fb0e9ca3d2 100644
--- a/src/libcharon/encoding/payloads/encodings.h
+++ b/src/libcharon/encoding/payloads/encodings.h
@@ -179,7 +179,7 @@ enum encoding_type_t {
/**
* Representing a spi field.
*
- * When generating the content of the chunkt pointing to
+ * When generating the content of the chunk pointing to
* is written.
*
* When parsing SPI_SIZE bytes are read and written into the chunk pointing to.
@@ -248,7 +248,7 @@ enum encoding_type_t {
* this field is available or missing and so parsed/generated
* or not parsed/not generated.
*
- * When generating the content of the chunkt pointing to
+ * When generating the content of the chunk pointing to
* is written.
*
* When parsing SPI_SIZE bytes are read and written into the chunk pointing to.
@@ -274,7 +274,7 @@ enum encoding_type_t {
* Depending on the last field of type TS_TYPE
* this field is either 4 or 16 byte long.
*
- * When generating the content of the chunkt pointing to
+ * When generating the content of the chunk pointing to
* is written.
*
* When parsing 4 or 16 bytes are read and written into the chunk pointing to.
@@ -290,7 +290,7 @@ enum encoding_type_t {
* Representing an IKE_SPI field in an IKEv2 Header.
*
* When generating the value of the uint64_t pointing to
- * is written (host and networ order is not changed).
+ * is written (host and network order is not changed).
*
* When parsing 8 bytes are read and written into the uint64_t pointing to.
*/
@@ -302,7 +302,7 @@ enum encoding_type_t {
ENCRYPTED_DATA,
/**
- * Reprensenting a field containing a set of wrapped payloads.
+ * Representing a field containing a set of wrapped payloads.
*
* This type is not used directly, but as an offset to the wrapped payloads.
* The type of the wrapped payload is added to this encoding type.
diff --git a/src/libcharon/encoding/payloads/fragment_payload.h b/src/libcharon/encoding/payloads/fragment_payload.h
index fa53e04ac0..fe00bc0205 100644
--- a/src/libcharon/encoding/payloads/fragment_payload.h
+++ b/src/libcharon/encoding/payloads/fragment_payload.h
@@ -61,7 +61,7 @@ struct fragment_payload_t {
/**
* Get the fragment data.
*
- * @return chunkt to internal fragment data
+ * @return chunk to internal fragment data
*/
chunk_t (*get_data)(fragment_payload_t *this);
diff --git a/src/libcharon/encoding/payloads/hash_payload.h b/src/libcharon/encoding/payloads/hash_payload.h
index 604de4894e..29aa426628 100644
--- a/src/libcharon/encoding/payloads/hash_payload.h
+++ b/src/libcharon/encoding/payloads/hash_payload.h
@@ -46,7 +46,7 @@ struct hash_payload_t {
/**
* Get the hash value.
*
- * @return chunkt to internal hash data
+ * @return chunk to internal hash data
*/
chunk_t (*get_hash) (hash_payload_t *this);
diff --git a/src/libcharon/encoding/payloads/id_payload.h b/src/libcharon/encoding/payloads/id_payload.h
index 283780624b..0442681803 100644
--- a/src/libcharon/encoding/payloads/id_payload.h
+++ b/src/libcharon/encoding/payloads/id_payload.h
@@ -89,7 +89,7 @@ id_payload_t *id_payload_create_from_identification(payload_type_t type,
* Create an IKEv1 ID_ADDR_SUBNET/RANGE identity from a traffic selector.
*
* @param ts traffic selector
- * @return PLV1_ID id_paylad_t object.
+ * @return PLV1_ID id_payload_t object.
*/
id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts);
diff --git a/src/libcharon/encoding/payloads/payload.h b/src/libcharon/encoding/payloads/payload.h
index cb3dce0426..6d36fbbd0c 100644
--- a/src/libcharon/encoding/payloads/payload.h
+++ b/src/libcharon/encoding/payloads/payload.h
@@ -168,7 +168,7 @@ enum payload_type_t {
PLV2_NONCE = 40,
/**
- * Notify paylaod (N).
+ * Notify payload (N).
*/
PLV2_NOTIFY = 41,
@@ -178,7 +178,7 @@ enum payload_type_t {
PLV2_DELETE = 42,
/**
- * Vendor id paylpoad (V).
+ * Vendor id payload (V).
*/
PLV2_VENDOR_ID = 43,
@@ -382,9 +382,9 @@ struct payload_t {
size_t (*get_length) (payload_t *this);
/**
- * Verifies payload structure and makes consistence check.
+ * Verifies payload structure and makes consistency check.
*
- * @return SUCCESS, FAILED if consistence not given
+ * @return SUCCESS, FAILED if consistency not given
*/
status_t (*verify) (payload_t *this);
@@ -399,7 +399,7 @@ struct payload_t {
*
* Useful for the parser, who wants a generic constructor for all payloads.
* It supports all payload_t methods. If a payload type is not known,
- * an unknwon_paylod is created with the chunk of data in it.
+ * an unknown_payload is created with the chunk of data in it.
*
* @param type type of the payload to create
* @return payload_t object
diff --git a/src/libcharon/encoding/payloads/proposal_substructure.h b/src/libcharon/encoding/payloads/proposal_substructure.h
index be7da840ad..8101d9f386 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.h
+++ b/src/libcharon/encoding/payloads/proposal_substructure.h
@@ -117,7 +117,7 @@ struct proposal_substructure_t {
bool (*get_cpi) (proposal_substructure_t *this, uint16_t *cpi);
/**
- * Get proposals contained in a propsal_substructure_t.
+ * Get proposals contained in a proposal_substructure_t.
*
* @param list list to add created proposals to
*/
diff --git a/src/libcharon/encoding/payloads/traffic_selector_substructure.h b/src/libcharon/encoding/payloads/traffic_selector_substructure.h
index 5901103ff7..d9698f86f3 100644
--- a/src/libcharon/encoding/payloads/traffic_selector_substructure.h
+++ b/src/libcharon/encoding/payloads/traffic_selector_substructure.h
@@ -134,7 +134,7 @@ struct traffic_selector_substructure_t {
traffic_selector_substructure_t *traffic_selector_substructure_create(void);
/**
- * Creates an initialized traffif selector substructure using
+ * Creates an initialized traffic selector substructure using
* the values from a traffic_selector_t.
*
* @param traffic_selector traffic_selector_t to use for initialization
diff --git a/src/libcharon/kernel/kernel_interface.h b/src/libcharon/kernel/kernel_interface.h
index b7e3686d1b..141198ac3d 100644
--- a/src/libcharon/kernel/kernel_interface.h
+++ b/src/libcharon/kernel/kernel_interface.h
@@ -361,7 +361,7 @@ struct kernel_interface_t {
*
* @param virtual_ip virtual ip address to remove
* @param prefix prefix length of the IP to uninstall, -1 for auto
- * @param wait TRUE to wait untily IP is gone
+ * @param wait TRUE to wait until IP is gone
* @return SUCCESS if operation completed
*/
status_t (*del_ip) (kernel_interface_t *this, host_t *virtual_ip,
@@ -433,7 +433,7 @@ struct kernel_interface_t {
/**
* Check if interfaces are excluded by config.
*
- * @return TRUE if no interfaces are exclued by config
+ * @return TRUE if no interfaces are excluded by config
*/
bool (*all_interfaces_usable)(kernel_interface_t *this);
diff --git a/src/libcharon/kernel/kernel_listener.h b/src/libcharon/kernel/kernel_listener.h
index b790ed1eed..71868511f7 100644
--- a/src/libcharon/kernel/kernel_listener.h
+++ b/src/libcharon/kernel/kernel_listener.h
@@ -47,7 +47,7 @@ struct kernel_listener_t {
traffic_selector_t *src_ts, traffic_selector_t *dst_ts);
/**
- * Hook called if an exire event for an IPsec SA is received.
+ * Hook called if an expire event for an IPsec SA is received.
*
* @param protocol protocol of the expired SA
* @param spi spi of the expired SA
@@ -63,7 +63,7 @@ struct kernel_listener_t {
*
* @param protocol IPsec protocol of affected SA
* @param spi spi of the SA
- * @param dst old destinatino address of SA
+ * @param dst old destination address of SA
* @param remote new remote host
* @return TRUE to remain registered, FALSE to unregister
*/
diff --git a/src/libcharon/network/receiver.c b/src/libcharon/network/receiver.c
index 67a25295d4..b191ed8d6a 100644
--- a/src/libcharon/network/receiver.c
+++ b/src/libcharon/network/receiver.c
@@ -302,7 +302,7 @@ static bool cookie_required(private_receiver_t *this,
/* We don't disable cookies unless we haven't seen IKE_SA_INITs
* for COOKIE_CALMDOWN_DELAY seconds. This avoids jittering between
* cookie on / cookie off states, which is problematic. Consider the
- * following: A legitimiate initiator sends a IKE_SA_INIT while we
+ * following: A legitimate initiator sends a IKE_SA_INIT while we
* are under a DoS attack. If we toggle our cookie behavior,
* multiple retransmits of this IKE_SA_INIT might get answered with
* and without cookies. The initiator goes on and retries with
diff --git a/src/libcharon/plugins/dhcp/dhcp_provider.h b/src/libcharon/plugins/dhcp/dhcp_provider.h
index e720e876c7..c78b037c61 100644
--- a/src/libcharon/plugins/dhcp/dhcp_provider.h
+++ b/src/libcharon/plugins/dhcp/dhcp_provider.h
@@ -33,7 +33,7 @@ typedef struct dhcp_provider_t dhcp_provider_t;
struct dhcp_provider_t {
/**
- * Implements attribute_provier_t interface.
+ * Implements attribute_provider_t interface.
*/
attribute_provider_t provider;
diff --git a/src/libcharon/plugins/eap_aka_3gpp/eap_aka_3gpp_functions.h b/src/libcharon/plugins/eap_aka_3gpp/eap_aka_3gpp_functions.h
index c9fb1a9830..3b78255ab8 100644
--- a/src/libcharon/plugins/eap_aka_3gpp/eap_aka_3gpp_functions.h
+++ b/src/libcharon/plugins/eap_aka_3gpp/eap_aka_3gpp_functions.h
@@ -63,7 +63,7 @@ typedef struct eap_aka_3gpp_functions_t eap_aka_3gpp_functions_t;
* @param id user identity
* @param[out] k (16 byte) scratchpad to receive secret key K
* @param[out] opc (16 byte) scratchpad to receive operator variant key
- * derivate OPc
+ * derivative OPc
*/
bool eap_aka_3gpp_get_k_opc(identification_t *id, uint8_t k[AKA_K_LEN],
uint8_t opc[AKA_OPC_LEN]);
@@ -88,7 +88,7 @@ struct eap_aka_3gpp_functions_t {
* f1 : Calculate MAC-A from RAND, SQN, AMF using K and OPc
*
* @param k (128 bit) secret key K
- * @param opc (128 bit) operator variant key derivate OPc
+ * @param opc (128 bit) operator variant key derivative OPc
* @param rand (128 bit) random value RAND
* @param sqn (48 bit) sequence number SQN
* @param amf (16 bit) authentication management field AMF
@@ -106,7 +106,7 @@ struct eap_aka_3gpp_functions_t {
* f1* : Calculate MAC-S from RAND, SQN, AMF using K and OPc
*
* @param k (128 bit) secret key K
- * @param opc (128 bit) operator variant key derivate OPc
+ * @param opc (128 bit) operator variant key derivative OPc
* @param rand (128 bit) random value RAND
* @param sqn (48 bit) sequence number SQN
* @param amf (16 bit) authentication management field AMF
@@ -127,7 +127,7 @@ struct eap_aka_3gpp_functions_t {
* f5 : Calculates AK from RAND using K and OPc
*
* @param k (128 bit) secret key K
- * @param opc (128 bit) operator variant key derivate OPc
+ * @param opc (128 bit) operator variant key derivative OPc
* @param rand (128 bit) random value RAND
* @param[out] res (64 bit) scratchpad to receive signed response RES
* @param[out] ck (128 bit) scratchpad to receive encryption key CK
@@ -146,7 +146,7 @@ struct eap_aka_3gpp_functions_t {
* f5* : Calculates resync AKS from RAND using K and OPc
*
* @param k (128 bit) secret key K
- * @param opc (128 bit) operator variant key derivate OPc
+ * @param opc (128 bit) operator variant key derivative OPc
* @param rand (128 bit) random value RAND
* @param[out] aks (48 bit) scratchpad to receive resync anonymity key AKS
* @return TRUE if calculations successful
diff --git a/src/libcharon/plugins/eap_gtc/eap_gtc.c b/src/libcharon/plugins/eap_gtc/eap_gtc.c
index 3434ef17b3..95ba090b79 100644
--- a/src/libcharon/plugins/eap_gtc/eap_gtc.c
+++ b/src/libcharon/plugins/eap_gtc/eap_gtc.c
@@ -44,7 +44,7 @@ struct private_eap_gtc_t {
identification_t *peer;
/**
- * EAP message identififier
+ * EAP message identifier
*/
uint8_t identifier;
};
diff --git a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
index 4e1e202e7c..0c33f39f3f 100644
--- a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
+++ b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
@@ -1161,7 +1161,7 @@ static status_t process_server_retry(private_eap_mschapv2_t *this,
/* delay the response for some time to make brute-force attacks harder */
sleep(RETRY_DELAY);
- /* since the error is retryable the state does not change, we still
+ /* since the error is retriable the state does not change, we still
* expect an MSCHAPV2_RESPONSE from the peer */
return NEED_MORE;
}
diff --git a/src/libcharon/plugins/eap_radius/eap_radius.c b/src/libcharon/plugins/eap_radius/eap_radius.c
index ae1371b45b..2dc7a423e7 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius.c
@@ -383,7 +383,7 @@ static void process_filter_id(radius_message_t *msg)
}
/**
- * Handle Session-Timeout attribte and Interim updates
+ * Handle Session-Timeout attribute and Interim updates
*/
static void process_timeout(radius_message_t *msg)
{
@@ -502,7 +502,7 @@ static void add_unity_split_attribute(eap_radius_provider_t *provider,
}
writer->write_data(writer, net->get_address(net));
writer->write_data(writer, mask->get_address(mask));
- padding = writer->skip(writer, 6); /* 6 bytes pdding */
+ padding = writer->skip(writer, 6); /* 6 bytes padding */
memset(padding.ptr, 0, padding.len);
mask->destroy(mask);
net->destroy(net);
diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.h b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.h
index 4bd00b297c..78161913e2 100644
--- a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.h
+++ b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.h
@@ -18,8 +18,8 @@
* @{ @ingroup eap_simaka_pseudonym
*/
-#ifndef EAP_SIMAKA_PSEDUONYM_PROVIDER_H_
-#define EAP_SIMAKA_PSEDUONYM_PROVIDER_H_
+#ifndef EAP_SIMAKA_PSEUDONYM_PROVIDER_H_
+#define EAP_SIMAKA_PSEUDONYM_PROVIDER_H_
#include
@@ -46,4 +46,4 @@ struct eap_simaka_pseudonym_provider_t {
*/
eap_simaka_pseudonym_provider_t *eap_simaka_pseudonym_provider_create();
-#endif /** EAP_SIMAKA_PSEDUONYM_PROVIDER_H_ @}*/
+#endif /** EAP_SIMAKA_PSEUDONYM_PROVIDER_H_ @}*/
diff --git a/src/libcharon/plugins/forecast/forecast_listener.h b/src/libcharon/plugins/forecast/forecast_listener.h
index 49827ecb1b..f581e3d2df 100644
--- a/src/libcharon/plugins/forecast/forecast_listener.h
+++ b/src/libcharon/plugins/forecast/forecast_listener.h
@@ -39,7 +39,7 @@ struct forecast_listener_t {
* Create an enumerator over active tunnels.
*
* The enumerator enumerates over local or remote traffic selectors,
- * associated firewall marks and if decasulated packets should get
+ * associated firewall marks and if decapsulated packets should get
* reinjected into other tunnels.
*
* @param local TRUE to enumerate local, FALSE to enumerate remote TS
diff --git a/src/libcharon/plugins/ha/ha_kernel.c b/src/libcharon/plugins/ha/ha_kernel.c
index 20cf048443..d66c4e51a6 100644
--- a/src/libcharon/plugins/ha/ha_kernel.c
+++ b/src/libcharon/plugins/ha/ha_kernel.c
@@ -160,7 +160,7 @@ static uint32_t jhash(jhash_version_t version, uint32_t a, uint32_t b)
}
/**
- * Segmentate a calculated hash
+ * Segment a calculated hash
*/
static u_int hash2segment(private_ha_kernel_t *this, uint64_t hash)
{
diff --git a/src/libcharon/plugins/ha/ha_kernel.h b/src/libcharon/plugins/ha/ha_kernel.h
index 269a871db4..783dc2e859 100644
--- a/src/libcharon/plugins/ha/ha_kernel.h
+++ b/src/libcharon/plugins/ha/ha_kernel.h
@@ -50,7 +50,7 @@ struct ha_kernel_t {
/**
* Get the segment an arbitrary integer is in.
*
- * @param n integer to segmentate
+ * @param n integer to segment
*/
u_int (*get_segment_int)(ha_kernel_t *this, int n);
diff --git a/src/libcharon/plugins/ha/ha_segments.c b/src/libcharon/plugins/ha/ha_segments.c
index 153534915c..dc43936088 100644
--- a/src/libcharon/plugins/ha/ha_segments.c
+++ b/src/libcharon/plugins/ha/ha_segments.c
@@ -82,7 +82,7 @@ struct private_ha_segments_t {
bool heartbeat_active;
/**
- * Interval we send hearbeats
+ * Interval we send heartbeats
*/
int heartbeat_delay;
diff --git a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
index 6c2d22304e..3665d45576 100644
--- a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
+++ b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
@@ -432,7 +432,7 @@ static bool install_route(private_kernel_libipsec_ipsec_t *this,
.prefixlen = policy->dst.mask,
);
#ifndef __linux__
- /* on Linux we cant't install a gateway */
+ /* on Linux we can't install a gateway */
route->gateway = charon->kernel->get_nexthop(charon->kernel, dst, -1, src,
NULL);
#endif
diff --git a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c
index 0f36e7be3f..db684b0600 100644
--- a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c
+++ b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c
@@ -145,7 +145,7 @@ static bool equals_sa(sa_entry_t *a, sa_entry_t *b)
typedef struct {
/** policy source addresses */
traffic_selector_t *src;
- /** policy destinaiton addresses */
+ /** policy destination addresses */
traffic_selector_t *dst;
/** WFP allocated LUID for inbound filter ID */
uint64_t policy_in;
diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
index 77c9630ca5..36410652cb 100644
--- a/src/libcharon/plugins/load_tester/load_tester_config.c
+++ b/src/libcharon/plugins/load_tester/load_tester_config.c
@@ -327,7 +327,7 @@ static void generate_auth_cfg(private_load_tester_config_t *this, char *str,
if (this->initiator_id)
{
if (this->initiator_match && (!local && !num))
- { /* as responder, use the secified identity that matches
+ { /* as responder, use the specified identity that matches
* all used initiator identities, if given. */
snprintf(buf, sizeof(buf), this->initiator_match, rnd);
id = identification_create_from_string(buf);
diff --git a/src/libcharon/plugins/socket_default/socket_default_socket.c b/src/libcharon/plugins/socket_default/socket_default_socket.c
index b59b60c3e4..bf9276163a 100644
--- a/src/libcharon/plugins/socket_default/socket_default_socket.c
+++ b/src/libcharon/plugins/socket_default/socket_default_socket.c
@@ -142,7 +142,7 @@ struct private_socket_default_socket_t {
bool set_source;
/**
- * TRUE to force sending source interface on outbound packetrs
+ * TRUE to force sending source interface on outbound packets
*/
bool set_sourceif;
diff --git a/src/libcharon/plugins/stroke/stroke_ca.h b/src/libcharon/plugins/stroke/stroke_ca.h
index 97b77dbb98..d9061c1e73 100644
--- a/src/libcharon/plugins/stroke/stroke_ca.h
+++ b/src/libcharon/plugins/stroke/stroke_ca.h
@@ -63,7 +63,7 @@ struct stroke_ca_t {
* otherwise returns the same certificate.
*
* @param cert certificate to check
- * @return reference to stored CA certifiate, or original
+ * @return reference to stored CA certificate, or original
*/
certificate_t *(*get_cert_ref)(stroke_ca_t *this, certificate_t *cert);
diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
index fe5c1a542e..175b6b5495 100644
--- a/src/libcharon/plugins/stroke/stroke_config.c
+++ b/src/libcharon/plugins/stroke/stroke_config.c
@@ -176,7 +176,7 @@ static bool add_proposals(private_stroke_config_t *this, char *string,
{
return TRUE;
}
- /* add default porposal to the end if not strict */
+ /* add default proposal to the end if not strict */
}
if (ike_cfg)
{
diff --git a/src/libcharon/plugins/stroke/stroke_cred.h b/src/libcharon/plugins/stroke/stroke_cred.h
index 43801b206d..8e2d20f409 100644
--- a/src/libcharon/plugins/stroke/stroke_cred.h
+++ b/src/libcharon/plugins/stroke/stroke_cred.h
@@ -47,7 +47,7 @@ struct stroke_cred_t {
* Reread secrets from config files.
*
* @param msg stroke message
- * @param prompt I/O channel to prompt for private key passhprase
+ * @param prompt I/O channel to prompt for private key passphrase
*/
void (*reread)(stroke_cred_t *this, stroke_msg_t *msg, FILE *prompt);
diff --git a/src/libcharon/plugins/uci/uci_creds.c b/src/libcharon/plugins/uci/uci_creds.c
index d73c94e0d5..c6de4756d1 100644
--- a/src/libcharon/plugins/uci/uci_creds.c
+++ b/src/libcharon/plugins/uci/uci_creds.c
@@ -41,7 +41,7 @@ struct private_uci_creds_t {
typedef struct {
/** implements enumerator */
enumerator_t public;
- /** inneer UCI enumerator */
+ /** inner UCI enumerator */
enumerator_t *inner;
/** currently enumerated shared shared */
shared_key_t *current;
diff --git a/src/libcharon/plugins/unity/unity_provider.h b/src/libcharon/plugins/unity/unity_provider.h
index a25df5df04..22c861c081 100644
--- a/src/libcharon/plugins/unity/unity_provider.h
+++ b/src/libcharon/plugins/unity/unity_provider.h
@@ -31,7 +31,7 @@ typedef struct unity_provider_t unity_provider_t;
struct unity_provider_t {
/**
- * Implements attribute_provier_t interface.
+ * Implements attribute_provider_t interface.
*/
attribute_provider_t provider;
diff --git a/src/libcharon/plugins/vici/README.md b/src/libcharon/plugins/vici/README.md
index a0ab5608a6..f2c1208219 100644
--- a/src/libcharon/plugins/vici/README.md
+++ b/src/libcharon/plugins/vici/README.md
@@ -1271,7 +1271,7 @@ subdirectory, and gets built and installed if strongSwan has been
The _Vici::Session_ module provides a _new()_ constructor for a high level
interface, the underlying _Vici::Packet_ and _Vici::Transport_ classes are
usually not required to build Perl applications using VICI. The _Vici::Session_
-class provides methods for the supported VICI commands. The auxiliare
+class provides methods for the supported VICI commands. The auxiliary
_Vici::Message_ class is used to encode configuration parameters sent to
the daemon and decode data returned by the daemon.
diff --git a/src/libcharon/plugins/vici/libvici.h b/src/libcharon/plugins/vici/libvici.h
index 964752f53d..66c07ff65a 100644
--- a/src/libcharon/plugins/vici/libvici.h
+++ b/src/libcharon/plugins/vici/libvici.h
@@ -324,7 +324,7 @@ vici_parse_t vici_parse(vici_res_t *res);
char* vici_parse_name(vici_res_t *res);
/**
- * Compare name tag / key of a previusly parsed element.
+ * Compare name tag / key of a previously parsed element.
*
* This call is valid only after vici_parse() returned VICI_PARSE_KEY_VALUE,
* VICI_PARSE_BEGIN_SECTION or VICI_PARSE_BEGIN_LIST.
diff --git a/src/libcharon/plugins/vici/ruby/vici.gemspec.in b/src/libcharon/plugins/vici/ruby/vici.gemspec.in
index 8602ae14a5..f324975d14 100644
--- a/src/libcharon/plugins/vici/ruby/vici.gemspec.in
+++ b/src/libcharon/plugins/vici/ruby/vici.gemspec.in
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
The strongSwan VICI protocol allows external application to monitor,
configure and control the IKE daemon charon. This Ruby Gem provides a
native client side implementation of the VICI protocol, well suited to
- script automated tasks in a relaible way.
+ script automated tasks in a reliable way.
}
s.summary = "Native Ruby interface for strongSwan VICI"
s.homepage = "https://wiki.strongswan.org/projects/strongswan/wiki/Vici"
diff --git a/src/libcharon/plugins/vici/vici_authority.c b/src/libcharon/plugins/vici/vici_authority.c
index a91ece0903..d78ac21221 100644
--- a/src/libcharon/plugins/vici/vici_authority.c
+++ b/src/libcharon/plugins/vici/vici_authority.c
@@ -68,7 +68,7 @@ typedef struct authority_t authority_t;
struct authority_t {
/**
- * Name of the certification authoritiy
+ * Name of the certification authority
*/
char *name;
diff --git a/src/libcharon/plugins/vici/vici_logger.c b/src/libcharon/plugins/vici/vici_logger.c
index 8e7bcfa1c5..723ca07673 100644
--- a/src/libcharon/plugins/vici/vici_logger.c
+++ b/src/libcharon/plugins/vici/vici_logger.c
@@ -80,7 +80,7 @@ static job_requeue_t raise_events(private_vici_logger_t *this)
/**
* Queue a message for async processing
*/
-static void queue_messsage(private_vici_logger_t *this, vici_message_t *message)
+static void queue_message(private_vici_logger_t *this, vici_message_t *message)
{
this->queue->insert_last(this->queue, message);
if (this->queue->get_count(this->queue) == 1)
@@ -124,7 +124,7 @@ METHOD(logger_t, log_, void,
message = builder->finalize(builder);
if (message)
{
- queue_messsage(this, message);
+ queue_message(this, message);
}
}
this->recursive--;
diff --git a/src/libcharon/plugins/vici/vici_logger.h b/src/libcharon/plugins/vici/vici_logger.h
index 7be1d60d45..64fd5977e1 100644
--- a/src/libcharon/plugins/vici/vici_logger.h
+++ b/src/libcharon/plugins/vici/vici_logger.h
@@ -47,7 +47,7 @@ struct vici_logger_t {
* Create a vici_logger instance.
*
* @param dispatcher dispatcher to receive requests from
- * @return loggerential backend
+ * @return logger backend
*/
vici_logger_t *vici_logger_create(vici_dispatcher_t *dispatcher);
diff --git a/src/libcharon/plugins/vici/vici_socket.c b/src/libcharon/plugins/vici/vici_socket.c
index 8edd3fb37b..04a21227ab 100644
--- a/src/libcharon/plugins/vici/vici_socket.c
+++ b/src/libcharon/plugins/vici/vici_socket.c
@@ -406,7 +406,7 @@ CALLBACK(on_write, bool,
}
/**
- * Read in available header with data, non-blocking cumulating to buffer
+ * Read in available header with data, non-blocking accumulating to buffer
*/
static bool do_read(private_vici_socket_t *this, entry_t *entry,
stream_t *stream, char *errmsg, size_t errlen)
diff --git a/src/libcharon/processing/jobs/delete_ike_sa_job.h b/src/libcharon/processing/jobs/delete_ike_sa_job.h
index d3241f9ff2..068548bade 100644
--- a/src/libcharon/processing/jobs/delete_ike_sa_job.h
+++ b/src/libcharon/processing/jobs/delete_ike_sa_job.h
@@ -33,7 +33,7 @@ typedef struct delete_ike_sa_job_t delete_ike_sa_job_t;
* Class representing an DELETE_IKE_SA Job.
*
* This job is responsible for deleting established or half open IKE_SAs.
- * A half open IKE_SA is every IKE_SA which hasn't reache the SA_ESTABLISHED
+ * A half open IKE_SA is every IKE_SA which hasn't reached the SA_ESTABLISHED
* state.
*/
struct delete_ike_sa_job_t {
diff --git a/src/libcharon/processing/jobs/inactivity_job.h b/src/libcharon/processing/jobs/inactivity_job.h
index 814d606f71..35b5286bc9 100644
--- a/src/libcharon/processing/jobs/inactivity_job.h
+++ b/src/libcharon/processing/jobs/inactivity_job.h
@@ -29,7 +29,7 @@ typedef struct inactivity_job_t inactivity_job_t;
/**
* Job checking for inactivity of CHILD_SA to close them.
*
- * The inactivity job reschedules itself to check CHILD_SAs prediodically.
+ * The inactivity job reschedules itself to check CHILD_SAs periodically.
*/
struct inactivity_job_t {
diff --git a/src/libcharon/sa/child_sa.c b/src/libcharon/sa/child_sa.c
index b11236b8f9..207763953d 100644
--- a/src/libcharon/sa/child_sa.c
+++ b/src/libcharon/sa/child_sa.c
@@ -149,7 +149,7 @@ struct private_child_sa_t {
uint32_t unique_id;
/**
- * Whether FWD policieis in the outbound direction should be installed
+ * Whether FWD policies in the outbound direction should be installed
*/
bool policies_fwd_out;
diff --git a/src/libcharon/sa/child_sa.h b/src/libcharon/sa/child_sa.h
index c9b3f63e2b..8a2939efda 100644
--- a/src/libcharon/sa/child_sa.h
+++ b/src/libcharon/sa/child_sa.h
@@ -497,7 +497,7 @@ struct child_sa_t {
uint32_t (*get_rekey_spi)(child_sa_t *this);
/**
- * Update hosts and ecapulation mode in the kernel SAs and policies.
+ * Update hosts and ecapsulation mode in the kernel SAs and policies.
*
* @param me the new local host
* @param other the new remote host
diff --git a/src/libcharon/sa/eap/eap_method.h b/src/libcharon/sa/eap/eap_method.h
index 34041e347d..0b5218dfec 100644
--- a/src/libcharon/sa/eap/eap_method.h
+++ b/src/libcharon/sa/eap/eap_method.h
@@ -49,7 +49,7 @@ extern enum_name_t *eap_role_names;
* responses. An EAP method may need multiple exchanges before succeeding, and
* the eap_authentication may use multiple EAP methods to authenticate a peer.
* To accomplish these requirements, all EAP methods have their own
- * implementation while the eap_authenticatior uses one or more of these
+ * implementation while the eap_authenticator uses one or more of these
* EAP methods. Sending of EAP(SUCCESS/FAILURE) message is not the job
* of the method, the eap_authenticator does this.
* An EAP method may establish a MSK, this is used the complete the
@@ -162,7 +162,7 @@ struct eap_method_t {
* Constructors for server and peers are identical, to support both roles
* of a EAP method, a plugin needs register two constructors in the
* eap_manager_t.
- * The passed identites are of type ID_EAP and valid only during the
+ * The passed identities are of type ID_EAP and valid only during the
* constructor invocation.
*
* @param server ID of the server to use for credential lookup
diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index d6cc4e5a75..53afe843d4 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -237,7 +237,7 @@ struct private_ike_sa_t {
uint32_t keepalive_interval;
/**
- * The schedueld keep alive job, if any
+ * The scheduled keep alive job, if any
*/
send_keepalive_job_t *keepalive_job;
diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index d511081409..56dd53efe2 100644
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -248,7 +248,7 @@ enum ike_condition_t {
* Timing information and statistics to query from an SA
*/
enum statistic_t {
- /** Timestamp of SA establishement */
+ /** Timestamp of SA establishment */
STAT_ESTABLISHED = 0,
/** Timestamp of scheduled rekeying */
STAT_REKEY,
@@ -766,7 +766,7 @@ struct ike_sa_t {
* to the CHILD_SA.
*
* @param child_cfg child config to create CHILD from
- * @param reqid reqid to use for CHILD_SA, 0 assigne uniquely
+ * @param reqid reqid to use for CHILD_SA, 0 assign uniquely
* @param tsi source of triggering packet
* @param tsr destination of triggering packet.
* @return
@@ -1036,7 +1036,7 @@ struct ike_sa_t {
status_t (*reauth) (ike_sa_t *this);
/**
- * Restablish the IKE_SA.
+ * Reestablish the IKE_SA.
*
* Reestablish an IKE_SA after it has been closed.
*
@@ -1140,7 +1140,7 @@ struct ike_sa_t {
/**
* Remove the task the given enumerator points to.
*
- * @note This should be used with caution, in partciular, for tasks in the
+ * @note This should be used with caution, in particular, for tasks in the
* active and passive queues.
*
* @param enumerator enumerator created with the method above
@@ -1155,7 +1155,7 @@ struct ike_sa_t {
void (*flush_queue)(ike_sa_t *this, task_queue_t queue);
/**
- * Queue a task for initiaton to the task manager.
+ * Queue a task for initiation to the task manager.
*
* @param task task to queue
*/
diff --git a/src/libcharon/sa/ike_sa_id.h b/src/libcharon/sa/ike_sa_id.h
index 266b623808..3b0b9439dc 100644
--- a/src/libcharon/sa/ike_sa_id.h
+++ b/src/libcharon/sa/ike_sa_id.h
@@ -128,10 +128,10 @@ struct ike_sa_id_t {
* @param ike_version major IKE version
* @param initiator_spi initiators SPI
* @param responder_spi responders SPI
- * @param is_initiaor TRUE if we are the original initiator
+ * @param is_initiator TRUE if we are the original initiator
* @return ike_sa_id_t object
*/
ike_sa_id_t * ike_sa_id_create(uint8_t ike_version, uint64_t initiator_spi,
- uint64_t responder_spi, bool is_initiaor);
+ uint64_t responder_spi, bool is_initiator);
#endif /** IKE_SA_ID_H_ @}*/
diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
index 1de410d6c0..f95ff19af7 100644
--- a/src/libcharon/sa/ike_sa_manager.c
+++ b/src/libcharon/sa/ike_sa_manager.c
@@ -1813,7 +1813,7 @@ METHOD(ike_sa_manager_t, checkin, void,
* entry as checked out while we release the lock so no other
* thread can acquire it. Since it is not yet in the list of
* connected peers that will not cause a deadlock as no other
- * caller of check_unqiueness() will try to check out this SA */
+ * caller of check_uniqueness() will try to check out this SA */
entry->checked_out = thread_current();
unlock_single_segment(this, segment);
@@ -1909,7 +1909,7 @@ METHOD(ike_sa_manager_t, checkin_and_destroy, void,
}
else
{
- DBG1(DBG_MGR, "tried to checkin and delete nonexisting IKE_SA");
+ DBG1(DBG_MGR, "tried to checkin and delete nonexistent IKE_SA");
ike_sa->destroy(ike_sa);
}
charon->bus->set_sa(charon->bus, NULL);
diff --git a/src/libcharon/sa/ikev1/keymat_v1.h b/src/libcharon/sa/ikev1/keymat_v1.h
index 269816a59b..4c89f6d760 100644
--- a/src/libcharon/sa/ikev1/keymat_v1.h
+++ b/src/libcharon/sa/ikev1/keymat_v1.h
@@ -62,7 +62,7 @@ struct keymat_v1_t {
*
* @param proposal selected algorithms
* @param dh diffie hellman key, NULL if none used
- * @param spi_i SPI chosen by initiatior
+ * @param spi_i SPI chosen by initiator
* @param spi_r SPI chosen by responder
* @param nonce_i quick mode initiator nonce
* @param nonce_r quick mode responder nonce
@@ -95,7 +95,7 @@ struct keymat_v1_t {
/**
* Get HASH data for authentication.
*
- * @param initiatior TRUE to create HASH_I, FALSE for HASH_R
+ * @param initiator TRUE to create HASH_I, FALSE for HASH_R
* @param dh public DH value of peer to create HASH for
* @param dh_other others public DH value
* @param ike_sa_id IKE_SA identifier
diff --git a/src/libcharon/sa/ikev1/phase1.c b/src/libcharon/sa/ikev1/phase1.c
index ac2899f113..f3c053d363 100644
--- a/src/libcharon/sa/ikev1/phase1.c
+++ b/src/libcharon/sa/ikev1/phase1.c
@@ -88,7 +88,7 @@ struct private_phase1_t {
};
/**
- * Get the first authentcation config from peer config
+ * Get the first authentication config from peer config
*/
static auth_cfg_t *get_auth_cfg(peer_cfg_t *peer_cfg, bool local)
{
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_delete.c b/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
index e4379cabf9..917f8a1ee1 100644
--- a/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
@@ -85,7 +85,7 @@ METHOD(task_t, process_r, status_t,
bool found = FALSE;
/* some peers send DELETE payloads for other IKE_SAs, e.g. those for expired
- * ones after a rekeyeing, make sure the SPIs match */
+ * ones after a rekeying, make sure the SPIs match */
id = this->ike_sa->get_id(this->ike_sa);
payloads = message->create_payload_enumerator(message);
while (payloads->enumerate(payloads, &payload))
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_natd.c b/src/libcharon/sa/ikev1/tasks/isakmp_natd.c
index 81e63740e3..62d40537d6 100644
--- a/src/libcharon/sa/ikev1/tasks/isakmp_natd.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_natd.c
@@ -352,7 +352,7 @@ METHOD(task_t, process_i, status_t,
status_t result = NEED_MORE;
if (!this->ike_sa->supports_extension(this->ike_sa, EXT_NATT))
- { /* we didn't receive VIDs inidcating support for NAT-T */
+ { /* we didn't receive VIDs indicating support for NAT-T */
return SUCCESS;
}
diff --git a/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
index c98e97eb91..1dfe922ced 100644
--- a/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
@@ -27,7 +27,7 @@ typedef struct pubkey_authenticator_t pubkey_authenticator_t;
#include
/**
- * Implementation of authenticator_t using public key authenitcation.
+ * Implementation of authenticator_t using public key authentication.
*/
struct pubkey_authenticator_t {
diff --git a/src/libcharon/sa/ikev2/connect_manager.c b/src/libcharon/sa/ikev2/connect_manager.c
index ba602fc4a4..e859fbf742 100644
--- a/src/libcharon/sa/ikev2/connect_manager.c
+++ b/src/libcharon/sa/ikev2/connect_manager.c
@@ -54,7 +54,7 @@ struct private_connect_manager_t {
connect_manager_t public;
/**
- * Lock for exclusivly accessing the manager.
+ * Lock for exclusively accessing the manager.
*/
mutex_t *mutex;
diff --git a/src/libcharon/sa/ikev2/keymat_v2.c b/src/libcharon/sa/ikev2/keymat_v2.c
index db46b816b3..98cba066da 100644
--- a/src/libcharon/sa/ikev2/keymat_v2.c
+++ b/src/libcharon/sa/ikev2/keymat_v2.c
@@ -63,7 +63,7 @@ struct private_keymat_v2_t {
chunk_t skd;
/**
- * Key to build outging authentication data (SKp)
+ * Key to build outgoing authentication data (SKp)
*/
chunk_t skp_build;
diff --git a/src/libcharon/sa/ikev2/mediation_manager.c b/src/libcharon/sa/ikev2/mediation_manager.c
index ffb566591f..efe4d468d8 100644
--- a/src/libcharon/sa/ikev2/mediation_manager.c
+++ b/src/libcharon/sa/ikev2/mediation_manager.c
@@ -32,7 +32,7 @@ struct peer_t {
/** sa id of the peer, NULL if offline */
ike_sa_id_t *ike_sa_id;
- /** list of peer ids that reuested this peer */
+ /** list of peer ids that requested this peer */
linked_list_t *requested_by;
};
@@ -74,7 +74,7 @@ struct private_mediation_manager_t {
mediation_manager_t public;
/**
- * Lock for exclusivly accessing the manager.
+ * Lock for exclusively accessing the manager.
*/
mutex_t *mutex;
diff --git a/src/libcharon/sa/ikev2/tasks/ike_auth.c b/src/libcharon/sa/ikev2/tasks/ike_auth.c
index b055ff064a..f95ec5c55b 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_auth.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth.c
@@ -1174,7 +1174,7 @@ static void send_auth_failed_informational(private_ike_auth_t *this,
}
/**
- * Check if strict constraint fullfillment required to continue current auth
+ * Check if strict constraint fulfillment required to continue current auth
*/
static bool require_strict(private_ike_auth_t *this, bool mutual_eap)
{
diff --git a/src/libcharon/sa/ikev2/tasks/ike_delete.c b/src/libcharon/sa/ikev2/tasks/ike_delete.c
index 49cd663708..d93bf60277 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_delete.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_delete.c
@@ -91,7 +91,7 @@ METHOD(task_t, process_i, status_t,
}
/**
- * Check if this delete happened after a rekey collsion
+ * Check if this delete happened after a rekey collision
*/
static bool after_rekey_collision(private_ike_delete_t *this)
{
diff --git a/src/libcharon/sa/ikev2/tasks/ike_me.c b/src/libcharon/sa/ikev2/tasks/ike_me.c
index 8023da1fc6..5ca0b05cd2 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_me.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_me.c
@@ -404,7 +404,7 @@ METHOD(task_t, build_r, status_t,
if (this->callback)
{
/* we got a callback from the mediation server, initiate the
- * queued mediated connecction */
+ * queued mediated connection */
charon->connect_manager->check_and_initiate(
charon->connect_manager,
this->ike_sa->get_id(this->ike_sa),
diff --git a/src/libcharon/sa/ikev2/tasks/ike_natd.c b/src/libcharon/sa/ikev2/tasks/ike_natd.c
index 8ea903ec85..008abbb1e5 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_natd.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_natd.c
@@ -313,7 +313,7 @@ METHOD(task_t, build_i, status_t,
/* source may be any, we have 3 possibilities to get our source address:
* 1. It is defined in the config => use the one of the IKE_SA
* 2. We do a routing lookup in the kernel interface
- * 3. Include all possbile addresses
+ * 3. Include all possible addresses
*/
host = message->get_source(message);
if (!host->is_anyaddr(host) || force_encap(ike_cfg))
diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index c357d50359..4d17f949ad 100644
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -233,7 +233,7 @@ struct task_manager_t {
* If a message is processed outside of the manager, this call increments
* the message ID counters of the task manager.
*
- * @param inititate TRUE to increment the initiating ID
+ * @param initiate TRUE to increment the initiating ID
*/
void (*incr_mid)(task_manager_t *this, bool initiate);
@@ -280,7 +280,7 @@ struct task_manager_t {
/**
* Remove the task the given enumerator points to.
*
- * @note This should be used with caution, in partciular, for tasks in the
+ * @note This should be used with caution, in particular, for tasks in the
* active and passive queues.
*
* @param enumerator enumerator created with the method above
diff --git a/src/libcharon/tests/suites/test_mem_pool.c b/src/libcharon/tests/suites/test_mem_pool.c
index e509228d9a..236eb9fa1c 100644
--- a/src/libcharon/tests/suites/test_mem_pool.c
+++ b/src/libcharon/tests/suites/test_mem_pool.c
@@ -21,7 +21,7 @@ static void assert_host(char *expected, host_t *host)
{
if (!expected)
{
- ck_assert_msg(!host, "not epxecting IP != %+H", host);
+ ck_assert_msg(!host, "not expecting IP != %+H", host);
}
else
{
diff --git a/src/libcharon/tests/utils/exchange_test_asserts.h b/src/libcharon/tests/utils/exchange_test_asserts.h
index beb8cfd955..02132bc4ef 100644
--- a/src/libcharon/tests/utils/exchange_test_asserts.h
+++ b/src/libcharon/tests/utils/exchange_test_asserts.h
@@ -225,7 +225,7 @@ struct listener_message_rule_t {
payload_type_t payload;
/**
- * Notify type to expect/not expect (paylod type does not have to be
+ * Notify type to expect/not expect (payload type does not have to be
* specified)
*/
notify_type_t notify;
diff --git a/src/libcharon/tests/utils/exchange_test_helper.h b/src/libcharon/tests/utils/exchange_test_helper.h
index 1541e88da3..18a2372561 100644
--- a/src/libcharon/tests/utils/exchange_test_helper.h
+++ b/src/libcharon/tests/utils/exchange_test_helper.h
@@ -43,7 +43,7 @@ struct exchange_test_helper_t {
/**
* Set the initial byte of all nonces generated by future nonce
- * generators (already instatiated nonce generators are not affected).
+ * generators (already instantiated nonce generators are not affected).
*/
u_char nonce_first_byte;
diff --git a/src/libfast/fast_dispatcher.c b/src/libfast/fast_dispatcher.c
index d5ce771936..a0014f0d7b 100644
--- a/src/libfast/fast_dispatcher.c
+++ b/src/libfast/fast_dispatcher.c
@@ -66,7 +66,7 @@ struct private_fast_dispatcher_t {
mutex_t *mutex;
/**
- * Hahstable with active sessions
+ * Hashtable with active sessions
*/
hashtable_t *sessions;
diff --git a/src/libfast/fast_request.h b/src/libfast/fast_request.h
index 85cbc20624..5d9b8723f0 100644
--- a/src/libfast/fast_request.h
+++ b/src/libfast/fast_request.h
@@ -171,7 +171,7 @@ struct fast_request_t {
* server-push functionality.
*
* @param format printf like format string
- * @param ... argmuent list to format string
+ * @param ... argument list to format string
* @return number of streamed bytes, < 0 if stream closed
*/
int (*streamf)(fast_request_t *this, char *format, ...);
diff --git a/src/libimcv/ietf/ietf_attr_assess_result.h b/src/libimcv/ietf/ietf_attr_assess_result.h
index fe7c1aaf3a..fad2cc4bb4 100644
--- a/src/libimcv/ietf/ietf_attr_assess_result.h
+++ b/src/libimcv/ietf/ietf_attr_assess_result.h
@@ -14,7 +14,7 @@
*/
/**
- * @defgroup ietf_attr_assess_resultt ietf_attr_assess_result
+ * @defgroup ietf_attr_assess_result ietf_attr_assess_result
* @{ @ingroup ietf_attr
*/
diff --git a/src/libimcv/ietf/ietf_attr_attr_request.h b/src/libimcv/ietf/ietf_attr_attr_request.h
index 4c4ede04ad..e1b3f1c374 100644
--- a/src/libimcv/ietf/ietf_attr_attr_request.h
+++ b/src/libimcv/ietf/ietf_attr_attr_request.h
@@ -14,7 +14,7 @@
*/
/**
- * @defgroup ietf_attr_attr_requestt ietf_attr_attr_request
+ * @defgroup ietf_attr_attr_request ietf_attr_attr_request
* @{ @ingroup ietf_attr
*/
diff --git a/src/libimcv/ietf/ietf_attr_installed_packages.h b/src/libimcv/ietf/ietf_attr_installed_packages.h
index 9f7b7cbcf2..1c325db151 100644
--- a/src/libimcv/ietf/ietf_attr_installed_packages.h
+++ b/src/libimcv/ietf/ietf_attr_installed_packages.h
@@ -14,7 +14,7 @@
*/
/**
- * @defgroup ietf_attr_installed_packagest ietf_attr_installed_packages
+ * @defgroup ietf_attr_installed_packages ietf_attr_installed_packages
* @{ @ingroup ietf_attr
*/
diff --git a/src/libimcv/ietf/ietf_attr_numeric_version.h b/src/libimcv/ietf/ietf_attr_numeric_version.h
index afb3823e48..622213d99a 100644
--- a/src/libimcv/ietf/ietf_attr_numeric_version.h
+++ b/src/libimcv/ietf/ietf_attr_numeric_version.h
@@ -14,7 +14,7 @@
*/
/**
- * @defgroup ietf_attr_numeric_versiont ietf_attr_numeric_version
+ * @defgroup ietf_attr_numeric_version ietf_attr_numeric_version
* @{ @ingroup ietf_attr
*/
@@ -59,7 +59,7 @@ struct ietf_attr_numeric_version_t {
* Gets the Major and Minor Numbers of the Service Pack
*
* @param major Service Pack Major Number
- * @param minor Servcie Pack Minor Number
+ * @param minor Service Pack Minor Number
*/
void (*get_service_pack)(ietf_attr_numeric_version_t *this,
uint16_t *major, uint16_t *minor);
diff --git a/src/libimcv/ietf/ietf_attr_pa_tnc_error.h b/src/libimcv/ietf/ietf_attr_pa_tnc_error.h
index d5cba97b64..cee8ed7e36 100644
--- a/src/libimcv/ietf/ietf_attr_pa_tnc_error.h
+++ b/src/libimcv/ietf/ietf_attr_pa_tnc_error.h
@@ -117,7 +117,7 @@ pa_tnc_attr_t* ietf_attr_pa_tnc_error_create(pen_type_t error_code,
/**
* Creates an ietf_attr_pa_tnc_error_t object from an error code with offset
*
- * @param error_code Vendor-specifica PA-TNC error code
+ * @param error_code Vendor-specific PA-TNC error code
* @param header PA-TNC message header (first 8 bytes)
* @param error_offset PA-TNC error offset in bytes
*
diff --git a/src/libimcv/ietf/ietf_attr_port_filter.h b/src/libimcv/ietf/ietf_attr_port_filter.h
index db35453c4a..592faf48b6 100644
--- a/src/libimcv/ietf/ietf_attr_port_filter.h
+++ b/src/libimcv/ietf/ietf_attr_port_filter.h
@@ -14,7 +14,7 @@
*/
/**
- * @defgroup ietf_attr_port_filtert ietf_attr_port_filter
+ * @defgroup ietf_attr_port_filter ietf_attr_port_filter
* @{ @ingroup ietf_attr
*/
diff --git a/src/libimcv/ietf/ietf_attr_string_version.h b/src/libimcv/ietf/ietf_attr_string_version.h
index 432ed4a0f3..4839bdae54 100644
--- a/src/libimcv/ietf/ietf_attr_string_version.h
+++ b/src/libimcv/ietf/ietf_attr_string_version.h
@@ -14,7 +14,7 @@
*/
/**
- * @defgroup ietf_attr_string_versiont ietf_attr_string_version
+ * @defgroup ietf_attr_string_version ietf_attr_string_version
* @{ @ingroup ietf_attr
*/
diff --git a/src/libimcv/imv/imv_workitem.h b/src/libimcv/imv/imv_workitem.h
index 2b4ebc0301..9f5e62247d 100644
--- a/src/libimcv/imv/imv_workitem.h
+++ b/src/libimcv/imv/imv_workitem.h
@@ -111,7 +111,7 @@ struct imv_workitem_t {
* Set result string
*
* @param result Result string
- * @return Action Recommendatino
+ * @return Action Recommendation
*/
TNC_IMV_Action_Recommendation (*get_result)(imv_workitem_t *this,
char **result);
diff --git a/src/libimcv/plugins/imc_swima/imc_swima_state.h b/src/libimcv/plugins/imc_swima/imc_swima_state.h
index 92a674ff80..de94a1a0dd 100644
--- a/src/libimcv/plugins/imc_swima/imc_swima_state.h
+++ b/src/libimcv/plugins/imc_swima/imc_swima_state.h
@@ -52,7 +52,7 @@ struct imc_swima_subscription_t {
swima_inventory_t *targets;
/**
- * Retrieve SW Identifieres only
+ * Retrieve SW Identifiers only
*/
bool sw_id_only;
diff --git a/src/libimcv/pts/components/pts_component.h b/src/libimcv/pts/components/pts_component.h
index 286061a514..e83d3b155a 100644
--- a/src/libimcv/pts/components/pts_component.h
+++ b/src/libimcv/pts/components/pts_component.h
@@ -63,7 +63,7 @@ struct pts_component_t {
*
* @param qualifier PTS Component Functional Name Qualifier
* @param pts PTS interface
- * @param evidence returns component evidence measureemt
+ * @param evidence returns component evidence measurement
* @param measurements additional file measurements (NULL if not present)
* @return status return code
*/
diff --git a/src/libimcv/pts/components/pts_component_manager.c b/src/libimcv/pts/components/pts_component_manager.c
index 4f0004fe86..63a872d110 100644
--- a/src/libimcv/pts/components/pts_component_manager.c
+++ b/src/libimcv/pts/components/pts_component_manager.c
@@ -50,7 +50,7 @@ struct vendor_entry_t {
char *qualifier_flag_names;
/**
- * Vendor-specific size of Qualfiier Type field
+ * Vendor-specific size of Qualifier Type field
*/
int qualifier_type_size;
diff --git a/src/libimcv/pts/pts.c b/src/libimcv/pts/pts.c
index 56bb821cd0..7321d6708b 100644
--- a/src/libimcv/pts/pts.c
+++ b/src/libimcv/pts/pts.c
@@ -116,7 +116,7 @@ struct private_pts_t {
certificate_t *aik_cert;
/**
- * Primary key referening AIK in database
+ * Primary key referencing AIK in database
*/
int aik_id;
diff --git a/src/libimcv/pts/pts_ima_event_list.h b/src/libimcv/pts/pts_ima_event_list.h
index 9b70153928..bab2e95862 100644
--- a/src/libimcv/pts/pts_ima_event_list.h
+++ b/src/libimcv/pts/pts_ima_event_list.h
@@ -73,7 +73,7 @@ struct pts_ima_event_list_t {
/**
* Create a PTS IMA runtime file measurement object
*
- * @param file Pathname pointing to the IMA runtme measurements
+ * @param file Pathname pointing to the IMA runtime measurements
*/
pts_ima_event_list_t* pts_ima_event_list_create(char *file);
diff --git a/src/libimcv/swid_gen/swid_gen_info.c b/src/libimcv/swid_gen/swid_gen_info.c
index bdaeedce78..463502b567 100644
--- a/src/libimcv/swid_gen/swid_gen_info.c
+++ b/src/libimcv/swid_gen/swid_gen_info.c
@@ -155,7 +155,7 @@ swid_gen_info_t *swid_gen_info_create(void)
(int)os_version.len, os_version.ptr, (int)os_arch.len,
os_arch.ptr) == -1)
{
- DBG1(DBG_IMC, "constructon of OS string failed");
+ DBG1(DBG_IMC, "construction of OS string failed");
destroy(this);
return NULL;
}
@@ -165,7 +165,7 @@ swid_gen_info_t *swid_gen_info_create(void)
os_name.ptr, (int)os_version.len, os_version.ptr,
(int)os_arch.len, os_arch.ptr) == -1)
{
- DBG1(DBG_IMC, "constructon of product string failed");
+ DBG1(DBG_IMC, "construction of product string failed");
destroy(this);
return NULL;
}
diff --git a/src/libimcv/swima/swima_collector.c b/src/libimcv/swima/swima_collector.c
index e8117eb6ef..63fc3c8458 100644
--- a/src/libimcv/swima/swima_collector.c
+++ b/src/libimcv/swima/swima_collector.c
@@ -589,7 +589,7 @@ swima_collector_t *swima_collector_create(void)
}
if (!this->db)
{
- /* Set the event ID epoch and last event ID smanually */
+ /* Set the event ID epoch and last event ID manually */
eid_epoch = lib->settings->get_int(lib->settings,
"%s.plugins.imc-swima.eid_epoch",
eid_epoch, lib->ns);
diff --git a/src/libimcv/swima/swima_record.h b/src/libimcv/swima/swima_record.h
index c26ffdf64b..0494bbabbc 100644
--- a/src/libimcv/swima/swima_record.h
+++ b/src/libimcv/swima/swima_record.h
@@ -106,7 +106,7 @@ struct swima_record_t {
* Creates a swima_record_t object
*
* @param record_id Record ID
- * @param sw_id Software Identifierl
+ * @param sw_id Software Identifier
* @param sw_locator Software Locator or empty chunk
*/
swima_record_t* swima_record_create(uint32_t record_id, chunk_t sw_id,
diff --git a/src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.h b/src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.h
index 11ed228103..acd69a33e8 100644
--- a/src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.h
@@ -39,7 +39,7 @@ struct tcg_pts_attr_proto_caps_t {
pa_tnc_attr_t pa_tnc_attribute;
/**
- * Get PTS procol capabilities flags
+ * Get PTS protocol capabilities flags
*
* @return set of flags
*/
diff --git a/src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.c b/src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.c
index ea175bdfe1..65325f212d 100644
--- a/src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.c
@@ -383,7 +383,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
if (!reader->read_data32(reader, "e_sig))
{
DBG1(DBG_TNC, "insufficient data for PTS Simple Evidence Final "
- "TPM Quote Singature");
+ "TPM Quote Signature");
goto end;
}
this->quote_sig = chunk_clone(quote_sig);
diff --git a/src/libipsec/ipsec_policy.h b/src/libipsec/ipsec_policy.h
index 9a4ffbfa82..18881cb36e 100644
--- a/src/libipsec/ipsec_policy.h
+++ b/src/libipsec/ipsec_policy.h
@@ -94,7 +94,7 @@ struct ipsec_policy_t {
* @param direction traffic direction
* @param reqid reqid of the policy
* @param mark mark for this policy
- * @param prioirty policy priority
+ * @param priority policy priority
* @return TRUE if policy matches all parameters
*/
bool (*match)(ipsec_policy_t *this, traffic_selector_t *src_ts,
diff --git a/src/libipsec/ipsec_processor.c b/src/libipsec/ipsec_processor.c
index c96b613647..2eedd51573 100644
--- a/src/libipsec/ipsec_processor.c
+++ b/src/libipsec/ipsec_processor.c
@@ -209,7 +209,7 @@ static job_requeue_t process_outbound(private_ipsec_processor_t *this)
sa = ipsec->sas->checkout_by_reqid(ipsec->sas, policy->get_reqid(policy),
FALSE);
if (!sa)
- { /* TODO-IPSEC: send an acquire to uppper layer */
+ { /* TODO-IPSEC: send an acquire to upper layer */
DBG1(DBG_ESP, "could not find an outbound IPsec SA for reqid {%u}, "
"dropping packet", policy->get_reqid(policy));
packet->destroy(packet);
diff --git a/src/libpttls/pt_tls_client.h b/src/libpttls/pt_tls_client.h
index 1d418d1810..d6757a0d45 100644
--- a/src/libpttls/pt_tls_client.h
+++ b/src/libpttls/pt_tls_client.h
@@ -51,7 +51,7 @@ struct pt_tls_client_t {
* Create a pt_tls_client instance.
*
* The client identity is used for:
- * - TLS authentication if an appropirate certificate is found
+ * - TLS authentication if an appropriate certificate is found
* - SASL authentication if requested from the server
*
* @param address address/port to run assessments against, gets owned
diff --git a/src/libpttls/sasl/sasl_mechanism.h b/src/libpttls/sasl/sasl_mechanism.h
index e8c47c408d..2bd7bc6d4b 100644
--- a/src/libpttls/sasl/sasl_mechanism.h
+++ b/src/libpttls/sasl/sasl_mechanism.h
@@ -29,7 +29,7 @@ typedef struct sasl_mechanism_t sasl_mechanism_t;
#include
/**
- * Constructor function for SASL mechansims.
+ * Constructor function for SASL mechanism.
*
* @param name name of the requested SASL mechanism
* @param client client identity, NULL to act as server
diff --git a/src/libradius/radius_message.c b/src/libradius/radius_message.c
index b5a03b361a..9e6197a535 100644
--- a/src/libradius/radius_message.c
+++ b/src/libradius/radius_message.c
@@ -45,7 +45,7 @@ struct rmsg_t {
struct rattr_t {
/** attribute type, radius_attribute_type_t */
uint8_t type;
- /** length of the attriubte, including the Type, Length and Value fields */
+ /** length of the attribute, including the Type, Length and Value fields */
uint8_t length;
/** variable length attribute value */
uint8_t value[];
diff --git a/src/libsimaka/simaka_manager.h b/src/libsimaka/simaka_manager.h
index ff3bf14d10..9aa0726384 100644
--- a/src/libsimaka/simaka_manager.h
+++ b/src/libsimaka/simaka_manager.h
@@ -76,7 +76,7 @@ struct simaka_manager_t {
char kc[SIM_KC_LEN]);
/**
- * Calculate AKA quitpulets on one of the registered SIM cards.
+ * Calculate AKA quintuplets on one of the registered SIM cards.
*
* @param id permanent identity to request quintuplet for
* @param rand random value rand
@@ -192,7 +192,7 @@ struct simaka_manager_t {
/**
* Pass AKA resynchronization data to one of the registered providers.
*
- * @param id permanent identity of peer requesting resynchronisation
+ * @param id permanent identity of peer requesting resynchronization
* @param rand random value rand
* @param auts synchronization parameter auts
* @return TRUE if resynchronized, FALSE if not handled
diff --git a/src/libsimaka/simaka_provider.h b/src/libsimaka/simaka_provider.h
index 59a8c21df8..8f9f2ff56f 100644
--- a/src/libsimaka/simaka_provider.h
+++ b/src/libsimaka/simaka_provider.h
@@ -75,9 +75,9 @@ struct simaka_provider_t {
char autn[AKA_AUTN_LEN]);
/**
- * Process AKA resynchroniusation request of a peer.
+ * Process AKA resynchronization request of a peer.
*
- * @param id permanent identity of peer requesting resynchronisation
+ * @param id permanent identity of peer requesting resynchronization
* @param rand random value rand
* @param auts synchronization parameter auts
* @return TRUE if resynchronized successfully
@@ -95,7 +95,7 @@ struct simaka_provider_t {
identification_t *id);
/**
- * Generate a pseudonym identitiy for a given peer identity.
+ * Generate a pseudonym identity for a given peer identity.
*
* @param id permanent identity to generate a pseudonym for
* @return generated pseudonym, NULL to not use a pseudonym identity
diff --git a/src/libstrongswan/collections/array.h b/src/libstrongswan/collections/array.h
index 792dc76773..6fa3e2c7eb 100644
--- a/src/libstrongswan/collections/array.h
+++ b/src/libstrongswan/collections/array.h
@@ -87,7 +87,7 @@ void array_compress(array_t *array);
/**
* Create an enumerator over an array.
*
- * The enumerater enumerates directly over the array element (pass a pointer to
+ * The enumerator enumerates directly over the array element (pass a pointer to
* element types), unless the array is pointer based. If zero is passed as
* element size during construction, the enumerator enumerates over the
* dereferenced pointer values.
diff --git a/src/libstrongswan/collections/enumerator.h b/src/libstrongswan/collections/enumerator.h
index 99f8847e4c..e5ebe4c712 100644
--- a/src/libstrongswan/collections/enumerator.h
+++ b/src/libstrongswan/collections/enumerator.h
@@ -173,7 +173,7 @@ enumerator_t* enumerator_create_token(const char *string, const char *sep,
* Creates an enumerator which enumerates over enumerated enumerators :-).
*
* The outer enumerator is expected to return objects that, when passed to
- * inner_contructor, will create a new enumerator that will be enumerated until
+ * inner_constructor, will create a new enumerator that will be enumerated until
* completion (to this enumerator will the pointer arguments that are passed to
* this enumerator be forwarded) at which point a new element from the outer
* enumerator is requested to create a new inner enumerator.
diff --git a/src/libstrongswan/collections/hashtable.h b/src/libstrongswan/collections/hashtable.h
index 1bc674c6c5..ab217ea11a 100644
--- a/src/libstrongswan/collections/hashtable.h
+++ b/src/libstrongswan/collections/hashtable.h
@@ -116,7 +116,7 @@ struct hashtable_t {
* entry, otherwise NULL is returned.
*
* Compared to get() the given match function is used to compare the keys
- * for equality. The hash function does have to be deviced properly in
+ * for equality. The hash function does have to be devised properly in
* order to make this work if the match function compares keys differently
* than the equals function provided to the constructor. This basically
* allows to enumerate all entries with the same hash value.
diff --git a/src/libstrongswan/credentials/cert_validator.h b/src/libstrongswan/credentials/cert_validator.h
index 6b28f35c17..f9ae43dafc 100644
--- a/src/libstrongswan/credentials/cert_validator.h
+++ b/src/libstrongswan/credentials/cert_validator.h
@@ -39,7 +39,7 @@ struct cert_validator_t {
*
* If this function returns SUCCESS or FAILED, the certificate lifetime is
* considered definitely (in-)valid, without asking other validators.
- * If all registered validaters return NEED_MORE, the default
+ * If all registered validators return NEED_MORE, the default
* lifetime check is performed.
*
* @param cert certificate to check lifetime
diff --git a/src/libstrongswan/credentials/certificates/certificate.h b/src/libstrongswan/credentials/certificates/certificate.h
index bed55f8b8e..71620aa913 100644
--- a/src/libstrongswan/credentials/certificates/certificate.h
+++ b/src/libstrongswan/credentials/certificates/certificate.h
@@ -73,7 +73,7 @@ enum cert_validation_t {
VALIDATION_STALE,
/** validation failed due to a processing error */
VALIDATION_FAILED,
- /** certificate is on hold (i.e. temporary revokation) */
+ /** certificate is on hold (i.e. temporary revocation) */
VALIDATION_ON_HOLD,
/** certificate has been revoked */
VALIDATION_REVOKED,
diff --git a/src/libstrongswan/credentials/containers/container.h b/src/libstrongswan/credentials/containers/container.h
index 627cda3748..00b95ecc06 100644
--- a/src/libstrongswan/credentials/containers/container.h
+++ b/src/libstrongswan/credentials/containers/container.h
@@ -87,7 +87,7 @@ struct container_t {
* Get the encoding of the full signed/encrypted container.
*
* @param data allocated container encoding
- * @return TRUE if encodign successful
+ * @return TRUE if encoding successful
*/
bool (*get_encoding)(container_t *this, chunk_t *encoding);
diff --git a/src/libstrongswan/credentials/credential_manager.c b/src/libstrongswan/credentials/credential_manager.c
index 15f3f7b1b0..3be0190a1f 100644
--- a/src/libstrongswan/credentials/credential_manager.c
+++ b/src/libstrongswan/credentials/credential_manager.c
@@ -274,7 +274,7 @@ METHOD(credential_manager_t, get_cert, certificate_t*,
enumerator = create_cert_enumerator(this, cert, key, id, trusted);
if (enumerator->enumerate(enumerator, ¤t))
{
- /* TODO: best match? order by keyid, subject, sualtname */
+ /* TODO: best match? order by keyid, subject, subjectAltName */
found = current->get_ref(current);
}
enumerator->destroy(enumerator);
diff --git a/src/libstrongswan/credentials/keys/private_key.h b/src/libstrongswan/credentials/keys/private_key.h
index 5cf8641ad8..079c779fb7 100644
--- a/src/libstrongswan/credentials/keys/private_key.h
+++ b/src/libstrongswan/credentials/keys/private_key.h
@@ -146,7 +146,7 @@ struct private_key_t {
};
/**
- * Generic private key equals() implementation, usable by implementors.
+ * Generic private key equals() implementation, usable by implementers.
*
* @param private private key to check
* @param other key to compare
@@ -155,7 +155,7 @@ struct private_key_t {
bool private_key_equals(private_key_t *private, private_key_t *other);
/**
- * Generic private key belongs_to() implementation, usable by implementors.
+ * Generic private key belongs_to() implementation, usable by implementers.
*
* @param private private key to check
* @param public public key to compare
@@ -164,7 +164,7 @@ bool private_key_equals(private_key_t *private, private_key_t *other);
bool private_key_belongs_to(private_key_t *private, public_key_t *public);
/**
- * Generic private key has_fingerprint() implementation, usable by implementors.
+ * Generic private key has_fingerprint() implementation, usable by implementers.
*
* @param private private key to check
* @param fingerprint fingerprint to check
diff --git a/src/libstrongswan/credentials/keys/public_key.h b/src/libstrongswan/credentials/keys/public_key.h
index a98a33d203..756d9ba054 100644
--- a/src/libstrongswan/credentials/keys/public_key.h
+++ b/src/libstrongswan/credentials/keys/public_key.h
@@ -246,7 +246,7 @@ struct public_key_t {
};
/**
- * Generic public key equals() implementation, usable by implementors.
+ * Generic public key equals() implementation, usable by implementers.
*
* @param public public key to check
* @param other key to compare
@@ -255,7 +255,7 @@ struct public_key_t {
bool public_key_equals(public_key_t *public, public_key_t *other);
/**
- * Generic public key has_fingerprint() implementation, usable by implementors.
+ * Generic public key has_fingerprint() implementation, usable by implementers.
*
* @param public public key to check
* @param fingerprint fingerprint to check
diff --git a/src/libstrongswan/credentials/sets/callback_cred.h b/src/libstrongswan/credentials/sets/callback_cred.h
index efc4c7fa56..ea5dafb024 100644
--- a/src/libstrongswan/credentials/sets/callback_cred.h
+++ b/src/libstrongswan/credentials/sets/callback_cred.h
@@ -40,7 +40,7 @@ typedef shared_key_t* (*callback_cred_shared_cb_t)(
id_match_t *match_me, id_match_t *match_other);
/**
- * Generic callbcack using user specified callback functions.
+ * Generic callback using user specified callback functions.
*/
struct callback_cred_t {
diff --git a/src/libstrongswan/crypto/crypters/crypter.h b/src/libstrongswan/crypto/crypters/crypter.h
index a74352c96d..153d5363f8 100644
--- a/src/libstrongswan/crypto/crypters/crypter.h
+++ b/src/libstrongswan/crypto/crypters/crypter.h
@@ -113,7 +113,7 @@ struct crypter_t {
*
* The length of the iv must equal to get_iv_size(), while the length
* of data must be a multiple of get_block_size().
- * If decrpyted is NULL, the encryption is done in-place (overwriting data).
+ * If decrypted is NULL, the encryption is done in-place (overwriting data).
*
* @param data data to decrypt
* @param iv initializing vector
diff --git a/src/libstrongswan/crypto/crypto_tester.h b/src/libstrongswan/crypto/crypto_tester.h
index fcb64a6e25..04de791581 100644
--- a/src/libstrongswan/crypto/crypto_tester.h
+++ b/src/libstrongswan/crypto/crypto_tester.h
@@ -283,7 +283,7 @@ struct crypto_tester_t {
*
* @param group group to test
* @param create constructor function for the DH backend
- * @param speed speeed test result, NULL to omit
+ * @param speed speed test result, NULL to omit
* @return TRUE if test passed
*/
bool (*test_dh)(crypto_tester_t *this, diffie_hellman_group_t group,
diff --git a/src/libstrongswan/crypto/drbgs/drbg.c b/src/libstrongswan/crypto/drbgs/drbg.c
index 7e763844f6..12a5d25498 100644
--- a/src/libstrongswan/crypto/drbgs/drbg.c
+++ b/src/libstrongswan/crypto/drbgs/drbg.c
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the "GNU General Public License as published by the
- * Free Software Foundatio"n; either version 2 of the License, or (at your
+ * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version". See .
*
* This program is distributed in the hope that it will be useful, but
diff --git a/src/libstrongswan/crypto/prf_plus.h b/src/libstrongswan/crypto/prf_plus.h
index 41fdfbb86e..b72683df1a 100644
--- a/src/libstrongswan/crypto/prf_plus.h
+++ b/src/libstrongswan/crypto/prf_plus.h
@@ -60,7 +60,7 @@ struct prf_plus_t {
/**
* Creates a new prf_plus_t object.
*
- * @param prf prf object to use, must be destroyd after prf+.
+ * @param prf prf object to use, must be destroyed after prf+.
* @param counter use an appending counter byte (for IKEv2 variant)
* @param seed input seed for prf
* @return prf_plus_t object, NULL on failure
diff --git a/src/libstrongswan/database/database.h b/src/libstrongswan/database/database.h
index dc6ed13153..ea7ebddd87 100644
--- a/src/libstrongswan/database/database.h
+++ b/src/libstrongswan/database/database.h
@@ -15,7 +15,7 @@
*/
/**
- * @defgroup databasei database
+ * @defgroup database_t database
* @{ @ingroup database
*/
@@ -121,7 +121,7 @@ struct database_t {
*
* @note Either commit() or rollback() has to be called to end the
* transaction.
- * @note Transactions are thread-specific. So commit()/rollbak() has to be
+ * @note Transactions are thread-specific. So commit()/rollback() has to be
* called from the same thread.
* @note While this method can be called multiple times (commit/rollback
* have to be called an equal number of times) real nested transactions are
diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c
index ad5d9ab369..9c0dc69ef7 100644
--- a/src/libstrongswan/library.c
+++ b/src/libstrongswan/library.c
@@ -72,7 +72,7 @@ struct private_library_t {
#define MAX_NAMESPACES 5
/**
- * Additional namespaces registered using __atrribute__((constructor))
+ * Additional namespaces registered using __attribute__((constructor))
*/
static char *namespaces[MAX_NAMESPACES];
static int ns_count;
diff --git a/src/libstrongswan/networking/host.h b/src/libstrongswan/networking/host.h
index 29283af8ea..c3b44cf923 100644
--- a/src/libstrongswan/networking/host.h
+++ b/src/libstrongswan/networking/host.h
@@ -35,7 +35,7 @@ typedef struct host_t host_t;
#include
/**
- * Representates a Host
+ * Represents a Host
*
* Host object, identifies a address:port pair and defines some
* useful functions on it.
diff --git a/src/libstrongswan/plugins/aes/aes_crypter.c b/src/libstrongswan/plugins/aes/aes_crypter.c
index fc1d16c320..6ac2cc654e 100644
--- a/src/libstrongswan/plugins/aes/aes_crypter.c
+++ b/src/libstrongswan/plugins/aes/aes_crypter.c
@@ -516,7 +516,7 @@ static const uint32_t im_tab[4][256] =
#define nc (AES_BLOCK_SIZE/4)
-// Initialise the key schedule from the user supplied key. The key
+// Initialize the key schedule from the user supplied key. The key
// length is now specified in bytes - 16, 24 or 32 as appropriate.
// This corresponds to bit lengths of 128, 192 and 256 bits, and
// to Nk values of 4, 6 and 8 respectively.
diff --git a/src/libstrongswan/plugins/bliss/bliss_plugin.h b/src/libstrongswan/plugins/bliss/bliss_plugin.h
index d3d80ac5d4..09bfec8faf 100644
--- a/src/libstrongswan/plugins/bliss/bliss_plugin.h
+++ b/src/libstrongswan/plugins/bliss/bliss_plugin.h
@@ -29,7 +29,7 @@
typedef struct bliss_plugin_t bliss_plugin_t;
/**
- * Plugin implementing the BLISS post-quantu authentication algorithm
+ * Plugin implementing the BLISS post-quantum authentication algorithm
*/
struct bliss_plugin_t {
diff --git a/src/libstrongswan/plugins/bliss/bliss_private_key.c b/src/libstrongswan/plugins/bliss/bliss_private_key.c
index a5b11d4ab6..b9e926dec6 100644
--- a/src/libstrongswan/plugins/bliss/bliss_private_key.c
+++ b/src/libstrongswan/plugins/bliss/bliss_private_key.c
@@ -1071,7 +1071,7 @@ bliss_private_key_t *bliss_private_key_gen(key_type_t type, va_list args)
/* We derive the public key from the private key using the FFT */
fft = ntt_fft_create(set->fft_params);
- /* Some vectors needed to derive the publi key */
+ /* Some vectors needed to derive the public key */
S1 = malloc(n * sizeof(uint32_t));
S2 = malloc(n * sizeof(uint32_t));
a = malloc(n * sizeof(uint32_t));
diff --git a/src/libstrongswan/plugins/bliss/bliss_signature.h b/src/libstrongswan/plugins/bliss/bliss_signature.h
index 20ed6c0a2d..38a721a355 100644
--- a/src/libstrongswan/plugins/bliss/bliss_signature.h
+++ b/src/libstrongswan/plugins/bliss/bliss_signature.h
@@ -40,7 +40,7 @@ struct bliss_signature_t {
chunk_t (*get_encoding)(bliss_signature_t *this);
/**
- * Get signature parameters extracted from compressd binary encoding
+ * Get signature parameters extracted from compressed binary encoding
*
* @param z1 signature vector z1 of size n
* @param z2d signature vector z2d of size n
diff --git a/src/libstrongswan/plugins/hmac/hmac_plugin.h b/src/libstrongswan/plugins/hmac/hmac_plugin.h
index c73687d7bd..6a54ed30e0 100644
--- a/src/libstrongswan/plugins/hmac/hmac_plugin.h
+++ b/src/libstrongswan/plugins/hmac/hmac_plugin.h
@@ -29,7 +29,7 @@
typedef struct hmac_plugin_t hmac_plugin_t;
/**
- * Plugin implementing HMAC algorithm to prvoide hash based PRF and signers.
+ * Plugin implementing HMAC algorithm to provide hash based PRF and signers.
*/
struct hmac_plugin_t {
diff --git a/src/libstrongswan/plugins/md4/md4_hasher.c b/src/libstrongswan/plugins/md4/md4_hasher.c
index c008d0188b..66c490790b 100644
--- a/src/libstrongswan/plugins/md4/md4_hasher.c
+++ b/src/libstrongswan/plugins/md4/md4_hasher.c
@@ -76,7 +76,7 @@ static uint8_t PADDING[64] = {
typedef struct private_md4_hasher_t private_md4_hasher_t;
/**
- * Private data structure with hasing context.
+ * Private data structure with hashing context.
*/
struct private_md4_hasher_t {
/**
diff --git a/src/libstrongswan/plugins/md5/md5_hasher.c b/src/libstrongswan/plugins/md5/md5_hasher.c
index ed78a9859a..6f707e4045 100644
--- a/src/libstrongswan/plugins/md5/md5_hasher.c
+++ b/src/libstrongswan/plugins/md5/md5_hasher.c
@@ -91,7 +91,7 @@ Rotation is separate from addition to prevent recomputation.
typedef struct private_md5_hasher_t private_md5_hasher_t;
/**
- * Private data structure with hasing context.
+ * Private data structure with hashing context.
*/
struct private_md5_hasher_t {
/**
diff --git a/src/libstrongswan/plugins/mysql/mysql_database.h b/src/libstrongswan/plugins/mysql/mysql_database.h
index d948a1c092..b3e80d71e2 100644
--- a/src/libstrongswan/plugins/mysql/mysql_database.h
+++ b/src/libstrongswan/plugins/mysql/mysql_database.h
@@ -27,7 +27,7 @@
typedef struct mysql_database_t mysql_database_t;
/**
- * MySQL databse_t implementation.
+ * MySQL database_t implementation.
*/
struct mysql_database_t {
diff --git a/src/libstrongswan/plugins/newhope/newhope_noise.h b/src/libstrongswan/plugins/newhope/newhope_noise.h
index d7819d3ad9..7f32ac1a14 100644
--- a/src/libstrongswan/plugins/newhope/newhope_noise.h
+++ b/src/libstrongswan/plugins/newhope/newhope_noise.h
@@ -36,7 +36,7 @@ struct newhope_noise_t {
*
* @param nonce Nonce determining the pseudo random stream
* @param n Number of pseudo random bytes to be returned
- * @return Return array with n peudo random bytes
+ * @return Return array with n pseudo random bytes
*/
uint8_t* (*get_uniform_bytes)(newhope_noise_t *this, uint8_t nonce,
uint16_t n);
diff --git a/src/libstrongswan/plugins/ntru/ntru_param_set.c b/src/libstrongswan/plugins/ntru/ntru_param_set.c
index 3b2716e282..80feb88107 100644
--- a/src/libstrongswan/plugins/ntru/ntru_param_set.c
+++ b/src/libstrongswan/plugins/ntru/ntru_param_set.c
@@ -141,7 +141,7 @@ static const ntru_param_set_t ntru_param_sets[] = {
0x27, /* DER id */
10, /* no. of bits in N (i.e., in an index) */
613, /* N */
- 16, /* securuity strength in octets */
+ 16, /* security strength in octets */
2048, /* q */
11, /* no. of bits in q (i.e., in a coeff) */
FALSE, /* product form */
diff --git a/src/libstrongswan/plugins/openssl/openssl_util.h b/src/libstrongswan/plugins/openssl/openssl_util.h
index 47414c6aa5..c610433b1d 100644
--- a/src/libstrongswan/plugins/openssl/openssl_util.h
+++ b/src/libstrongswan/plugins/openssl/openssl_util.h
@@ -49,7 +49,7 @@
bool openssl_hash_chunk(int hash_type, chunk_t data, chunk_t *hash);
/**
- * Concatenates two bignums into a chunk, thereby enfocing the length of
+ * Concatenates two bignums into a chunk, thereby enforcing the length of
* a single BIGNUM, if necessary, by pre-pending it with zeros.
*
* Note: this function allocates memory for the chunk
diff --git a/src/libstrongswan/plugins/openssl/openssl_x509.c b/src/libstrongswan/plugins/openssl/openssl_x509.c
index 9d3269229a..6a8f6ff086 100644
--- a/src/libstrongswan/plugins/openssl/openssl_x509.c
+++ b/src/libstrongswan/plugins/openssl/openssl_x509.c
@@ -606,7 +606,7 @@ static private_openssl_x509_t *create_empty()
}
/**
- * parse an extionsion containing GENERAL_NAMES into a list
+ * parse an extension containing GENERAL_NAMES into a list
*/
static bool parse_generalNames_ext(linked_list_t *list,
X509_EXTENSION *ext)
@@ -698,7 +698,7 @@ static bool parse_keyUsage_ext(private_openssl_x509_t *this,
}
if (flags & X509v3_KU_KEY_CERT_SIGN)
{
- /* we use the caBasicContraint, MUST be set */
+ /* we use the caBasicConstraint, MUST be set */
}
}
ASN1_BIT_STRING_free(usage);
diff --git a/src/libstrongswan/plugins/padlock/padlock_sha1_hasher.c b/src/libstrongswan/plugins/padlock/padlock_sha1_hasher.c
index 764227a4e4..a23f47f2d1 100644
--- a/src/libstrongswan/plugins/padlock/padlock_sha1_hasher.c
+++ b/src/libstrongswan/plugins/padlock/padlock_sha1_hasher.c
@@ -24,7 +24,7 @@
typedef struct private_padlock_sha1_hasher_t private_padlock_sha1_hasher_t;
/**
- * Private data structure with hasing context.
+ * Private data structure with hashing context.
*/
struct private_padlock_sha1_hasher_t {
/**
diff --git a/src/libstrongswan/plugins/pem/pem_encoder.c b/src/libstrongswan/plugins/pem/pem_encoder.c
index 8c6c5dae73..ba32247978 100644
--- a/src/libstrongswan/plugins/pem/pem_encoder.c
+++ b/src/libstrongswan/plugins/pem/pem_encoder.c
@@ -120,7 +120,7 @@ bool pem_encoder_encode(cred_encoding_type_t type, chunk_t *encoding,
}
if (cred_encoding_args(args, CRED_PART_PKCS10_ASN1_DER,
&asn1, CRED_PART_END))
- { /* PEM encode PKCS10 certificate reqeuest */
+ { /* PEM encode PKCS10 certificate request */
label = "CERTIFICATE REQUEST";
break;
}
diff --git a/src/libstrongswan/plugins/pgp/pgp_utils.h b/src/libstrongswan/plugins/pgp/pgp_utils.h
index 36eed58669..9808651079 100644
--- a/src/libstrongswan/plugins/pgp/pgp_utils.h
+++ b/src/libstrongswan/plugins/pgp/pgp_utils.h
@@ -112,7 +112,7 @@ bool pgp_read_mpi(chunk_t *blob, chunk_t *mpi);
*
* @param blob blob to read from, gets advanced
* @param bytes number of bytes the scalar uses for encoding
- * @param scalar resultin scalar
+ * @param scalar resulting scalar
* @return TRUE if scalar parsed successfully
*/
bool pgp_read_scalar(chunk_t *blob, size_t bytes, uint32_t *scalar);
diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11.h b/src/libstrongswan/plugins/pkcs11/pkcs11.h
index da29a77d09..e45c580211 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11.h
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11.h
@@ -782,7 +782,7 @@ _CK_DECLARE_FUNCTION (C_SetOperationState,
unsigned char *operation_state,
unsigned long operation_state_len,
ck_object_handle_t encryption_key,
- ck_object_handle_t authentiation_key));
+ ck_object_handle_t authentication_key));
_CK_DECLARE_FUNCTION (C_Login,
(ck_session_handle_t session, ck_user_type_t user_type,
unsigned char *pin, unsigned long pin_len));
diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c b/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
index 3d3df57fda..565a57f9a6 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
@@ -40,7 +40,7 @@ struct private_pkcs11_dh_t {
pkcs11_library_t *lib;
/**
- * Session handle for this objct
+ * Session handle for this object
*/
CK_SESSION_HANDLE session;
diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
index 6967ac2536..119126fedd 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c
@@ -643,7 +643,7 @@ static void free_attrs(object_enumerator_t *this)
}
/**
- * CKA_EC_POINT is encodeed as ASN.1 octet string, we can't handle that and
+ * CKA_EC_POINT is encoded as ASN.1 octet string, we can't handle that and
* some tokens actually return them even unwrapped.
*
* Because ASN1_OCTET_STRING is 0x04 and uncompressed EC_POINTs also begin with
diff --git a/src/libstrongswan/plugins/plugin.h b/src/libstrongswan/plugins/plugin.h
index 0b67aa9798..cf28fcbf18 100644
--- a/src/libstrongswan/plugins/plugin.h
+++ b/src/libstrongswan/plugins/plugin.h
@@ -52,7 +52,7 @@ struct plugin_t {
/**
* Try to reload plugin configuration.
*
- * @return TRUE if reloaded, FALSE if reloading not supporty by plugin
+ * @return TRUE if reloaded, FALSE if reloading not supported by plugin
*/
bool (*reload)(plugin_t *this);
diff --git a/src/libstrongswan/plugins/sha1/sha1_hasher.c b/src/libstrongswan/plugins/sha1/sha1_hasher.c
index 4094175ab2..f7541a64c8 100644
--- a/src/libstrongswan/plugins/sha1/sha1_hasher.c
+++ b/src/libstrongswan/plugins/sha1/sha1_hasher.c
@@ -48,7 +48,7 @@
typedef struct private_sha1_hasher_t private_sha1_hasher_t;
/**
- * Private data structure with hasing context.
+ * Private data structure with hashing context.
*/
struct private_sha1_hasher_t {
/**
diff --git a/src/libstrongswan/plugins/sha1/sha1_prf.c b/src/libstrongswan/plugins/sha1/sha1_prf.c
index c404b8eac0..bee8b2cd31 100644
--- a/src/libstrongswan/plugins/sha1/sha1_prf.c
+++ b/src/libstrongswan/plugins/sha1/sha1_prf.c
@@ -22,7 +22,7 @@ typedef struct private_sha1_prf_t private_sha1_prf_t;
typedef struct private_sha1_hasher_t private_sha1_hasher_t;
/**
- * Private data structure with hasing context.
+ * Private data structure with hashing context.
*/
struct private_sha1_hasher_t {
/**
diff --git a/src/libstrongswan/plugins/sha2/sha2_hasher.c b/src/libstrongswan/plugins/sha2/sha2_hasher.c
index 083b11de32..fc4c8cbad0 100644
--- a/src/libstrongswan/plugins/sha2/sha2_hasher.c
+++ b/src/libstrongswan/plugins/sha2/sha2_hasher.c
@@ -24,7 +24,7 @@
typedef struct private_sha512_hasher_t private_sha512_hasher_t;
/**
- * Private data structure with hasing context for SHA384 and SHA512
+ * Private data structure with hashing context for SHA384 and SHA512
*/
struct private_sha512_hasher_t {
/**
@@ -43,7 +43,7 @@ struct private_sha512_hasher_t {
typedef struct private_sha256_hasher_t private_sha256_hasher_t;
/**
- * Private data structure with hasing context for SHA256
+ * Private data structure with hashing context for SHA256
*/
struct private_sha256_hasher_t {
/**
diff --git a/src/libstrongswan/plugins/sqlite/sqlite_database.c b/src/libstrongswan/plugins/sqlite/sqlite_database.c
index 8cd08563c8..62192eb585 100644
--- a/src/libstrongswan/plugins/sqlite/sqlite_database.c
+++ b/src/libstrongswan/plugins/sqlite/sqlite_database.c
@@ -71,7 +71,7 @@ typedef struct {
/**
* Check if the SQLite library is thread safe
*/
-static bool is_threadsave()
+static bool is_threadsafe()
{
#if SQLITE_VERSION_NUMBER >= 3005000
return sqlite3_threadsafe() > 0;
@@ -178,7 +178,7 @@ METHOD(enumerator_t, sqlite_enumerator_destroy, void,
sqlite_enumerator_t *this)
{
sqlite3_finalize(this->stmt);
- if (!is_threadsave())
+ if (!is_threadsafe())
{
this->database->mutex->unlock(this->database->mutex);
}
@@ -254,7 +254,7 @@ METHOD(database_t, query, enumerator_t*,
sqlite_enumerator_t *enumerator = NULL;
int i;
- if (!is_threadsave())
+ if (!is_threadsafe())
{
this->mutex->lock(this->mutex);
}
diff --git a/src/libstrongswan/plugins/sqlite/sqlite_database.h b/src/libstrongswan/plugins/sqlite/sqlite_database.h
index 504b749637..bde01ed362 100644
--- a/src/libstrongswan/plugins/sqlite/sqlite_database.h
+++ b/src/libstrongswan/plugins/sqlite/sqlite_database.h
@@ -26,7 +26,7 @@
typedef struct sqlite_database_t sqlite_database_t;
/**
- * sqlite databse_t implementation.
+ * sqlite database_t implementation.
*/
struct sqlite_database_t {
diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_util.h b/src/libstrongswan/plugins/wolfssl/wolfssl_util.h
index e8916ecd3a..ea704bf0ef 100644
--- a/src/libstrongswan/plugins/wolfssl/wolfssl_util.h
+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_util.h
@@ -64,7 +64,7 @@ bool wolfssl_mp2chunk(mp_int *mp, chunk_t *chunk);
bool wolfssl_mp_split(chunk_t chunk, mp_int *a, mp_int *b);
/**
- * Concatenates two integers into a chunk, thereby enfocing the length of
+ * Concatenates two integers into a chunk, thereby enforcing the length of
* a single integer, if necessary, by pre-pending it with zeros.
*
* Note: this function allocates memory for the chunk
diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c
index 5a3f83817b..cf5bee06b2 100644
--- a/src/libstrongswan/plugins/x509/x509_cert.c
+++ b/src/libstrongswan/plugins/x509/x509_cert.c
@@ -137,7 +137,7 @@ struct private_x509_cert_t {
linked_list_t *permitted_names;
/**
- * List of exluced name constraints
+ * List of excluded name constraints
*/
linked_list_t *excluded_names;
diff --git a/src/libstrongswan/plugins/x509/x509_ocsp_response.c b/src/libstrongswan/plugins/x509/x509_ocsp_response.c
index f3ade37e43..705013c91d 100644
--- a/src/libstrongswan/plugins/x509/x509_ocsp_response.c
+++ b/src/libstrongswan/plugins/x509/x509_ocsp_response.c
@@ -59,7 +59,7 @@ struct private_x509_ocsp_response_t {
chunk_t encoding;
/**
- * data for signature verficiation
+ * data for signature verification
*/
chunk_t tbsResponseData;
diff --git a/src/libstrongswan/processing/scheduler.c b/src/libstrongswan/processing/scheduler.c
index 92713fea87..3d8e5e3939 100644
--- a/src/libstrongswan/processing/scheduler.c
+++ b/src/libstrongswan/processing/scheduler.c
@@ -94,7 +94,7 @@ struct private_scheduler_t {
};
/**
- * Comparse two timevals, return >0 if a > b, <0 if a < b and =0 if equal
+ * Compares two timevals, return >0 if a > b, <0 if a < b and =0 if equal
*/
static int timeval_cmp(timeval_t *a, timeval_t *b)
{
diff --git a/src/libstrongswan/resolver/resolver.h b/src/libstrongswan/resolver/resolver.h
index a802226bad..ba40ba03c9 100644
--- a/src/libstrongswan/resolver/resolver.h
+++ b/src/libstrongswan/resolver/resolver.h
@@ -14,7 +14,7 @@
*/
/**
- * @defgroup resolveri resolver
+ * @defgroup resolver_t resolver
* @{ @ingroup resolver
*/
diff --git a/src/libstrongswan/tests/suites/test_auth_cfg.c b/src/libstrongswan/tests/suites/test_auth_cfg.c
index 9fc2bbd903..6a84945350 100644
--- a/src/libstrongswan/tests/suites/test_auth_cfg.c
+++ b/src/libstrongswan/tests/suites/test_auth_cfg.c
@@ -62,7 +62,7 @@ static void check_sig_constraints(auth_cfg_t *cfg, auth_rule_t type,
ck_assert(!expected[i]);
}
-START_TEST(test_sig_contraints)
+START_TEST(test_sig_constraints)
{
auth_cfg_t *cfg;
signature_scheme_t none[] = {0};
@@ -84,7 +84,7 @@ START_TEST(test_sig_contraints)
}
END_TEST
-START_TEST(test_ike_contraints_fallback)
+START_TEST(test_ike_constraints_fallback)
{
auth_cfg_t *cfg;
@@ -163,7 +163,7 @@ static void check_sig_constraints_params(auth_cfg_t *cfg, auth_rule_t type,
ck_assert(!scheme[i]);
}
-START_TEST(test_sig_contraints_params)
+START_TEST(test_sig_constraints_params)
{
auth_cfg_t *cfg;
@@ -187,7 +187,7 @@ struct {
{ .pss = { .hash = HASH_SHA256, .mgf1_hash = HASH_SHA256, .salt_len = HASH_SIZE_SHA256, }}, {}}},
};
-START_TEST(test_sig_contraints_rsa_pss)
+START_TEST(test_sig_constraints_rsa_pss)
{
auth_cfg_t *cfg;
@@ -210,13 +210,13 @@ Suite *auth_cfg_suite_create()
s = suite_create("auth_cfg");
tc = tcase_create("add_pubkey_constraints");
- tcase_add_loop_test(tc, test_sig_contraints, 0, countof(sig_constraints_tests));
- tcase_add_loop_test(tc, test_ike_contraints_fallback, 0, countof(sig_constraints_tests));
+ tcase_add_loop_test(tc, test_sig_constraints, 0, countof(sig_constraints_tests));
+ tcase_add_loop_test(tc, test_ike_constraints_fallback, 0, countof(sig_constraints_tests));
suite_add_tcase(s, tc);
tc = tcase_create("add_pubkey_constraints parameters");
- tcase_add_loop_test(tc, test_sig_contraints_params, 0, countof(sig_constraints_params_tests));
- tcase_add_loop_test(tc, test_sig_contraints_rsa_pss, 0, countof(sig_constraints_rsa_pss_tests));
+ tcase_add_loop_test(tc, test_sig_constraints_params, 0, countof(sig_constraints_params_tests));
+ tcase_add_loop_test(tc, test_sig_constraints_rsa_pss, 0, countof(sig_constraints_rsa_pss_tests));
suite_add_tcase(s, tc);
return s;
diff --git a/src/libstrongswan/tests/suites/test_threading.c b/src/libstrongswan/tests/suites/test_threading.c
index 26e60db0d4..34d06ac246 100644
--- a/src/libstrongswan/tests/suites/test_threading.c
+++ b/src/libstrongswan/tests/suites/test_threading.c
@@ -1090,7 +1090,7 @@ END_TEST
static void *cancel_run(void *data)
{
- /* default cancellability should be TRUE, so don't change it */
+ /* default cancelability should be TRUE, so don't change it */
while (TRUE)
{
sleep(10);
@@ -1152,7 +1152,7 @@ START_TEST(test_cancel_onoff)
}
for (i = 0; i < THREADS; i++)
{
- /* wait until thread has cleared its cancellability */
+ /* wait until thread has cleared its cancelability */
while (cancellable[i])
{
sched_yield();
@@ -1172,7 +1172,7 @@ static void *cancel_point_run(void *data)
thread_cancelability(FALSE);
while (TRUE)
{
- /* implicitly enables cancellability */
+ /* implicitly enables cancelability */
thread_cancellation_point();
}
return NULL;
diff --git a/src/libstrongswan/tests/suites/test_utils.c b/src/libstrongswan/tests/suites/test_utils.c
index 9060f57b58..fd7cb647ae 100644
--- a/src/libstrongswan/tests/suites/test_utils.c
+++ b/src/libstrongswan/tests/suites/test_utils.c
@@ -353,7 +353,7 @@ START_TEST(test_strpfx)
END_TEST
/*******************************************************************************
- * mallac_align/free_align
+ * malloc_align/free_align
*/
START_TEST(test_malloc_align)
diff --git a/src/libstrongswan/threading/lock_profiler.h b/src/libstrongswan/threading/lock_profiler.h
index a3c4241f73..ab61eed063 100644
--- a/src/libstrongswan/threading/lock_profiler.h
+++ b/src/libstrongswan/threading/lock_profiler.h
@@ -24,12 +24,12 @@
/**
* Do not report mutexes with an overall waiting time smaller than this (in us)
*/
-#define PROFILE_WAIT_TRESHHOLD 10000
+#define PROFILE_WAIT_TRESHOLD 10000
/**
* Do not report mutexes with an overall lock count smaller than this
*/
-#define PROFILE_LOCK_TRESHHOLD 1000
+#define PROFILE_LOCK_TRESHOLD 1000
#include
@@ -58,8 +58,8 @@ struct lock_profile_t {
static inline void profiler_cleanup(lock_profile_t *profile)
{
if (profile->waited.tv_sec > 0 ||
- profile->waited.tv_usec > PROFILE_WAIT_TRESHHOLD ||
- profile->locked > PROFILE_LOCK_TRESHHOLD)
+ profile->waited.tv_usec > PROFILE_WAIT_TRESHOLD ||
+ profile->locked > PROFILE_LOCK_TRESHOLD)
{
fprintf(stderr, "%d.%03ds / %d times in lock created at:",
profile->waited.tv_sec, profile->waited.tv_usec, profile->locked);
diff --git a/src/libstrongswan/threading/mutex.c b/src/libstrongswan/threading/mutex.c
index 19cc11d15c..c54f661b51 100644
--- a/src/libstrongswan/threading/mutex.c
+++ b/src/libstrongswan/threading/mutex.c
@@ -48,7 +48,7 @@ struct private_mutex_t {
pthread_mutex_t mutex;
/**
- * is this a recursiv emutex, implementing private_r_mutex_t?
+ * is this a recursive mutex, implementing private_r_mutex_t?
*/
bool recursive;
diff --git a/src/libstrongswan/threading/thread.c b/src/libstrongswan/threading/thread.c
index 487ea0401b..ecdcfa98e2 100644
--- a/src/libstrongswan/threading/thread.c
+++ b/src/libstrongswan/threading/thread.c
@@ -48,7 +48,7 @@ struct private_thread_t {
thread_t public;
/**
- * Identificator of this thread (human-readable/thread ID).
+ * Identifier of this thread (human-readable/thread ID).
*/
u_int id;
diff --git a/src/libstrongswan/utils/chunk.h b/src/libstrongswan/utils/chunk.h
index ea1274668e..a5eb5ed3ba 100644
--- a/src/libstrongswan/utils/chunk.h
+++ b/src/libstrongswan/utils/chunk.h
@@ -357,7 +357,7 @@ bool chunk_increment(chunk_t chunk);
*
* @param chunk chunk to check for printability
* @param sane pointer where sane version is allocated, or NULL
- * @param replace character to use for replaceing unprintable characters
+ * @param replace character to use for replacing unprintable characters
* @return TRUE if all characters in chunk are printable
*/
bool chunk_printable(chunk_t chunk, chunk_t *sane, char replace);
diff --git a/src/libstrongswan/utils/enum.h b/src/libstrongswan/utils/enum.h
index 888dbe54fc..72dea495a0 100644
--- a/src/libstrongswan/utils/enum.h
+++ b/src/libstrongswan/utils/enum.h
@@ -84,7 +84,7 @@ struct enum_name_t {
NULL, { __VA_ARGS__ }}
/**
- * Continue a enum name list startetd with ENUM_BEGIN.
+ * Continue a enum name list started with ENUM_BEGIN.
*
* @param name name of the enum_name list
* @param first enum value of the first enum string
diff --git a/src/libstrongswan/utils/identification.h b/src/libstrongswan/utils/identification.h
index 704df7842f..e2be67bbf8 100644
--- a/src/libstrongswan/utils/identification.h
+++ b/src/libstrongswan/utils/identification.h
@@ -315,7 +315,7 @@ struct identification_t {
* is interpreted as hex encoded binary data for that ID, otherwise the raw
* string following the prefix is used as identity data, without conversion.
* To specify a non-standard ID type, the numerical type may be prefixed
- * between curly backets, building a prefix. For instance the "{1}:" prefix
+ * between curly brackets, building a prefix. For instance the "{1}:" prefix
* defines an ID_IPV4_ADDR type.
*
* This constructor never returns NULL. If it does not find a suitable
diff --git a/src/libtnccs/plugins/tnccs_11/tnccs_11.c b/src/libtnccs/plugins/tnccs_11/tnccs_11.c
index 5c34d57482..8b118e82c3 100644
--- a/src/libtnccs/plugins/tnccs_11/tnccs_11.c
+++ b/src/libtnccs/plugins/tnccs_11/tnccs_11.c
@@ -443,7 +443,7 @@ static void check_and_build_recommendation(private_tnccs_11_t *this)
}
enumerator->destroy(enumerator);
- /* we have reache the final state */
+ /* we have reached the final state */
this->delete_state = TRUE;
}
}
diff --git a/src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c b/src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c
index 227fa80296..290a7e1957 100644
--- a/src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c
+++ b/src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sansar Choinyanbuu
+ * Copyright (C) 2010 Sansar Choinyambuu
* Copyright (C) 2010-2015 Andreas Steffen
* HSR Hochschule fuer Technik Rapperswil
*
diff --git a/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_pa_msg.c b/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_pa_msg.c
index 2c7aa89650..33076bfe2c 100644
--- a/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_pa_msg.c
+++ b/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_pa_msg.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sansar Choinyanbuu
+ * Copyright (C) 2010 Sansar Choinyambuu
* Copyright (C) 2010 Andreas Steffen
*
* HSR Hochschule fuer Technik Rapperswil
diff --git a/src/libtnccs/plugins/tnccs_20/tnccs_20.c b/src/libtnccs/plugins/tnccs_20/tnccs_20.c
index 041faa3891..20d1a00959 100644
--- a/src/libtnccs/plugins/tnccs_20/tnccs_20.c
+++ b/src/libtnccs/plugins/tnccs_20/tnccs_20.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sansar Choinyanbuu
+ * Copyright (C) 2010 Sansar Choinyambuu
* Copyright (C) 2010-2015 Andreas Steffen
* HSR Hochschule fuer Technik Rapperswil
*
diff --git a/src/libtncif/tncif_policy.h b/src/libtncif/tncif_policy.h
index d9f553b729..e9513e7c64 100644
--- a/src/libtncif/tncif_policy.h
+++ b/src/libtncif/tncif_policy.h
@@ -42,7 +42,7 @@ TNC_IMV_Evaluation_Result tncif_policy_update_evaluation(
/**
* Create an empty TNC Identity object
*
- * @param rec Existing recommendationto be updated
+ * @param rec Existing recommendation to be updated
* @param rec_add Partial recommendation to be added
* @return Updated recommendation
*/
diff --git a/src/libtpmtss/tpm_tss_quote_info.h b/src/libtpmtss/tpm_tss_quote_info.h
index 5b1c457941..920b9e2310 100644
--- a/src/libtpmtss/tpm_tss_quote_info.h
+++ b/src/libtpmtss/tpm_tss_quote_info.h
@@ -81,7 +81,7 @@ struct tpm_tss_quote_info_t {
chunk_t (*get_pcr_digest)(tpm_tss_quote_info_t *this);
/**
- * Get TPM Quote Info digest, the basis of the TPM Quote Singature
+ * Get TPM Quote Info digest, the basis of the TPM Quote Signature
*
* @param nonce Derived from the Diffie-Hellman exchange
* @param composite PCR Composite as computed by IMV
@@ -102,7 +102,7 @@ struct tpm_tss_quote_info_t {
/**
* Get TPM 2.0 version info (needed for TPM 2.0)
*
- * @return TPM 2.0 firmwareVersioin
+ * @return TPM 2.0 firmwareVersion
*/
chunk_t (*get_version_info)(tpm_tss_quote_info_t *this);
diff --git a/src/pki/commands/req.c b/src/pki/commands/req.c
index 8f5380a4a8..661da0698a 100644
--- a/src/pki/commands/req.c
+++ b/src/pki/commands/req.c
@@ -23,7 +23,7 @@
#include
/**
- * Create a self-signed PKCS#10 certificate requesst.
+ * Create a self-signed PKCS#10 certificate request.
*/
static int req()
{
diff --git a/src/pool/pool_usage.c b/src/pool/pool_usage.c
index 2b380e386f..aadd9b6572 100644
--- a/src/pool/pool_usage.c
+++ b/src/pool/pool_usage.c
@@ -124,7 +124,7 @@ Usage:\n\
--add dns --server 10.1.0.1\n\
--add dns --server 10.1.1.1\n\
If a - (hyphen) is given as a file name, the commands are read\n\
- from STDIN. Readin commands stops at the end of file. Empty\n\
+ from STDIN. Reading commands stops at the end of file. Empty\n\
lines are ignored. The file may not contain a --batch command.\n\
\n");
}
diff --git a/src/scepclient/scepclient.8 b/src/scepclient/scepclient.8
index 78ce5c628e..a9d3bd9936 100644
--- a/src/scepclient/scepclient.8
+++ b/src/scepclient/scepclient.8
@@ -183,7 +183,7 @@ AES-CBC encryption (key size = 256 bit).
.IP "\fBcamellia128\fP" 12
Camellia-CBC encryption (key size = 128 bit).
.IP "\fBcamellia192\fP" 12
-Camelllia-CBC encryption (key size = 192 bit).
+Camellia-CBC encryption (key size = 192 bit).
.IP "\fBcamellia256\fP" 12
Camellia-CBC encryption (key size = 256 bit).
.PP
diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c
index ecbd1b7596..cdceb4936e 100644
--- a/src/scepclient/scepclient.c
+++ b/src/scepclient/scepclient.c
@@ -322,7 +322,7 @@ static void version(void)
/**
* @brief prints the usage of the program to the stderr output
*
- * If message is set, program is exitet with 1 (error)
+ * If message is set, program is exited with 1 (error)
* @param message message in case of an error
*/
static void usage(const char *message)
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 8ee730daa0..0c22481f0a 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -59,7 +59,7 @@ typedef enum {
DPD_ACTION_CLEAR,
DPD_ACTION_HOLD,
DPD_ACTION_RESTART,
- DPD_ACTION_UNKNOW,
+ DPD_ACTION_UNKNOWN,
} dpd_action_t;
typedef enum {
diff --git a/src/starter/parser/lexer.l b/src/starter/parser/lexer.l
index b81d6ce74d..1faec953e2 100644
--- a/src/starter/parser/lexer.l
+++ b/src/starter/parser/lexer.l
@@ -62,7 +62,7 @@ static void include_files(parser_helper_t *ctx);
%%
-^[\t ]*"version"[^\n]*$ /* eat legacy version delcaration */
+^[\t ]*"version"[^\n]*$ /* eat legacy version declaration */
^[\t ]+ return SPACES;
[\t ]+ /* eat other whitespace */
[\t ]*#[^\n]* /* eat comments */
diff --git a/src/sw-collector/sw-collector.c b/src/sw-collector/sw-collector.c
index f88e55cb28..a24170d76b 100644
--- a/src/sw-collector/sw-collector.c
+++ b/src/sw-collector/sw-collector.c
@@ -436,7 +436,7 @@ static bool query_registry(sw_collector_rest_api_t *rest_api, bool installed)
/**
* List all endpoint software identifiers stored in local collector database
- * that are not registered yet in central collelector database
+ * that are not registered yet in central collector database
*/
static int unregistered_identifiers(sw_collector_db_t *db,
sw_collector_db_query_t type)
diff --git a/src/swanctl/commands/load_authorities.c b/src/swanctl/commands/load_authorities.c
index a4e1f46d37..32f59b4b64 100644
--- a/src/swanctl/commands/load_authorities.c
+++ b/src/swanctl/commands/load_authorities.c
@@ -76,7 +76,7 @@ static bool add_file_key_value(vici_req_t *req, char *key, char *value)
}
/**
- * Translate sletting key/values from a section enumerator into vici
+ * Translate setting key/values from a section enumerator into vici
* key-values/lists. Destroys the enumerator.
*/
static bool add_key_values(vici_req_t *req, enumerator_t *enumerator)
diff --git a/src/swanctl/commands/load_authorities.h b/src/swanctl/commands/load_authorities.h
index 6a3223ba54..17d66f7d60 100644
--- a/src/swanctl/commands/load_authorities.h
+++ b/src/swanctl/commands/load_authorities.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Andreas Stefffen
+ * Copyright (C) 2015 Andreas Steffen
* HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/swanctl/commands/load_creds.c b/src/swanctl/commands/load_creds.c
index 9a38b5d1e3..c592d3b7f3 100644
--- a/src/swanctl/commands/load_creds.c
+++ b/src/swanctl/commands/load_creds.c
@@ -97,7 +97,7 @@ static bool load_cert(load_ctx_t *ctx, char *dir, certificate_type_t type,
}
/**
- * Load certficiates from a directory
+ * Load certificates from a directory
*/
static void load_certs(load_ctx_t *ctx, char *type_str, char *dir)
{
diff --git a/testing/hosts/default/etc/init.d/charon b/testing/hosts/default/etc/init.d/charon
index f372fb0d8a..477605172b 100755
--- a/testing/hosts/default/etc/init.d/charon
+++ b/testing/hosts/default/etc/init.d/charon
@@ -10,7 +10,7 @@
# running in the background
### END INIT INFO
-# Author: Andreas Steffen
+# Author: Andreas Steffen
#
# Do NOT "set -e"
diff --git a/testing/scripts/build-certs-chroot b/testing/scripts/build-certs-chroot
index f49a163bb3..b14e4a9736 100755
--- a/testing/scripts/build-certs-chroot
+++ b/testing/scripts/build-certs-chroot
@@ -816,7 +816,7 @@ cp ${TEST_KEY} ${TEST_CERT} ${DIR}/hosts/alice/etc/raddb/certs
# strongSwan Attribute Authority #
################################################################################
-# Generate Attritbute Authority certificate
+# Generate Attribute Authority certificate
TEST="${TEST_DIR}/ikev2/acert-cached"
TEST_KEY="${TEST}/hosts/moon/${IPSEC_DIR}/private/aaKey.pem"
TEST_CERT="${TEST}/hosts/moon/${IPSEC_DIR}/aacerts/aaCert.pem"
@@ -882,7 +882,7 @@ cp ${TEST_CERT} ${TEST}/hosts/moon/${IPSEC_DIR}/aacerts
cp ${ACERT_CS} ${TEST}/hosts/carol/${IPSEC_DIR}/acerts
cp ${ACERT_DM} ${TEST}/hosts/dave/${IPSEC_DIR}/acerts
-# Generate a short-lived Attritbute Authority certificate
+# Generate a short-lived Attribute Authority certificate
CN="strongSwan Legacy AA"
TEST_KEY="${TEST}/hosts/moon/${IPSEC_DIR}/private/aaKey-expired.pem"
TEST_CERT="${TEST}/hosts/moon/${IPSEC_DIR}/aacerts/aaCert-expired.pem"
diff --git a/testing/tests/ha/active-passive/description.txt b/testing/tests/ha/active-passive/description.txt
index 519fa33139..3af67f6300 100644
--- a/testing/tests/ha/active-passive/description.txt
+++ b/testing/tests/ha/active-passive/description.txt
@@ -2,7 +2,7 @@ The roadwarriors carol and dave set up a connection each
to the virtual gateway mars implemented by the two real gateways
alice and moon in a High Availability (HA) setup
based on ClusterIP. The HA synchronisation link between the two
-gatways is secured by an IPsec transport connection. At the outset
+gateways is secured by an IPsec transport connection. At the outset
alice is the active and moon is the passive gateway.
After alice gets killed moon automatically takes over
all existing IKE_SAs and CHILD_SAs.
diff --git a/testing/tests/ikev2/mobike-virtual-ip-nat/description.txt b/testing/tests/ikev2/mobike-virtual-ip-nat/description.txt
index 6f1837c86b..7c11d3b49b 100644
--- a/testing/tests/ikev2/mobike-virtual-ip-nat/description.txt
+++ b/testing/tests/ikev2/mobike-virtual-ip-nat/description.txt
@@ -1,5 +1,5 @@
The roadwarrior alice is sitting behind the NAT router moon but
-at the outset of the scenariou is also directly connected to the 192.168.0.0/24 network
+at the outset of the scenario is also directly connected to the 192.168.0.0/24 network
via an additional eth1 interface. alice builds up a tunnel to gateway sun
in order to reach bob in the subnet behind. When the eth1 interface
goes away, alice switches to eth0 and signals the IP address change
diff --git a/testing/tests/ikev2/mobike-virtual-ip/description.txt b/testing/tests/ikev2/mobike-virtual-ip/description.txt
index df56127277..2225c3a8a5 100644
--- a/testing/tests/ikev2/mobike-virtual-ip/description.txt
+++ b/testing/tests/ikev2/mobike-virtual-ip/description.txt
@@ -1,5 +1,5 @@
The roadwarrior alice is sitting behind the router moon but
-at the outset of the scenariou is also directly connected to the 192.168.0.0/24 network
+at the outset of the scenario is also directly connected to the 192.168.0.0/24 network
via an additional eth1 interface. alice builds up a tunnel to gateway sun
in order to reach bob in the subnet behind. When the eth1 interface
goes away, alice switches to eth0 and signals the IP address change
diff --git a/testing/tests/ikev2/mobike/description.txt b/testing/tests/ikev2/mobike/description.txt
index 3c780be9e1..c07676b807 100644
--- a/testing/tests/ikev2/mobike/description.txt
+++ b/testing/tests/ikev2/mobike/description.txt
@@ -1,5 +1,5 @@
The roadwarrior alice is sitting behind the router moon but
-at the outset of the scenariou is also directly connected to the 192.168.0.0/24 network
+at the outset of the scenario is also directly connected to the 192.168.0.0/24 network
via an additional eth1 interface. alice builds up a tunnel to gateway sun
in order to reach bob in the subnet behind. When the eth1 interface
goes away, alice switches to eth0 and signals the IP address change
diff --git a/testing/tests/ikev2/ocsp-strict-ifuri/description.txt b/testing/tests/ikev2/ocsp-strict-ifuri/description.txt
index 580684cf84..2791e761f5 100644
--- a/testing/tests/ikev2/ocsp-strict-ifuri/description.txt
+++ b/testing/tests/ikev2/ocsp-strict-ifuri/description.txt
@@ -11,7 +11,7 @@ contain any URIs. Therefore a strict CRL policy is not enforced and the
connection setup succeeds, although the certificate status is unknown.
-The roadwarrrior dave has a certificate from the Sales CA which contains
+The roadwarrior dave has a certificate from the Sales CA which contains
a single OCSP URI but which is not resolvable. Thus because of the known URI
a strict CRL policy is enforced and the unknown certificate status causes the
connection setup to fail.
diff --git a/testing/tests/ikev2/reauth-early/description.txt b/testing/tests/ikev2/reauth-early/description.txt
index 130d08d288..6b6e350458 100644
--- a/testing/tests/ikev2/reauth-early/description.txt
+++ b/testing/tests/ikev2/reauth-early/description.txt
@@ -1,5 +1,5 @@
This scenario tests repeated authentication according to RFC 4478.
-The iniator carol sets a large ikelifetime=20m but the responder
+The initiator carol sets a large ikelifetime=20m but the responder
moon defining a much shorter ikelifetime=30s proposes this
value via an AUTH_LIFETIME notification to the initiator. Thus the
IKE reauthentication takes places after less than 30s. A ping from
diff --git a/testing/tests/ikev2/reauth-late/description.txt b/testing/tests/ikev2/reauth-late/description.txt
index e4f05e1d42..b4d717d6ad 100644
--- a/testing/tests/ikev2/reauth-late/description.txt
+++ b/testing/tests/ikev2/reauth-late/description.txt
@@ -1,7 +1,7 @@
This scenario tests repeated authentication according to RFC 4478.
-The iniator carol sets a short ikelifetime=20m but the responder
+The initiator carol sets a short ikelifetime=20m but the responder
moon defining a much larger ikelifetime=30s proposes this
-value via an AUTH_LIFETIME notification to the initiator. The initatior
+value via an AUTH_LIFETIME notification to the initiator. The initiator
ignores this notification and schedules the IKE reauthentication within
the shorter interval of 30s. A ping from carol to client alice
hiding in the subnet behind moon tests if the CHILD_SA has been
diff --git a/testing/tests/ikev2/rw-eap-peap-md5/evaltest.dat b/testing/tests/ikev2/rw-eap-peap-md5/evaltest.dat
index e1993fd43a..c7884ee0e4 100644
--- a/testing/tests/ikev2/rw-eap-peap-md5/evaltest.dat
+++ b/testing/tests/ikev2/rw-eap-peap-md5/evaltest.dat
@@ -11,7 +11,7 @@ moon:: cat /var/log/daemon.log::EAP_PEAP phase2 authentication of 'carol@strongs
moon:: cat /var/log/daemon.log::authentication of 'carol@strongswan.org' with EAP successful::YES
moon:: cat /var/log/daemon.log::EAP method EAP_PEAP failed for peer dave@strongswan.org::YES
moon:: ipsec status 2> /dev/null::rw-eap\[1]: ESTABLISHED.*CN=moon.strongswan.org.*carol@strongswan.org::YES
-moon:: ipsec status 2> /dev/null::rw-eap\[2]: ESTABLISHED.*CN=moon.strongswan.org.*dave@stronswan.org::NO
+moon:: ipsec status 2> /dev/null::rw-eap\[2]: ESTABLISHED.*CN=moon.strongswan.org.*dave@strongswan.org::NO
carol::ipsec status 2> /dev/null::home.*ESTABLISHED.*carol@strongswan.org.*CN=moon.strongswan.org::YES
dave:: ipsec status 2> /dev/null::home.*ESTABLISHED.*dave@strongswan.org.*CN=moon.strongswan.org::NO
moon:: ipsec status 2> /dev/null::rw-eap[{]1}.*INSTALLED, TUNNEL::YES
diff --git a/testing/tests/ikev2/rw-eap-peap-mschapv2/evaltest.dat b/testing/tests/ikev2/rw-eap-peap-mschapv2/evaltest.dat
index 7cf9edd2f6..6ba3e10e90 100644
--- a/testing/tests/ikev2/rw-eap-peap-mschapv2/evaltest.dat
+++ b/testing/tests/ikev2/rw-eap-peap-mschapv2/evaltest.dat
@@ -11,7 +11,7 @@ moon:: cat /var/log/daemon.log::EAP_PEAP phase2 authentication of 'carol@strongs
moon:: cat /var/log/daemon.log::authentication of 'carol@strongswan.org' with EAP successful::YES
moon:: cat /var/log/daemon.log::EAP method EAP_PEAP failed for peer dave@strongswan.org::YES
moon:: ipsec status 2> /dev/null::rw-eap.*ESTABLISHED.*moon.strongswan.org.*carol@strongswan.org::YES
-moon:: ipsec status 2> /dev/null::rw-eap.*ESTABLISHED.*moon.strongswan.org.*dave@stronswan.org::NO
+moon:: ipsec status 2> /dev/null::rw-eap.*ESTABLISHED.*moon.strongswan.org.*dave@strongswan.org::NO
carol::ipsec status 2> /dev/null::home.*ESTABLISHED.*carol@strongswan.org.*moon.strongswan.org::YES
dave:: ipsec status 2> /dev/null::home.*ESTABLISHED::NO
carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_.eq=1::YES
diff --git a/testing/tests/ikev2/rw-eap-ttls-only/evaltest.dat b/testing/tests/ikev2/rw-eap-ttls-only/evaltest.dat
index 48aaf24aec..a4b7d58121 100644
--- a/testing/tests/ikev2/rw-eap-ttls-only/evaltest.dat
+++ b/testing/tests/ikev2/rw-eap-ttls-only/evaltest.dat
@@ -11,7 +11,7 @@ moon:: cat /var/log/daemon.log::EAP_TTLS phase2 authentication of 'carol@strongs
moon:: cat /var/log/daemon.log::authentication of 'carol@strongswan.org' with EAP successful::YES
moon:: cat /var/log/daemon.log::EAP method EAP_TTLS failed for peer dave@strongswan.org::YES
moon:: ipsec status 2> /dev/null::rw-eap.*ESTABLISHED.*carol@strongswan.org::YES
-moon:: ipsec status 2> /dev/null::rw-eap.*ESTABLISHED.*dave@stronswan.org::NO
+moon:: ipsec status 2> /dev/null::rw-eap.*ESTABLISHED.*dave@strongswan.org::NO
carol::ipsec status 2> /dev/null::home.*ESTABLISHED::YES
dave:: ipsec status 2> /dev/null::home.*ESTABLISHED::NO
carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_.eq=1::YES
diff --git a/testing/tests/swanctl/protoport-range/description.txt b/testing/tests/swanctl/protoport-range/description.txt
index b24382204a..7e64bcd72c 100644
--- a/testing/tests/swanctl/protoport-range/description.txt
+++ b/testing/tests/swanctl/protoport-range/description.txt
@@ -2,6 +2,6 @@ Using [<protocol>/<port>] selectors in the
local_ts and remote_ts child parameters, three IPsec tunnels
between the roadwarrior carol and the gateway moon are defined.
The first CHILD_SA is restricted to ICMP request packets, the second
-covers ICMP reply pachets and the third TCP-based FTP and SSH connections.
+covers ICMP reply packets and the third TCP-based FTP and SSH connections.
The established tunnels are tested by carol by first pinging alice
behind moon and then setting up an SSH session to the same client.
diff --git a/testing/tests/swanctl/rw-eap-md5-id-rsa-ppk/description.txt b/testing/tests/swanctl/rw-eap-md5-id-rsa-ppk/description.txt
index fb84490687..bb3e31ac20 100644
--- a/testing/tests/swanctl/rw-eap-md5-id-rsa-ppk/description.txt
+++ b/testing/tests/swanctl/rw-eap-md5-id-rsa-ppk/description.txt
@@ -1,7 +1,7 @@
The roadwarriors carol and dave set up a connection to gateway moon.
At the outset the gateway authenticates itself to the clients by sending
an IKEv2 RSA signature accompanied by a certificate.
-The roadwarrios then use the Extensible Authentication Protocol
+The roadwarriors then use the Extensible Authentication Protocol
in association with an MD5 challenge and response protocol
(EAP-MD5) to authenticate against the gateway moon and includes
a Postquantum Preshared Key (PPK) that's also mixed into the