Fix two typos (overriden/guarranteed)

Signed-off-by: Andreas Metzler <ametzler@bebt.de>

13 files changed, 33 insertions, 33 deletions

diff --git a/NEWS b/NEWS
index 1482a60ef5..e6e4ffb6bb 100644
--- a/NEWS
+++ b/NEWS
@@ -275,7 +275,7 @@ No changes since last version.
 
 ** libgnutls: PKIX certificates with unknown critical extensions are rejected
    on verification with status GNUTLS_CERT_UNKNOWN_CRIT_EXTENSIONS. This
-   behavior can be overriden by providing the flag GNUTLS_VERIFY_IGNORE_UNKNOWN_CRIT_EXTENSIONS
+   behavior can be overridden by providing the flag GNUTLS_VERIFY_IGNORE_UNKNOWN_CRIT_EXTENSIONS
    to verification functions. Resolves gitlab issue #177.
 
 ** libgnutls: Refuse to generate a certificate with an illegal version, or an
@@ -1201,7 +1201,7 @@ being usable after a reinitialization.
 
 ** libgnutls: The GNUTLS_CPUID_OVERRIDE environment variable can be used to 
 explicitly enable/disable the use of certain CPU capabilities. Note that CPU
-detection cannot be overriden, i.e., VIA options cannot be enabled on an Intel
+detection cannot be overridden, i.e., VIA options cannot be enabled on an Intel
 CPU. The currently available options are:
   0x1: Disable all run-time detected optimizations
   0x2: Enable AES-NI
diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index 0cab3afe8c..777bac155f 100644
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -594,7 +594,7 @@ int gnutls_session_ticket_enable_client(gnutls_session_t session)
  * To avoid leaking that key, use gnutls_memset() prior to
  * releasing it.
  *
- * The default ticket expiration time can be overriden using
+ * The default ticket expiration time can be overridden using
  * gnutls_db_set_cache_expiration().
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, or an
diff --git a/lib/global.c b/lib/global.c
index 1f92965b80..d657f56d8c 100644
--- a/lib/global.c
+++ b/lib/global.c
@@ -369,8 +369,8 @@ static int _gnutls_global_init(unsigned constructor)
 	_gnutls_load_system_priorities();
 
 #ifdef ENABLE_FIPS140
-	/* These self tests are performed on the overriden algorithms
-	 * (e.g., AESNI overriden AES). They are after _gnutls_register_accel_crypto()
+	/* These self tests are performed on the overridden algorithms
+	 * (e.g., AESNI overridden AES). They are after _gnutls_register_accel_crypto()
 	 * intentionally */
 	if (res != 0) {
 		ret = _gnutls_fips_perform_self_checks2();
diff --git a/lib/hello_ext.c b/lib/hello_ext.c
index ac0fc1ba03..83bd107ffe 100644
--- a/lib/hello_ext.c
+++ b/lib/hello_ext.c
@@ -340,7 +340,7 @@ int hello_ext_send(void *_ctx, gnutls_buffer_st *buf)
 				  ext_msg_validity_to_str(ctx->msg));
 	}
 
-	/* ensure we don't send something twice (i.e, overriden extensions in
+	/* ensure we don't send something twice (i.e, overridden extensions in
 	 * client), and ensure we are sending only what we received in server. */
 	ret = _gnutls_hello_ext_is_present(session, p->gid);
 
@@ -419,7 +419,7 @@ _gnutls_gen_hello_extensions(gnutls_session_t session,
 	}
 
 	/* hello_ext_send() ensures we don't send duplicates, in case
-	 * of overriden extensions */
+	 * of overridden extensions */
 	for (i = 0; i < MAX_EXT_TYPES; i++) {
 		if (!extfunc[i])
 			continue;
diff --git a/lib/hello_ext.h b/lib/hello_ext.h
index 8a7580a28e..1ad16e19d7 100644
--- a/lib/hello_ext.h
+++ b/lib/hello_ext.h
@@ -115,7 +115,7 @@ inline static const char *ext_msg_validity_to_str(gnutls_ext_flags_t msg)
 }
 
 typedef struct hello_ext_entry_st {
-	const char *name; /* const overriden when free_struct is set */
+	const char *name; /* const overridden when free_struct is set */
 	unsigned free_struct;
 
 	uint16_t tls_id;
@@ -143,7 +143,7 @@ typedef struct hello_ext_entry_st {
 	gnutls_ext_pack_func pack_func;	/* packs internal data to machine independent format */
 	gnutls_ext_unpack_func unpack_func;	/* unpacks internal data */
 
-	/* non-zero if that extension cannot be overriden by the applications.
+	/* non-zero if that extension cannot be overridden by the applications.
 	 * That should be set to extensions which allocate data early, e.g., on
 	 * gnutls_init(), or modify the TLS protocol in a way that the application
 	 * cannot control. */
diff --git a/lib/session.c b/lib/session.c
index 90e3a78a4a..1622b29764 100644
--- a/lib/session.c
+++ b/lib/session.c
@@ -172,7 +172,7 @@ gnutls_session_get_data2(gnutls_session_t session, gnutls_datum_t *data)
  *
  * In client side this function returns the identifier returned by the
  * server, and cannot be assumed to have any relation to session resumption.
- * In server side this function is guarranteed to return a persistent
+ * In server side this function is guaranteed to return a persistent
  * identifier of the session since GnuTLS 3.6.4, which may not necessarily
  * map into the TLS session ID value. Prior to that version the value
  * could only be considered a persistent identifier, under TLS1.2 or earlier
@@ -222,7 +222,7 @@ gnutls_session_get_id(gnutls_session_t session,
  *
  * In client side this function returns the identifier returned by the
  * server, and cannot be assumed to have any relation to session resumption.
- * In server side this function is guarranteed to return a persistent
+ * In server side this function is guaranteed to return a persistent
  * identifier of the session since GnuTLS 3.6.4, which may not necessarily
  * map into the TLS session ID value. Prior to that version the value
  * could only be considered a persistent identifier, under TLS1.2 or earlier
diff --git a/tests/global-init-override.c b/tests/global-init-override.c
index 618775c7f7..beeca03daa 100644
--- a/tests/global-init-override.c
+++ b/tests/global-init-override.c
@@ -37,7 +37,7 @@
 
 #include "utils.h"
 
-/* We test whether implicit global initialization can be overriden */
+/* We test whether implicit global initialization can be overridden */
 
 GNUTLS_SKIP_GLOBAL_INIT
 
diff --git a/tests/pkcs11/pkcs11-cert-import-url-exts.c b/tests/pkcs11/pkcs11-cert-import-url-exts.c
index abc84834fd..bf806b1321 100644
--- a/tests/pkcs11/pkcs11-cert-import-url-exts.c
+++ b/tests/pkcs11/pkcs11-cert-import-url-exts.c
@@ -117,7 +117,7 @@ void doit(void)
 	}
 
 	if (ret == 0) {
-		fail("overriden cert is not a CA!\n");
+		fail("overridden cert is not a CA!\n");
 		exit(1);
 	}
 
diff --git a/tests/pkcs11/pkcs11-cert-import-url4-exts.c b/tests/pkcs11/pkcs11-cert-import-url4-exts.c
index 13dd76a6c2..f9fe82f4b1 100644
--- a/tests/pkcs11/pkcs11-cert-import-url4-exts.c
+++ b/tests/pkcs11/pkcs11-cert-import-url4-exts.c
@@ -142,7 +142,7 @@ void doit(void)
 	}
 
 	if (ret == 0) {
-		fail("overriden cert is not a CA!\n");
+		fail("overridden cert is not a CA!\n");
 		exit(1);
 	}
 
diff --git a/tests/pkcs11/pkcs11-get-raw-issuer-exts.c b/tests/pkcs11/pkcs11-get-raw-issuer-exts.c
index a395376f29..dec3088e11 100644
--- a/tests/pkcs11/pkcs11-get-raw-issuer-exts.c
+++ b/tests/pkcs11/pkcs11-get-raw-issuer-exts.c
@@ -126,7 +126,7 @@ void doit(void)
 	}
 
 	if (ret == 0) {
-		fail("overriden cert is not a CA!\n");
+		fail("overridden cert is not a CA!\n");
 		exit(1);
 	}
 
diff --git a/tests/set-default-prio.c b/tests/set-default-prio.c
index cf4f00b764..68e60d7889 100644
--- a/tests/set-default-prio.c
+++ b/tests/set-default-prio.c
@@ -97,7 +97,7 @@ static void start(struct test_st *test)
 		ret = gnutls_set_default_priority_append(server, test->add_prio, &ep, 0);
 		if (ret < 0) {
 			if (test->exp_err == ret) {
-			/* the &ep value is only accurate when the default priorities are not overriden;
+			/* the &ep value is only accurate when the default priorities are not overridden;
 			 * otherwise it should be a pointer to the start of the string */
 				if (strchr(_gnutls_default_priority_string, '@') != 0) {
 					if (ep != test->add_prio) {
diff --git a/tests/slow/override-ciphers b/tests/slow/override-ciphers
index a95253ba94..2a87b7655f 100755
--- a/tests/slow/override-ciphers
+++ b/tests/slow/override-ciphers
@@ -29,21 +29,21 @@ PROG=./cipher-override${EXEEXT}
 GNUTLS_NO_EXPLICIT_INIT=1 ${VALGRIND} ${PROG}
 ret=$?
 if test $ret != 0; then
-	echo "overriden cipher tests failed"
+	echo "overridden cipher tests failed"
 	exit $ret
 fi
 
 ${VALGRIND} ${PROG}
 ret=$?
 if test $ret != 0; then
-	echo "overriden cipher tests 2 failed"
+	echo "overridden cipher tests 2 failed"
 	exit $ret
 fi
 
 ${VALGRIND} ${PROG}
 ret=$?
 if test $ret != 0; then
-	echo "overriden cipher tests 3 failed"
+	echo "overridden cipher tests 3 failed"
 	exit $ret
 fi
 
@@ -54,14 +54,14 @@ else
 	GNUTLS_NO_EXPLICIT_INIT=1 ${VALGRIND} ./mac-override
 	ret=$?
 	if test $ret != 0; then
-		echo "overriden mac tests failed"
+		echo "overridden mac tests failed"
 		exit $ret
 	fi
 
 	${VALGRIND} ./mac-override
 	ret=$?
 	if test $ret != 0; then
-		echo "overriden mac tests 2 failed"
+		echo "overridden mac tests 2 failed"
 		exit $ret
 	fi
 fi
diff --git a/tests/tls-session-ext-override.c b/tests/tls-session-ext-override.c
index 56bebe6644..9ddfc921f0 100644
--- a/tests/tls-session-ext-override.c
+++ b/tests/tls-session-ext-override.c
@@ -64,7 +64,7 @@ static int TLSEXT_TYPE_client_sent		= 0;
 static int TLSEXT_TYPE_client_received		= 0;
 static int TLSEXT_TYPE_server_sent		= 0;
 static int TLSEXT_TYPE_server_received		= 0;
-static int overriden_extension = -1;
+static int overridden_extension = -1;
 
 static const unsigned char ext_data[] =
 {
@@ -82,7 +82,7 @@ static int ext_recv_client_params(gnutls_session_t session, const unsigned char
 
 	TLSEXT_TYPE_client_received = 1;
 
-	gnutls_ext_set_data(session, overriden_extension, session);
+	gnutls_ext_set_data(session, overridden_extension, session);
 
 	return 0; //Success
 }
@@ -146,24 +146,24 @@ static void client(int sd)
 	gnutls_transport_set_int(session, sd);
 	gnutls_handshake_set_timeout(session, 20 * 1000);
 
-	ret = gnutls_session_ext_register(session, "ext_client", overriden_extension, GNUTLS_EXT_TLS, ext_recv_client_params, ext_send_client_params, NULL, NULL, NULL, 0);
+	ret = gnutls_session_ext_register(session, "ext_client", overridden_extension, GNUTLS_EXT_TLS, ext_recv_client_params, ext_send_client_params, NULL, NULL, NULL, 0);
 	if (ret != GNUTLS_E_ALREADY_REGISTERED)
-		fail("client: register existing extension (%d)\n", overriden_extension);
+		fail("client: register existing extension (%d)\n", overridden_extension);
 
 	ret = gnutls_session_ext_register(session, "ext_client", 0, GNUTLS_EXT_TLS, ext_recv_client_params, ext_send_client_params, NULL, NULL, NULL, GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL);
 	if (ret != GNUTLS_E_ALREADY_REGISTERED)
 		fail("client: register extension %d\n", 0);
 
-	ret = gnutls_session_ext_register(session, "ext_client", overriden_extension, GNUTLS_EXT_TLS, ext_recv_client_params, ext_send_client_params, NULL, NULL, NULL, GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL);
+	ret = gnutls_session_ext_register(session, "ext_client", overridden_extension, GNUTLS_EXT_TLS, ext_recv_client_params, ext_send_client_params, NULL, NULL, NULL, GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL);
 	if (ret < 0)
-		fail("client: register extension (%d)\n", overriden_extension);
+		fail("client: register extension (%d)\n", overridden_extension);
 
 	/* Perform the TLS handshake
 	 */
 	ret = gnutls_handshake(session);
 
 	if (ret < 0) {
-		fail("[%d]: client: Handshake failed\n", overriden_extension);
+		fail("[%d]: client: Handshake failed\n", overridden_extension);
 		gnutls_perror(ret);
 		goto end;
 	} else {
@@ -174,7 +174,7 @@ static void client(int sd)
 	if (TLSEXT_TYPE_client_sent != 1 || TLSEXT_TYPE_client_received != 1)
 		fail("client: extension not properly sent/received\n");
 
-	ret = gnutls_ext_get_data(session, overriden_extension, &p);
+	ret = gnutls_ext_get_data(session, overridden_extension, &p);
 	if (ret < 0) {
 		fail("gnutls_ext_get_data: %s\n", gnutls_strerror(ret));
 	}
@@ -226,11 +226,11 @@ static void server(int sd)
 	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
 				serverx509cred);
 
-	ret = gnutls_session_ext_register(session, "ext_server", overriden_extension, GNUTLS_EXT_TLS, ext_recv_server_params, ext_send_server_params, NULL, NULL, NULL, 0);
+	ret = gnutls_session_ext_register(session, "ext_server", overridden_extension, GNUTLS_EXT_TLS, ext_recv_server_params, ext_send_server_params, NULL, NULL, NULL, 0);
 	if (ret != GNUTLS_E_ALREADY_REGISTERED)
 		fail("client: register existing extension\n");
 
-	ret = gnutls_session_ext_register(session, "ext_server", overriden_extension, GNUTLS_EXT_TLS, ext_recv_server_params, ext_send_server_params, NULL, NULL, NULL, GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL);
+	ret = gnutls_session_ext_register(session, "ext_server", overridden_extension, GNUTLS_EXT_TLS, ext_recv_server_params, ext_send_server_params, NULL, NULL, NULL, GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL);
 	if (ret < 0)
 		fail("client: register extension\n");
 
@@ -242,7 +242,7 @@ static void server(int sd)
 		close(sd);
 		gnutls_deinit(session);
 		fail("[%d]: server: Handshake has failed (%s)\n\n",
-		     overriden_extension, gnutls_strerror(ret));
+		     overridden_extension, gnutls_strerror(ret));
 		return;
 	}
 	if (debug)
@@ -285,7 +285,7 @@ static void override_ext(unsigned extension)
 	TLSEXT_TYPE_client_received = 0;
 	TLSEXT_TYPE_server_sent	= 0;
 	TLSEXT_TYPE_server_received = 0;
-	overriden_extension = extension;
+	overridden_extension = extension;
 
 	child = fork();
 	if (child < 0) {