summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--p11-kit/fixtures/test-system-none.conf2
-rw-r--r--p11-kit/iter.c8
-rw-r--r--p11-kit/modules.c4
-rw-r--r--p11-kit/rpc-server.c2
-rw-r--r--p11-kit/util.c2
-rw-r--r--trust/builder.c2
-rw-r--r--trust/p11-kit-trust.module2
-rw-r--r--trust/parser.c2
8 files changed, 12 insertions, 12 deletions
diff --git a/p11-kit/fixtures/test-system-none.conf b/p11-kit/fixtures/test-system-none.conf
index 95351e6..2d43fa7 100644
--- a/p11-kit/fixtures/test-system-none.conf
+++ b/p11-kit/fixtures/test-system-none.conf
@@ -2,7 +2,7 @@
# Only user config
user-config: none
-# These values will not be overriden
+# These values will not be overridden
key1: system1
key2: system2
key3: system3 \ No newline at end of file
diff --git a/p11-kit/iter.c b/p11-kit/iter.c
index 5301162..aeee8ad 100644
--- a/p11-kit/iter.c
+++ b/p11-kit/iter.c
@@ -103,7 +103,7 @@ struct p11_kit_iter {
* @P11_KIT_ITER_WANT_WRITABLE: Try to open read-write sessions when
* iterating over obojects.
*
- * Various flags controling the behavior of the iterator.
+ * Various flags controlling the behavior of the iterator.
*/
/**
@@ -680,7 +680,7 @@ p11_kit_iter_get_slot (P11KitIter *iter)
*
* Get the token info for the token which the current matching object is on.
*
- * This can only be called after p11_kit_iter_next(0 succeeds.
+ * This can only be called after p11_kit_iter_next() succeeds.
*
* Returns: the slot of the current matching object.
*/
@@ -732,9 +732,9 @@ p11_kit_iter_get_object (P11KitIter *iter)
/**
* p11_kit_iter_destroy_object:
- * @iter: teh iterator
+ * @iter: the iterator
*
- * Destory the current matching object.
+ * Destroy the current matching object.
*
* This can only be called after p11_kit_iter_next() succeeds.
*
diff --git a/p11-kit/modules.c b/p11-kit/modules.c
index c1094ce..f52c6e1 100644
--- a/p11-kit/modules.c
+++ b/p11-kit/modules.c
@@ -745,7 +745,7 @@ finalize_module_inlock_reentrant (Module *mod)
return CKR_OK;
/*
- * Becuase of the mutex unlock below, we temporarily increase
+ * Because of the mutex unlock below, we temporarily increase
* the ref count. This prevents module from being freed out
* from ounder us.
*/
@@ -1951,7 +1951,7 @@ p11_modules_load_inlock_reentrant (int flags,
* If @flags contains the %P11_KIT_MODULE_CRITICAL flag then the
* modules will all be treated as 'critical', regardless of the module
* configuration. This means that a failure to load any module will
- * cause this funtion to fail.
+ * cause this function to fail.
*
* For unmanaged modules there is no guarantee to the state of the
* modules. Other callers may be using the modules. Using unmanaged
diff --git a/p11-kit/rpc-server.c b/p11-kit/rpc-server.c
index a2562e9..6be75bd 100644
--- a/p11-kit/rpc-server.c
+++ b/p11-kit/rpc-server.c
@@ -862,7 +862,7 @@ rpc_C_CloseAllSessions (CK_X_FUNCTION_LIST *self,
{
CK_SLOT_ID slot_id;
- /* Slot id becomes appartment so lower layers can tell clients apart. */
+ /* Slot id becomes apartment so lower layers can tell clients apart. */
BEGIN_CALL (CloseAllSessions);
IN_ULONG (slot_id);
diff --git a/p11-kit/util.c b/p11-kit/util.c
index 1124876..325d669 100644
--- a/p11-kit/util.c
+++ b/p11-kit/util.c
@@ -57,7 +57,7 @@
* @title: Future
* @short_description: Future Unstable API
*
- * API that is not yet stable enough to be enabled by default. In all likelyhood
+ * API that is not yet stable enough to be enabled by default. In all likelihood
* this will be included in the next release. To use this API you must define a
* MACRO. See the p11-kit.h header for more details.
*/
diff --git a/trust/builder.c b/trust/builder.c
index 6e8a1e4..e0ce370 100644
--- a/trust/builder.c
+++ b/trust/builder.c
@@ -1288,7 +1288,7 @@ build_trust_object_eku (CK_ATTRIBUTE *object,
else
neutral = allow;
- /* The value set if a purpose is explictly rejected */
+ /* The value set if a purpose is explicitly rejected */
disallow = CKT_NSS_NOT_TRUSTED;
for (i = 0; eku_attribute_map[i].type != CKA_INVALID; i++) {
diff --git a/trust/p11-kit-trust.module b/trust/p11-kit-trust.module
index a55932a..2f53ef6 100644
--- a/trust/p11-kit-trust.module
+++ b/trust/p11-kit-trust.module
@@ -11,7 +11,7 @@ priority: 1
# Mark this module as a viable source of trust policy information
trust-policy: yes
-# This is for drop-in compatibilty with glib-networking and gcr. Those
+# This is for drop-in compatibility with glib-networking and gcr. Those
# projects used this non-standard attribute to denote slots to use to
# retrieve trust information.
x-trust-lookup: pkcs11:library-description=PKCS%2311%20Kit%20Trust%20Module
diff --git a/trust/parser.c b/trust/parser.c
index 7b569d9..41513d4 100644
--- a/trust/parser.c
+++ b/trust/parser.c
@@ -502,7 +502,7 @@ parse_openssl_trusted_certificate (p11_parser *parser,
int ret;
/*
- * This OpenSSL format is a wierd. It's just two DER structures
+ * This OpenSSL format is weird. It's just two DER structures
* placed end to end without any wrapping SEQ. So calculate the
* length of the first DER TLV we see and try to parse that as
* the X.509 certificate.