mirror of
https://gitlab.com/cryptsetup/cryptsetup.git
synced 2025-12-05 16:00:05 +01:00
Fix typos.
Typos found with codespell.
This commit is contained in:
6
FAQ
6
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.
|
||||
|
||||
@@ -1132,14 +1132,14 @@ int BITLK_get_volume_key(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;
|
||||
}
|
||||
|
||||
@@ -1496,11 +1496,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);
|
||||
@@ -1510,7 +1510,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);
|
||||
@@ -2364,7 +2364,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
|
||||
* @param usrptr progress specific data
|
||||
*
|
||||
|
||||
@@ -2893,7 +2893,7 @@ static int reencrypt_load_by_passphrase(struct crypt_device *cd,
|
||||
* 1) excl close
|
||||
* 2) rogue dm device activation
|
||||
* 3) one or more dm-crypt based wrapper activation
|
||||
* 4) next excl open get's skipped due to 3) device from 2) remains undetected.
|
||||
* 4) next excl open gets skipped due to 3) device from 2) remains undetected.
|
||||
*/
|
||||
r = reencrypt_init_storage_wrappers(cd, hdr, rh, *vks);
|
||||
if (r)
|
||||
|
||||
@@ -774,7 +774,7 @@ and doesn't require superuser privilege.
|
||||
For unlocking with the \fBopen\fR a password or a recovery passphrase or
|
||||
a startup key must be provided.
|
||||
|
||||
Additionaly unlocking using master key is
|
||||
Additionally unlocking using master key is
|
||||
supported. You must provide BitLocker Full Volume Encryption Key (FVEK)
|
||||
using the \-\-master\-key\-file option. The key must be decrypted and
|
||||
without the header (only 128/256/512 bits of key data depending on used
|
||||
|
||||
@@ -30,7 +30,7 @@ void tools_passphrase_msg(int r)
|
||||
}
|
||||
|
||||
/*
|
||||
* Only tool that currently blocks signals explicitely is cryptsetup-reencrypt.
|
||||
* Only tool that currently blocks signals explicitly is cryptsetup-reencrypt.
|
||||
* Leave the tools_get_key stub with signals handling here and remove it later
|
||||
* only if we find signals blocking obsolete.
|
||||
*/
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user