diff --git a/FAQ b/FAQ index ce9c6329..0d5cfa89 100644 --- a/FAQ +++ b/FAQ @@ -976,7 +976,7 @@ A. Contributors 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 in the cryptsetup distribution from version 1.6.0 + automates this 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 a libcryptsetup from cryptsetup 1.6.0 or diff --git a/docs/ChangeLog.old b/docs/ChangeLog.old index 93d70adf..7a4027c4 100644 --- a/docs/ChangeLog.old +++ b/docs/ChangeLog.old @@ -195,7 +195,7 @@ 2011-03-05 Milan Broz * Add exception to COPYING for binary distribution linked with OpenSSL library. - * Set secure data flag (wipe all ioclt buffers) if devmapper library supports it. + * Set secure data flag (wipe all ioctl buffers) if devmapper library supports it. 2011-01-29 Milan Broz * Fix mapping removal if device disappeared but node still exists. @@ -636,7 +636,7 @@ 2006-03-15 Clemens Fruhwirth - * configure.in: 1.0.3-rc3. Most unplease release ever. + * configure.in: 1.0.3-rc3. Most displease release ever. * lib/setup.c (__crypt_create_device): More verbose error message. 2006-02-26 Clemens Fruhwirth diff --git a/lib/libcryptsetup.h b/lib/libcryptsetup.h index c897961d..364ec3c5 100644 --- a/lib/libcryptsetup.h +++ b/lib/libcryptsetup.h @@ -165,7 +165,7 @@ int crypt_set_data_device(struct crypt_device *cd, const char *device); * @returns 0 on success or negative errno value otherwise. * * @note Data offset must be aligned to multiple of 8 (alignment to 4096-byte sectors) - * and must be big enough to accomodate the whole LUKS header with all keyslots. + * and must be big enough to accommodate the whole LUKS header with all keyslots. * @note Data offset is enforced by this function, device topology * information is no longer used after calling this function. */ diff --git a/man/cryptsetup.8 b/man/cryptsetup.8 index b5a1cfff..3c5b93a6 100644 --- a/man/cryptsetup.8 +++ b/man/cryptsetup.8 @@ -155,7 +155,7 @@ with default setting (respective to device type). underlying dm-integrity device. Adding option \-\-persistent stores any combination of device parameters -above in LUKS2 metadata (only after succesfull refresh operation). +above in LUKS2 metadata (only after successful refresh operation). \-\-disable\-keyring parameter refreshes a device with volume key passed in dm-crypt driver. diff --git a/man/integritysetup.8 b/man/integritysetup.8 index b79796af..5b40b845 100644 --- a/man/integritysetup.8 +++ b/man/integritysetup.8 @@ -81,7 +81,7 @@ The number of interleaved sectors. .B "\-\-integrity\-recalculate" Automatically recalculate integrity tags in kernel on activation. The device can be used during automatic integrity recalculation but becomes fully -integrity protected only after the backgroud operation is finished. +integrity protected only after the background operation is finished. This option is available since the Linux kernel version 4.19. .TP .B "\-\-journal\-watermark PERCENT" diff --git a/src/cryptsetup.c b/src/cryptsetup.c index 15c60297..111a8971 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -2839,7 +2839,7 @@ int main(int argc, const char **argv) poptGetInvocationName(popt_context)); if (opt_align_payload && opt_offset) - usage(popt_context, EXIT_FAILURE, _("Option --align-payload and --offset cannot be combined."), + usage(popt_context, EXIT_FAILURE, _("Options --align-payload and --offset cannot be combined."), poptGetInvocationName(popt_context)); if (opt_skip && (strcmp(aname, "open") || diff --git a/tests/blockwise-compat b/tests/blockwise-compat index 37ea9add..c9b08b7a 100755 --- a/tests/blockwise-compat +++ b/tests/blockwise-compat @@ -231,7 +231,7 @@ run_all() { RUN "P" $1 read_lseek_blockwise $((2*BSIZE)) $BSIZE $((BSIZE+1)) RUN "P" $1 read_lseek_blockwise $((3*BSIZE-2)) $BSIZE $((BSIZE+1)) - # hiting exaclty the sector boundary + # hiting exactly the sector boundary RUN "P" $1 read_lseek_blockwise $((BSIZE-1)) $BSIZE 1 RUN "P" $1 read_lseek_blockwise $((BSIZE-1)) $BSIZE $((BSIZE+1)) RUN "P" $1 read_lseek_blockwise $((BSIZE+1)) $BSIZE $((BSIZE-1)) @@ -285,7 +285,7 @@ run_all() { RUN "P" $1 write_lseek_blockwise $((2*BSIZE)) $BSIZE $((BSIZE+1)) RUN "P" $1 write_lseek_blockwise $((3*BSIZE-2)) $BSIZE $((BSIZE+1)) - # hiting exaclty the sector boundary + # hiting exactly the sector boundary RUN "P" $1 write_lseek_blockwise $((BSIZE-1)) $BSIZE 1 RUN "P" $1 write_lseek_blockwise $((BSIZE-1)) $BSIZE $((BSIZE+1)) RUN "P" $1 write_lseek_blockwise $((BSIZE+1)) $BSIZE $((BSIZE-1)) diff --git a/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh index 62d0fb80..ca6b0c8a 100755 --- a/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh @@ -6,7 +6,7 @@ # *** Description *** # # generate secondary header with one of allowed json area -# size values. Test wheter auto-recovery code is able +# size values. Test whether auto-recovery code is able # to validate secondary header with non-default json area # size. # diff --git a/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh index 30a41a5d..14a66137 100755 --- a/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh @@ -6,7 +6,7 @@ # *** Description *** # # generate secondary header with one of allowed json area -# size values. Test wheter auto-recovery code is able +# size values. Test whether auto-recovery code is able # to validate secondary header with non-default json area # size. # diff --git a/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh index fb9a99a7..fdcd7154 100755 --- a/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh @@ -6,7 +6,7 @@ # *** Description *** # # generate secondary header with one of allowed json area -# size values. Test wheter auto-recovery code is able +# size values. Test whether auto-recovery code is able # to validate secondary header with non-default json area # size. # diff --git a/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh index 9ca9a65c..0ed66e1e 100755 --- a/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh @@ -6,7 +6,7 @@ # *** Description *** # # generate secondary header with one of allowed json area -# size values. Test wheter auto-recovery code is able +# size values. Test whether auto-recovery code is able # to validate secondary header with non-default json area # size. # diff --git a/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh index 2d819a35..af18f434 100755 --- a/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh @@ -6,7 +6,7 @@ # *** Description *** # # generate secondary header with one of allowed json area -# size values. Test wheter auto-recovery code is able +# size values. Test whether auto-recovery code is able # to validate secondary header with non-default json area # size. # diff --git a/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh index 015c69bb..581dea03 100755 --- a/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh @@ -6,7 +6,7 @@ # *** Description *** # # generate secondary header with one of allowed json area -# size values. Test wheter auto-recovery code is able +# size values. Test whether auto-recovery code is able # to validate secondary header with non-default json area # size. # diff --git a/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh index 39b48de0..1b246cc5 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh @@ -6,7 +6,7 @@ # *** Description *** # # generate secondary header with one of allowed json area -# size values. Test wheter auto-recovery code is able +# size values. Test whether auto-recovery code is able # to validate secondary header with non-default json area # size. #