diff --git a/FAQ b/FAQ index 82e8f4ab..3c7dcadb 100644 --- a/FAQ +++ b/FAQ @@ -51,7 +51,7 @@ A. Contributors security model BEFORE you face such a disaster! In particular, make sure you have a current header backup before doing any potentially dangerous operations. The LUKS2 header should be a bit more resilient - as critical data starts later and is stored twice, but you can decidely + as critical data starts later and is stored twice, but you can decidedly still destroy it or a keyslot permanently by accident. DEBUG COMMANDS: While the --debug and --debug-json options should not @@ -973,7 +973,7 @@ A. Contributors that is intact. In order to find out whether a key-slot is damaged one has to look for - "non-random looking" data in it. There is a tool that automatizes this + "non-random looking" data in it. There is a tool that automates this for LUKS1 in the cryptsetup distribution from version 1.6.0 onwards. It is located in misc/keyslot_checker/. Instructions how to use and how to interpret results are in the README file. Note that this tool requires @@ -2632,7 +2632,7 @@ offset length name data type description safe under these circumstances, then you have bigger problems than this somewhat expected behavior. - The CVE was exagerrated and should not be assigned to upstream + The CVE was exaggerated and should not be assigned to upstream cryptsetup in the first place (it is a distro specific initrd issue). It was driven more by a try to make a splash for self-aggrandizement, than by any actual security concerns. Ignore it. diff --git a/lib/bitlk/bitlk.c b/lib/bitlk/bitlk.c index 3da57214..c054d92b 100644 --- a/lib/bitlk/bitlk.c +++ b/lib/bitlk/bitlk.c @@ -1160,14 +1160,14 @@ int BITLK_activate(struct crypt_device *cd, if (next_vmk->protection == BITLK_PROTECTION_PASSPHRASE) { r = bitlk_kdf(cd, password, passwordLen, false, next_vmk->salt, &vmk_dec_key); if (r) { - /* something wrong happend, but we still want to check other key slots */ + /* something wrong happened, but we still want to check other key slots */ next_vmk = next_vmk->next; continue; } } else if (next_vmk->protection == BITLK_PROTECTION_RECOVERY_PASSPHRASE) { r = get_recovery_key(cd, password, passwordLen, &recovery_key); if (r) { - /* something wrong happend, but we still want to check other key slots */ + /* something wrong happened, but we still want to check other key slots */ next_vmk = next_vmk->next; continue; } diff --git a/lib/libcryptsetup.h b/lib/libcryptsetup.h index 1d7bb324..0e8c07b6 100644 --- a/lib/libcryptsetup.h +++ b/lib/libcryptsetup.h @@ -1485,11 +1485,11 @@ const char *crypt_get_cipher_mode(struct crypt_device *cd); const char *crypt_get_uuid(struct crypt_device *cd); /** - * Get path to underlaying device. + * Get path to underlying device. * * @param cd crypt device handle * - * @return path to underlaying device name + * @return path to underlying device name * */ const char *crypt_get_device_name(struct crypt_device *cd); @@ -1499,7 +1499,7 @@ const char *crypt_get_device_name(struct crypt_device *cd); * * @param cd crypt device handle * - * @return path to underlaying device name + * @return path to underlying device name * */ const char *crypt_get_metadata_device_name(struct crypt_device *cd); @@ -2295,7 +2295,7 @@ int crypt_reencrypt_init_by_keyring(struct crypt_device *cd, * Run data reencryption. * * @param cd crypt device handle - * @param progress is a callback funtion reporting device \b size, + * @param progress is a callback function reporting device \b size, * current \b offset of reencryption and provided \b usrptr identification * * @return @e 0 on success or negative errno value otherwise. diff --git a/tests/luks2-reencryption-test b/tests/luks2-reencryption-test index df02d8ac..37d6d2c1 100755 --- a/tests/luks2-reencryption-test +++ b/tests/luks2-reencryption-test @@ -275,7 +275,7 @@ function prepare_linear_dev() { DEV=/dev/mapper/$OVRDEV } -function get_error_offsets() # $1 devsize, $2 minimal offset, $3 sector_size [512 if ommited], $4 max offset +function get_error_offsets() # $1 devsize, $2 minimal offset, $3 sector_size [512 if omitted], $4 max offset { local _devsize=$(($1*1024*2)) local _sector_size=${3:-512} diff --git a/tests/reencryption-compat-test b/tests/reencryption-compat-test index 263da0d6..6dc85bd5 100755 --- a/tests/reencryption-compat-test +++ b/tests/reencryption-compat-test @@ -352,7 +352,7 @@ echo $PWD1 | $REENC $LOOPDEV1 -q --keep-key $FAST_PBKDF check_hash $PWD1 $HASH1 $CRYPTSETUP --type luks1 luksDump $LOOPDEV1 > /dev/null || fail -echo "[9] Test log I/Os on various underlaying block devices" +echo "[9] Test log I/Os on various underlying block devices" prepare 8192 echo $PWD2 | $CRYPTSETUP -q luksFormat --type luks1 $FAST_PBKDF $LOOPDEV1 || fail add_scsi_device sector_size=512 dev_size_mb=32 diff --git a/tests/reencryption-compat-test2 b/tests/reencryption-compat-test2 index 4ec26fa0..812788a4 100755 --- a/tests/reencryption-compat-test2 +++ b/tests/reencryption-compat-test2 @@ -370,7 +370,7 @@ check_hash $PWD2 $HASH5 check_slot 21 || fail "Only keyslot 21 expected to be enabled" $CRYPTSETUP luksDump $IMG | grep -q "luks2" > /dev/null || fail -echo "[9] Test log I/Os on various underlaying block devices" +echo "[9] Test log I/Os on various underlying block devices" echo $PWD2 | $CRYPTSETUP -q luksFormat --type luks2 $FAST_PBKDF_ARGON $IMG --offset 8192 || fail add_scsi_device sector_size=512 dev_size_mb=32 test_logging "[512 sector]" || fail