Some typos fixed.

13 files changed, 15 insertions, 15 deletions

diff --git a/man/ipsec.conf.5.in b/man/ipsec.conf.5.in
index 48eb136aa..9a789acef 100644
--- a/man/ipsec.conf.5.in
+++ b/man/ipsec.conf.5.in
@@ -594,7 +594,7 @@ sets
 to the distinguished name of the certificate's subject and
 .B leftca
 to the distinguished name of the certificate's issuer.
-The left participant's ID can be overriden by specifying a
+The left participant's ID can be overridden by specifying a
 .B leftid
 value which must be certified by the certificate, though.
 .TP
diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index 646359a9d..fea88818e 100644
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -196,7 +196,7 @@ static bool load_keys(settings_t *settings, char *dir)
 		}
 		else
 		{
-			fprintf(stderr, "unkown key type: '%s'\n", type);
+			fprintf(stderr, "unknown key type: '%s'\n", type);
 			enumerator->destroy(enumerator);
 			return FALSE;
 		}
diff --git a/src/conftest/hooks/unsort_message.c b/src/conftest/hooks/unsort_message.c
index 9af13e8e0..b37b261a4 100644
--- a/src/conftest/hooks/unsort_message.c
+++ b/src/conftest/hooks/unsort_message.c
@@ -85,7 +85,7 @@ METHOD(listener_t, message, bool,
 			}
 			else
 			{
-				DBG1(DBG_CFG, "unkown payload to sort: '%s', skipped", name);
+				DBG1(DBG_CFG, "unknown payload to sort: '%s', skipped", name);
 			}
 		}
 		order->destroy(order);
diff --git a/src/libcharon/encoding/payloads/payload.h b/src/libcharon/encoding/payloads/payload.h
index 9d5ba8f11..0f407ff42 100644
--- a/src/libcharon/encoding/payloads/payload.h
+++ b/src/libcharon/encoding/payloads/payload.h
@@ -261,10 +261,10 @@ struct payload_t {
 payload_t *payload_create(payload_type_t type);
 
 /**
- * Check if a specific payload is implemented, or handled as unkown payload.
+ * Check if a specific payload is implemented, or handled as unknown payload.
  *
  * @param type		type of the payload to check
- * @return			FALSE if payload type handled as unkown payload
+ * @return			FALSE if payload type handled as unknown payload
  */
 bool payload_is_known(payload_type_t type);
 
diff --git a/src/libcharon/sa/tasks/child_create.c b/src/libcharon/sa/tasks/child_create.c
index 02831b004..fc02a334b 100644
--- a/src/libcharon/sa/tasks/child_create.c
+++ b/src/libcharon/sa/tasks/child_create.c
@@ -967,7 +967,7 @@ METHOD(task_t, build_r, status_t,
 				case INTERNAL_ADDRESS_FAILURE:
 				case FAILED_CP_REQUIRED:
 				{
-					DBG1(DBG_IKE,"configuration payload negotation "
+					DBG1(DBG_IKE,"configuration payload negotiation "
 						 "failed, no CHILD_SA built");
 					enumerator->destroy(enumerator);
 					handle_child_sa_failure(this, message);
diff --git a/src/libstrongswan/eap/eap.h b/src/libstrongswan/eap/eap.h
index 1d55747a4..e98a3a211 100644
--- a/src/libstrongswan/eap/eap.h
+++ b/src/libstrongswan/eap/eap.h
@@ -82,7 +82,7 @@ extern enum_name_t *eap_type_short_names;
  * Lookup the EAP method type from a string.
  *
  * @param name		EAP method name (such as "md5", "aka")
- * @return			method type, 0 if unkown
+ * @return			method type, 0 if unknown
  */
 eap_type_t eap_type_from_string(char *name);
 
diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c
index d4fb4e075..c3bb4ea5b 100644
--- a/src/libstrongswan/plugins/x509/x509_cert.c
+++ b/src/libstrongswan/plugins/x509/x509_cert.c
@@ -648,7 +648,7 @@ static void parse_authorityInfoAccess(chunk_t blob, int level0,
 						}
 						break;
 					default:
-						/* unkown accessMethod, ignoring */
+						/* unknown accessMethod, ignoring */
 						break;
 				}
 				break;
diff --git a/src/libtls/tls.h b/src/libtls/tls.h
index 1908f5dd4..e2c377ad3 100644
--- a/src/libtls/tls.h
+++ b/src/libtls/tls.h
@@ -202,7 +202,7 @@ struct tls_t {
 	/**
 	 * Check if TLS negotiation completed successfully.
 	 *
-	 * @return			TRUE if TLS negotation and authentication complete
+	 * @return			TRUE if TLS negotiation and authentication complete
 	 */
 	bool (*is_complete)(tls_t *this);
 
diff --git a/src/pluto/ca.c b/src/pluto/ca.c
index 2654774fa..add85def8 100644
--- a/src/pluto/ca.c
+++ b/src/pluto/ca.c
@@ -629,7 +629,7 @@ void add_ca_info(const whack_message_t *msg)
 			if (strncasecmp(msg->ocspuri, "http", 4) == 0)
 				ca->ocspuri = clone_str(msg->ocspuri);
 			else
-				plog("  ignoring ocspuri with unkown protocol");
+				plog("  ignoring ocspuri with unknown protocol");
 		}
 
 		/* add crl uris */
diff --git a/src/pluto/demux.c b/src/pluto/demux.c
index 0590a3585..249e645ed 100644
--- a/src/pluto/demux.c
+++ b/src/pluto/demux.c
@@ -1147,7 +1147,7 @@ read_packet(struct msg_digest *md)
 	}
 	else if (from_ugh != NULL)
 	{
-		plog("recvfrom on %s returned misformed source sockaddr: %s"
+		plog("recvfrom on %s returned malformed source sockaddr: %s"
 			, ifp->rname, from_ugh);
 		return FALSE;
 	}
diff --git a/src/scepclient/scepclient.8 b/src/scepclient/scepclient.8
index 4b5234da2..72750e155 100644
--- a/src/scepclient/scepclient.8
+++ b/src/scepclient/scepclient.8
@@ -239,12 +239,12 @@ Log raw hex dumps.
 .PP 
 .B \-C, \-\-debug\-control
 .RS 4
-Log informations about control flow.
+Log information about control flow.
 .RE
 .PP 
 .B \-M, \-\-debug\-controlmore
 .RS 4
-Log more detailed informations about control flow.
+Log more detailed information about control flow.
 .RE
 .PP 
 .B \-X, \-\-debug\-private
diff --git a/testing/tests/ikev1/xauth-rsa-fail/description.txt b/testing/tests/ikev1/xauth-rsa-fail/description.txt
index 83e9d2726..98d85f30b 100644
--- a/testing/tests/ikev1/xauth-rsa-fail/description.txt
+++ b/testing/tests/ikev1/xauth-rsa-fail/description.txt
@@ -2,4 +2,4 @@ The roadwarrior <b>carol</b> sets up a connection to gateway <b>moon</b>.
 The authentication is based on RSA signatures (<b>RSASIG</b>) using X.509
 certificates followed by extended authentication (<b>XAUTH</b>) based
 on user name and password. Because user <b>carol</b> presents a wrong
-XAUTH password the IKE negotation is aborted and the ISAKMP SA is deleted.
+XAUTH password the IKE negotiation is aborted and the ISAKMP SA is deleted.
diff --git a/testing/tests/ikev1/xauth-rsa-nosecret/description.txt b/testing/tests/ikev1/xauth-rsa-nosecret/description.txt
index ffbb47c04..a6fe82330 100644
--- a/testing/tests/ikev1/xauth-rsa-nosecret/description.txt
+++ b/testing/tests/ikev1/xauth-rsa-nosecret/description.txt
@@ -2,5 +2,5 @@ The roadwarrior <b>carol</b> sets up a connection to gateway <b>moon</b>.
 The authentication is based on RSA signatures (<b>RSASIG</b>) using X.509
 certificates followed by extended authentication (<b>XAUTH</b>) based
 on user name and password. Because user <b>carol</b> cannot find her 
-XAUTH credentials in ipsec.secrets, the IKE negotation is aborted and the
+XAUTH credentials in ipsec.secrets, the IKE negotiation is aborted and the
 ISAKMP SA is deleted.