summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <dueno@redhat.com>2018-12-29 08:09:50 +0100
committerDaiki Ueno <dueno@redhat.com>2018-12-29 08:09:50 +0100
commit95faa51a23fc416e718dbd740adfce31f642530b (patch)
treea83fd0465c5449041641fcd8ba23af3fc7c1653d
parent4ee6545d0188e495f195b7fe5abbe9cc382a626d (diff)
build: Fix typo spotted by codespell
-rw-r--r--ChangeLog2
-rw-r--r--NEWS8
-rw-r--r--common/pkcs11.h2
-rw-r--r--common/test-lexer.c2
-rw-r--r--doc/manual/Makefile.am2
-rw-r--r--p11-kit/iter.c2
-rw-r--r--p11-kit/modules.c2
-rw-r--r--p11-kit/rpc-message.c6
-rw-r--r--p11-kit/rpc-server.c4
-rw-r--r--p11-kit/test-pin.c2
-rw-r--r--p11-kit/test-virtual.c2
-rw-r--r--trust/test-enumerate.c2
-rw-r--r--trust/test-parser.c2
-rw-r--r--trust/test-token.c4
-rwxr-xr-xtrust/trust-extract-compat.in2
15 files changed, 22 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 0be3835..87c9757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
=== ChangeLog is autogenerated ===
- This project relys on commit messages to provide change history. Please
+ This project relies on commit messages to provide change history. Please
write commit messages in the following format:
=== begin example commit ===
diff --git a/NEWS b/NEWS
index c96a813..aa6dc52 100644
--- a/NEWS
+++ b/NEWS
@@ -140,7 +140,7 @@
0.20.3 (stable)
* Fix problems reinitializing managed modules after fork
- * Fix bad bookeeping when fail initializing one of the modules
+ * Fix bad bookkeeping when fail initializing one of the modules
* Fix case where module would be unloaded while in use [#74919]
* Remove assertions when module used before initialized [#74919]
* Fix handling of mmap failure and mapping empty files [#74773]
@@ -186,7 +186,7 @@
* Port to use CKA_PUBLIC_KEY_INFO and updated trust store spec
* Add option to use freebl for hashing
* Implement reloading of token data
- * Fix warnings and possible minor bugs higlighted by code scanners
+ * Fix warnings and possible minor bugs highlighted by code scanners
* Don't load configs in home directories when running setuid or setgid
* Support treating ~/.config as $XDG_CONFIG_HOME
* Use $XDG_DATA_HOME/pkcs11 as default user config directory
@@ -241,7 +241,7 @@
* Use descriptive labels for the trust module tokens [#62534]
* Remove the temporary built in distrust objects
* Make extracted output directories and files read-only [#61898]
- * Don't export unneccessary ABI
+ * Don't export unnecessary ABI
* Build fixes [#62479]
0.17.2 (unstable)
@@ -249,7 +249,7 @@
* Fix several crashers
0.17.1 (unstable)
- * Support a p11-kit specific PKCS#11 attribute persistance format [#62156]
+ * Support a p11-kit specific PKCS#11 attribute persistence format [#62156]
* Use the SHA1 hash of SPKI as the CKA_ID in the trust module by default [#62329]
* Refactor a trust builder which builds objects out of parsed data [#62329]
* Combine trust policy when extracting certificates [#61497]
diff --git a/common/pkcs11.h b/common/pkcs11.h
index 521c58d..3e36837 100644
--- a/common/pkcs11.h
+++ b/common/pkcs11.h
@@ -859,7 +859,7 @@ typedef unsigned long ck_mechanism_type_t;
#define CKM_VENDOR_DEFINED ((unsigned long) (1UL << 31))
-/* Ammendments */
+/* Amendments */
#define CKM_SHA224 (0x255UL)
#define CKM_SHA224_HMAC (0x256UL)
#define CKM_SHA224_HMAC_GENERAL (0x257UL)
diff --git a/common/test-lexer.c b/common/test-lexer.c
index 7d18e87..e4480fd 100644
--- a/common/test-lexer.c
+++ b/common/test-lexer.c
@@ -96,7 +96,7 @@ check_lex_msg (const char *file,
}
break;
case TOK_EOF:
- p11_test_fail (file, line, function, "eof should not be recieved");
+ p11_test_fail (file, line, function, "eof should not be received");
break;
}
}
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 8bee2f8..0ebe958 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -94,7 +94,7 @@ content_files=p11-kit-config.xml p11-kit-sharing.xml \
annotation-glossary.xml \
$(NULL)
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+# SGML files where gtk-doc abbreviations (#GtkWidget) are expanded
# These files must be listed here *and* in content_files
# e.g. expand_content_files=running.sgml
expand_content_files= $(generate_files)
diff --git a/p11-kit/iter.c b/p11-kit/iter.c
index d1ffd91..d26cd71 100644
--- a/p11-kit/iter.c
+++ b/p11-kit/iter.c
@@ -830,7 +830,7 @@ p11_kit_iter_get_token (P11KitIter *iter)
* p11_kit_iter_get_session:
* @iter: the iterator
*
- * Get the session which the current matching object is acessible
+ * Get the session which the current matching object is accessible
* through.
*
* This can only be called after p11_kit_iter_next() succeeds.
diff --git a/p11-kit/modules.c b/p11-kit/modules.c
index 4604e6e..cfc4daf 100644
--- a/p11-kit/modules.c
+++ b/p11-kit/modules.c
@@ -593,7 +593,7 @@ take_config_and_load_module_inlock (char **name,
*/
mod->init_args.pReserved = p11_dict_get (*config, "x-init-reserved");
- /* Take ownership of thes evariables */
+ /* Take ownership of these variables */
p11_dict_free (mod->config);
mod->config = *config;
*config = NULL;
diff --git a/p11-kit/rpc-message.c b/p11-kit/rpc-message.c
index bccfd2a..ff48f1d 100644
--- a/p11-kit/rpc-message.c
+++ b/p11-kit/rpc-message.c
@@ -235,7 +235,7 @@ p11_rpc_message_write_attribute_buffer (p11_rpc_message *msg,
assert (msg != NULL);
assert (msg->output != NULL);
- /* Make sure this is in the rigth order */
+ /* Make sure this is in the right order */
assert (!msg->signature || p11_rpc_message_verify_part (msg, "fA"));
/* Write the number of items */
@@ -265,7 +265,7 @@ p11_rpc_message_write_attribute_array (p11_rpc_message *msg,
assert (msg != NULL);
assert (msg->output != NULL);
- /* Make sure this is in the rigth order */
+ /* Make sure this is in the right order */
assert (!msg->signature || p11_rpc_message_verify_part (msg, "aA"));
/* Write the number of items */
@@ -328,7 +328,7 @@ p11_rpc_message_write_ulong (p11_rpc_message *msg,
assert (msg != NULL);
assert (msg->output != NULL);
- /* Make sure this is in the rigth order */
+ /* Make sure this is in the right order */
assert (!msg->signature || p11_rpc_message_verify_part (msg, "u"));
p11_rpc_buffer_add_uint64 (msg->output, val);
return !p11_buffer_failed (msg->output);
diff --git a/p11-kit/rpc-server.c b/p11-kit/rpc-server.c
index 3216742..846ee94 100644
--- a/p11-kit/rpc-server.c
+++ b/p11-kit/rpc-server.c
@@ -238,7 +238,7 @@ proto_read_attribute_buffer (p11_rpc_message *msg,
assert (n_result != NULL);
assert (msg->input != NULL);
- /* Make sure this is in the rigth order */
+ /* Make sure this is in the right order */
assert (!msg->signature || p11_rpc_message_verify_part (msg, "fA"));
/* Read the number of attributes */
@@ -292,7 +292,7 @@ proto_read_attribute_array (p11_rpc_message *msg,
assert (n_result != NULL);
assert (msg->input != NULL);
- /* Make sure this is in the rigth order */
+ /* Make sure this is in the right order */
assert (!msg->signature || p11_rpc_message_verify_part (msg, "aA"));
/* Read the number of attributes */
diff --git a/p11-kit/test-pin.c b/p11-kit/test-pin.c
index 27e20c8..a63bb45 100644
--- a/p11-kit/test-pin.c
+++ b/p11-kit/test-pin.c
@@ -243,7 +243,7 @@ test_pin_file (void)
assert (memcmp (ptr, "yogabbagabba", length) == 0);
p11_kit_pin_unref (pin);
- pin = p11_kit_pin_request (SRCDIR "/p11-kit/fixtures/nonexistant", uri, "The token",
+ pin = p11_kit_pin_request (SRCDIR "/p11-kit/fixtures/nonexistent", uri, "The token",
P11_KIT_PIN_FLAGS_USER_LOGIN);
assert_ptr_eq (NULL, pin);
diff --git a/p11-kit/test-virtual.c b/p11-kit/test-virtual.c
index fd9eba9..2b83720 100644
--- a/p11-kit/test-virtual.c
+++ b/p11-kit/test-virtual.c
@@ -124,7 +124,7 @@ test_fall_through (void)
rv = (module->C_Initialize) ("initialize-arg");
assert_num_eq (CKR_NEED_TO_CREATE_THREADS, rv);
- /* All other functiosn should have just fallen through */
+ /* All other functions should have just fallen through */
assert_ptr_eq (mock_module_no_slots.C_Finalize, module->C_Finalize);
p11_virtual_unwrap (module);
diff --git a/trust/test-enumerate.c b/trust/test-enumerate.c
index 0ac3a33..d82863f 100644
--- a/trust/test-enumerate.c
+++ b/trust/test-enumerate.c
@@ -293,7 +293,7 @@ test_info_limit_purposes (void)
mock_module_add_object (MOCK_SLOT_ONE_ID, cacert3_trusted);
mock_module_add_object (MOCK_SLOT_ONE_ID, extension_eku_server_client);
- /* This should not match the above, with the attached certificat ext */
+ /* This should not match the above, with the attached certificate ext */
assert_ptr_eq (NULL, test.ex.limit_to_purposes);
p11_enumerate_opt_purpose (&test.ex, "1.1.1");
assert_ptr_not_null (test.ex.limit_to_purposes);
diff --git a/trust/test-parser.c b/trust/test-parser.c
index b5c2525..8b9c240 100644
--- a/trust/test-parser.c
+++ b/trust/test-parser.c
@@ -503,7 +503,7 @@ test_parse_invalid_file (void)
p11_message_quiet ();
p11_parser_formats (test.parser, p11_parser_format_x509, NULL);
- ret = p11_parse_file (test.parser, "/nonexistant", NULL,
+ ret = p11_parse_file (test.parser, "/nonexistent", NULL,
P11_PARSE_FLAG_NONE);
assert_num_eq (P11_PARSE_FAILURE, ret);
diff --git a/trust/test-token.c b/trust/test-token.c
index b2f2323..a082ab7 100644
--- a/trust/test-token.c
+++ b/trust/test-token.c
@@ -129,7 +129,7 @@ test_token_flags (void *path)
/*
* blacklist2 comes from the input/blacklist/self-server.der file. It is
- * explicitly put on the blacklist, even though it containts no trust
+ * explicitly put on the blacklist, even though it contains no trust
* policy information.
*/
@@ -151,7 +151,7 @@ test_token_flags (void *path)
/*
* anchor comes from the input/anchors/cacert3.der file. It is
- * explicitly marked as an anchor, even though it containts no trust
+ * explicitly marked as an anchor, even though it contains no trust
* policy information.
*/
diff --git a/trust/trust-extract-compat.in b/trust/trust-extract-compat.in
index 9b46055..b1b7a08 100755
--- a/trust/trust-extract-compat.in
+++ b/trust/trust-extract-compat.in
@@ -4,7 +4,7 @@
# has been customized for distribution. It should be symlinked linked to the
# distribution's update-ca-certificates or update-ca-trust command as
# appropriate. In the future this script will be called when the PKCS#11
-# trust module is used to modifiy trust anchors and related data.
+# trust module is used to modify trust anchors and related data.
if [ $# -ne 0 ]; then
echo "usage: trust extract-compat" >&2