From 60020992884ea39deb412ecf09b0d41211be01ed Mon Sep 17 00:00:00 2001 From: Bernhard Kirchen Date: Fri, 6 Apr 2018 13:47:52 +0200 Subject: [PATCH] tcryptDump: fix support for --veracrypt-pim the user provided PIM value was not forwarded to the respective implementation dumping the VeraCrypt header information. extends the tcrypt-compat-test such that tcryptDump is performed on VeraCrypt containers as well. --- src/cryptsetup.c | 1 + tests/tcrypt-compat-test | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cryptsetup.c b/src/cryptsetup.c index 83de75ab..660c438d 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -446,6 +446,7 @@ static int action_tcryptDump(void) .keyfiles_count = opt_keyfiles_count, .flags = CRYPT_TCRYPT_LEGACY_MODES | (opt_veracrypt ? CRYPT_TCRYPT_VERA_MODES : 0), + .veracrypt_pim = (opt_veracrypt_pim > 0) ? opt_veracrypt_pim : 0, }; int r; diff --git a/tests/tcrypt-compat-test b/tests/tcrypt-compat-test index 3643925f..a6481b97 100755 --- a/tests/tcrypt-compat-test +++ b/tests/tcrypt-compat-test @@ -73,9 +73,11 @@ export LANG=C [ ! -d $TST_DIR ] && tar xjf $srcdir/tcrypt-images.tar.bz2 --no-same-owner echo "HEADER CHECK" -for file in $(ls $TST_DIR/[tv]c_*) ; do +for file in $(ls $TST_DIR/[t]c_* $TST_DIR/vcpim_*) ; do echo -n " $file" - echo $PASSWORD | $CRYPTSETUP tcryptDump --veracrypt $file >/dev/null || fail + PIM_OPT="" + [[ $file =~ vcpim.* ]] && PIM_OPT="--veracrypt-pim $PIM" + echo $PASSWORD | $CRYPTSETUP tcryptDump --veracrypt $PIM_OPT $file >/dev/null || fail echo " [OK]" done