summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Metzler <ametzler@bebt.de>2015-12-26 18:24:56 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2015-12-27 12:24:02 +0200
commit1e5db54b6fea6855587aab91c07ef51c66d3b100 (patch)
treee08d823c60569ad7aa56609fcb8ae93dde551904
parent2840ecfdf02f0c6d07df1e2b9f19d30f014e1b82 (diff)
downloadgnutls-1e5db54b6fea6855587aab91c07ef51c66d3b100.tar.gz
Fix some typos [ci skip]
-rw-r--r--README2
-rw-r--r--lib/ext/srtp.c2
-rw-r--r--lib/gnutls_priority.c2
-rw-r--r--lib/locks.c2
-rw-r--r--lib/opencdk/keydb.c2
-rw-r--r--lib/x509/pkcs7.c4
-rw-r--r--tests/mini-handshake-timeout.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/README b/README
index b1dbb6f088..6ab8d569e8 100644
--- a/README
+++ b/README
@@ -148,7 +148,7 @@ PATCHES
Patches are welcome and encouraged. Patches can be submitted through the
bug tracking system or the mailing list. When submitting patches, please
-be sure to use sources from the git repository, and preferrably from the
+be sure to use sources from the git repository, and preferably from the
master branch. To create a patch for the project from a local git repository,
please use the following commands. 'gnutls' should be the local directory
of a previous git clone.
diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c
index 23bdc54ca0..5e13689a33 100644
--- a/lib/ext/srtp.c
+++ b/lib/ext/srtp.c
@@ -462,7 +462,7 @@ gnutls_srtp_set_profile(gnutls_session_t session,
* @session: is a #gnutls_session_t type.
* @profiles: is a string that contains the supported SRTP profiles,
* separated by colons.
- * @err_pos: In case of an error this will have the position in the string the error occured, may be NULL.
+ * @err_pos: In case of an error this will have the position in the string the error occurred, may be NULL.
*
* This function is to be used by both clients and servers, to declare
* what SRTP profiles they support, to negotiate with the peer.
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 444f10fba6..50d3d09b26 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -1322,7 +1322,7 @@ void gnutls_priority_deinit(gnutls_priority_t priority_cache)
* gnutls_priority_set_direct:
* @session: is a #gnutls_session_t type.
* @priorities: is a string describing priorities
- * @err_pos: In case of an error this will have the position in the string the error occured
+ * @err_pos: In case of an error this will have the position in the string the error occurred
*
* Sets the priorities to use on the ciphers, key exchange methods,
* macs and compression methods. This function avoids keeping a
diff --git a/lib/locks.c b/lib/locks.c
index e2acc79618..a666070817 100644
--- a/lib/locks.c
+++ b/lib/locks.c
@@ -39,7 +39,7 @@
* With this function you are allowed to override the default mutex
* locks used in some parts of gnutls and dependent libraries. This function
* should be used if you have complete control of your program and libraries.
- * Do not call this function from a library, or preferrably from any application
+ * Do not call this function from a library, or preferably from any application
* unless really needed to. GnuTLS will use the appropriate locks for the running
* system.
*
diff --git a/lib/opencdk/keydb.c b/lib/opencdk/keydb.c
index e0ab08d544..4e9c1dc54f 100644
--- a/lib/opencdk/keydb.c
+++ b/lib/opencdk/keydb.c
@@ -1338,7 +1338,7 @@ keydb_parse_allsigs(cdk_kbnode_t knode, cdk_keydb_hd_t hd, int check)
return CDK_Error_No_Key;
}
}
- /* Revocation certifcates for user ID's */
+ /* Revocation certificates for user ID's */
else if (sig->sig_class == 0x30) {
if (sig->keyid[0] != keyid[0]
|| sig->keyid[1] != keyid[1])
diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index a845450409..76d10a99af 100644
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -402,7 +402,7 @@ gnutls_pkcs7_get_crt_raw(gnutls_pkcs7_t pkcs7,
* gnutls_pkcs7_get_crt_count:
* @pkcs7: should contain a #gnutls_pkcs7_t type
*
- * This function will return the number of certifcates in the PKCS7
+ * This function will return the number of certificates in the PKCS7
* or RFC2630 certificate set.
*
* Returns: On success, a positive number is returned, otherwise a
@@ -1613,7 +1613,7 @@ gnutls_pkcs7_get_crl_raw(gnutls_pkcs7_t pkcs7,
* gnutls_pkcs7_get_crl_count:
* @pkcs7: The pkcs7 type
*
- * This function will return the number of certifcates in the PKCS7
+ * This function will return the number of certificates in the PKCS7
* or RFC2630 crl set.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
diff --git a/tests/mini-handshake-timeout.c b/tests/mini-handshake-timeout.c
index b470d90839..488867417b 100644
--- a/tests/mini-handshake-timeout.c
+++ b/tests/mini-handshake-timeout.c
@@ -114,7 +114,7 @@ static void client(int fd, int wait)
exit(1);
}
if (debug)
- success("client: expected timeout occured\n");
+ success("client: expected timeout occurred\n");
return;
} else {
if (wait != 0) {