Commit 71dd149c authored by Ondrej Kozina's avatar Ondrej Kozina Committed by Milan Broz

Fix data alignment calculations with custom encryption sector size.

parent b30ba41d
......@@ -936,7 +936,7 @@ static int action_luksFormat(void)
.data_device = opt_header_device ? action_argv[0] : NULL,
};
struct crypt_params_luks2 params2 = {
.data_alignment = params1.data_alignment,
.data_alignment = params1.data_alignment / (opt_sector_size >> 9),
.data_device = params1.data_device,
.sector_size = opt_sector_size,
.label = opt_label,
......@@ -2651,6 +2651,12 @@ int main(int argc, const char **argv)
_("Unsupported encryption sector size.\n"),
poptGetInvocationName(popt_context));
if (opt_align_payload % (opt_sector_size / SECTOR_SIZE)) {
usage(popt_context, EXIT_FAILURE,
_("Payload alignment (in 512-byte sectors) is not a multiple of requested sector size.\n"),
poptGetInvocationName(popt_context));
}
if (opt_unbound && !opt_key_size)
usage(popt_context, EXIT_FAILURE,
_("Key size is required with --unbound option.\n"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment