eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some typos found by lintian.

Browse Source
This commit is contained in:
Milan Broz
2023-11-29 09:49:55 +01:00
parent b44c2ce071
commit e1ef5214e7
13 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/integrity/integrity.c
View File

@@ -418,7 +418,7 @@ int INTEGRITY_format(struct crypt_device *cd,
return -EINVAL;
/*
* Creates reduced dm-linear maping over data device starting at
* Creates reduced dm-linear mapping over data device starting at
* crypt_data_offset(cd) and backing_device_sectors in size.
*/
r = _create_reduced_device(cd, reduced_device_name,

6
lib/libcryptsetup.h
View File

@@ -1184,7 +1184,7 @@ int crypt_keyslot_add_by_volume_key(struct crypt_device *cd,
* @warning CRYPT_VOLUME_KEY_SET flag force updates volume key. It is @b not @b reencryption!
* By doing so you will most probably destroy your ciphertext data device. It's supposed
* to be used only in wrapped keys scheme for key refresh process where real (inner) volume
* key stays untouched. It may be involed on active @e keyslot which makes the (previously
* key stays untouched. It may be involved on active @e keyslot which makes the (previously
* unbound) keyslot new regular keyslot.
*/
int crypt_keyslot_add_by_key(struct crypt_device *cd,
@@ -1429,7 +1429,7 @@ int crypt_keyslot_context_get_type(const struct crypt_keyslot_context *kc);
* @warning CRYPT_VOLUME_KEY_SET flag force updates volume key. It is @b not @b reencryption!
* By doing so you will most probably destroy your ciphertext data device. It's supposed
* to be used only in wrapped keys scheme for key refresh process where real (inner) volume
* key stays untouched. It may be involed on active @e keyslot which makes the (previously
* key stays untouched. It may be involved on active @e keyslot which makes the (previously
* unbound) keyslot new regular keyslot.
*/
int crypt_keyslot_add_by_keyslot_context(struct crypt_device *cd,
@@ -2770,7 +2770,7 @@ const char *crypt_token_external_path(void);
/**
* Override configured external token handlers path for the library.
*
* @param path Abosulte path (starts with '/') to new external token handlers directory or @e NULL.
* @param path Absolute path (starts with '/') to new external token handlers directory or @e NULL.
*
* @note if @e path is @e NULL the external token path is reset to default path.
*

2
lib/libdevmapper.c
View File

@@ -1334,7 +1334,7 @@ static int _dm_create_device(struct crypt_device *cd, const char *name, const ch
r = -dm_task_get_errno(dmt);
if (r == -ENOKEY || r == -EKEYREVOKED || r == -EKEYEXPIRED) {
/* propagate DM errors around key managament as such */
/* propagate DM errors around key management as such */
r = -ENOKEY;
goto out;
}

2
lib/luks2/luks2_token.c
View File

@@ -678,7 +678,7 @@ static int LUKS2_keyslot_open_by_token(struct crypt_device *cd,
if (!jobj_token_keyslots)
return -EINVAL;
/* with specific keyslot just ingore priorities and unlock */
/* with specific keyslot just ignore priorities and unlock */
if (keyslot != CRYPT_ANY_SLOT) {
log_dbg(cd, "Trying to open keyslot %u with token %d (type %s).",
keyslot, token, json_object_get_string(jobj_type));

2
lib/setup.c
View File

@@ -2295,7 +2295,7 @@ static int opal_topology_alignment(struct crypt_device *cd,
else
*ret_alignment_bytes = size_round_up(default_alignment_bytes, opal_block_bytes * opal_alignment_granularity_blocks);
/* data offset is not set, calculate proper aligment */
/* data offset is not set, calculate proper alignment */
*ret_alignment_offset_bytes = (partition_offset_sectors * SECTOR_SIZE) % (opal_block_bytes * opal_alignment_granularity_blocks);
if (*ret_alignment_offset_bytes)
*ret_alignment_offset_bytes = opal_block_bytes * opal_alignment_granularity_blocks - *ret_alignment_offset_bytes;

2
lib/utils_dm.h
View File

@@ -72,7 +72,7 @@ static inline uint32_t act2dmflags(uint32_t act_flags)
#define DM_INTEGRITY_DISCARDS_SUPPORTED (1 << 23) /* dm-integrity discards/TRIM option is supported */
#define DM_INTEGRITY_RESIZE_SUPPORTED (1 << 23) /* dm-integrity resize of the integrity device supported (introduced in the same version as discards)*/
#define DM_VERITY_PANIC_CORRUPTION_SUPPORTED (1 << 24) /* dm-verity panic on corruption */
#define DM_CRYPT_NO_WORKQUEUE_SUPPORTED (1 << 25) /* dm-crypt suppot for bypassing workqueues */
#define DM_CRYPT_NO_WORKQUEUE_SUPPORTED (1 << 25) /* dm-crypt support for bypassing workqueues */
#define DM_INTEGRITY_FIX_HMAC_SUPPORTED (1 << 26) /* hmac covers also superblock */
#define DM_INTEGRITY_RESET_RECALC_SUPPORTED (1 << 27) /* dm-integrity automatic recalculation supported */
#define DM_VERITY_TASKLETS_SUPPORTED (1 << 28) /* dm-verity tasklets supported */

6
man/common_options.adoc
View File

@@ -843,10 +843,10 @@ endif::[]
ifdef::ACTION_OPEN,ACTION_LUKSRESUME[]
*--link-vk-to-keyring* _<keyring_description>::<key_description>_::
Link volume key in a keyring with specified key name. The volume key is linked only
if requested action is successfuly finished.
if requested action is successfully finished.
+
_<keyring_description>_ string has to contain existing kernel keyring
description. The keyring name may be optionaly prefixed with "%:" or "%keyring:" type descriptions.
description. The keyring name may be optionally prefixed with "%:" or "%keyring:" type descriptions.
Or, the keyring may also be specified directly by numeric key id. Also special keyring notations
starting with "@" may be used to select existing predefined kernel keyrings.
+
@@ -871,7 +871,7 @@ endif::[]
ifdef::ACTION_OPEN,ACTION_RESIZE,ACTION_LUKSRESUME,ACTION_TOKEN,ACTION_LUKSADDKEY[]
*--token-id*::
ifndef::ACTION_TOKEN,ACTION_LUKSADDKEY[]
Specify what token to use and allow token PIN prompt to take precedence over interative
Specify what token to use and allow token PIN prompt to take precedence over interactive
keyslot passphrase prompt. If omitted, all available tokens (not protected by PIN)
will be checked before proceeding further with passphrase prompt.
endif::[]

2
man/cryptsetup-luksChangeKey.8.adoc
View File

@@ -31,7 +31,7 @@ overwritten directly.
*WARNING:* If a key-slot is overwritten, a media failure during this
operation can cause the overwrite to fail after the old passphrase has
been wiped and make the LUKS container inaccessible. LUKS2 mitigates
that by never overwritting existing keyslot area as long as there's
that by never overwriting existing keyslot area as long as there's
a free space in keyslots area at least for one more LUKS2 keyslot.
*NOTE:* some parameters are effective only if used with LUKS2 format

2
meson.build
View File

@@ -85,7 +85,7 @@ if enable_static == true
if not sanitizer_enabled
link_args += '--static'
else
warning('Turning off statically linked binaries as they are not compatible with sanitizer build. Will keep prefering static external dependencies.')
warning('Turning off statically linked binaries as they are not compatible with sanitizer build. Will keep preferring static external dependencies.')
endif
endif

4
tests/api-test-2.c
View File

@@ -2311,7 +2311,7 @@ static void Tokens(void)
/* keyslots:
*
* 0 ingore (token 0)
* 0 ignore (token 0)
* 1 normal (token 0)
* 2 prefer -
* 3 ignore -
@@ -5290,7 +5290,7 @@ static void KeyslotContextAndKeyringLink(void)
OK_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, PASSPHRASE, strlen(PASSPHRASE), 0));
/*
* Otherwise will wil not be able to search the TEST_KEYRING_USER in current context (see request_key(2):
* Otherwise we will not be able to search the TEST_KEYRING_USER in current context (see request_key(2):
* "The keyrings are searched in the order: thread-specific keyring, process-specific keyring, and then session keyring."
*/
NOTFAIL_(keyctl_link(keyring_in_user_id, KEY_SPEC_THREAD_KEYRING), "Failed to link in thread keyring.");

2
tests/api_test.h
View File

@@ -138,7 +138,7 @@ void xlog(const char *msg, const char *tst, const char *func, int line, const ch
#define T_DM_INTEGRITY_DISCARDS_SUPPORTED (1 << 23) /* dm-integrity discards/TRIM option is supported */
#define T_DM_INTEGRITY_RESIZE_SUPPORTED (1 << 23) /* dm-integrity resize of the integrity device supported (introduced in the same version as discards)*/
#define T_DM_VERITY_PANIC_CORRUPTION_SUPPORTED (1 << 24) /* dm-verity panic on corruption */
#define T_DM_CRYPT_NO_WORKQUEUE_SUPPORTED (1 << 25) /* dm-crypt suppot for bypassing workqueues */
#define T_DM_CRYPT_NO_WORKQUEUE_SUPPORTED (1 << 25) /* dm-crypt support for bypassing workqueues */
#define T_DM_INTEGRITY_FIX_HMAC_SUPPORTED (1 << 26) /* hmac covers also superblock */
#define T_DM_INTEGRITY_RESET_RECALC_SUPPORTED (1 << 27) /* dm-integrity automatic recalculation supported */
#define T_DM_VERITY_TASKLETS_SUPPORTED (1 << 28) /* dm-verity tasklets supported */

2
tests/fuzz/LUKS2.proto
View File

@@ -229,7 +229,7 @@ enum keyslot_af_type {
KEYSLOT_AF_TYPE_LUKS1 = 1;
}
// The af (anti-forensic splitter) object contains this madatory field:
// The af (anti-forensic splitter) object contains this mandatory field:
// - type [string] the anti-forensic function type.
// AF type luks1 (compatible with LUKS1 [1]) contains these additional fields:
// - stripes [integer] the number of stripes, for historical reasons only the 4000 value is supported.

2
tests/fuzz/crypt2_load_fuzz.cc
View File

@@ -95,7 +95,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
if (write_buffer(fd, data + modified_data_size, size - modified_data_size) != (ssize_t)size)
goto out;
/* Actuall fuzzing */
/* Actual fuzzing */
if (crypt_init(&cd, name) == 0)
(void)crypt_load(cd, CRYPT_LUKS2, NULL);
crypt_free(cd);