X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcryptsetup.c;h=0cc7f0772015894411337b8d283cfd6ccb490e99;hb=911ffe81f04e3da033a429061e17b54fa9214503;hp=5387915b9e22caba6ed48ec37cb89b8c0a7ed9c3;hpb=ecf993834cfdfc3ff9e3584845ffce9a5b967184;p=platform%2Fupstream%2Fcryptsetup.git

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 5387915..0cc7f07 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -265,6 +265,7 @@ static int action_tcryptOpen(int arg __attribute__((unused)))
 	struct crypt_params_tcrypt params = {
 		.keyfiles = opt_keyfiles,
 		.keyfiles_count = opt_keyfiles_count,
+		.flags = CRYPT_TCRYPT_LEGACY_MODES,
 	};
 	const char *activated_name;
 	uint32_t flags = 0;
@@ -293,7 +294,8 @@ static int action_tcryptOpen(int arg __attribute__((unused)))
 	if (opt_readonly)
 		flags |= CRYPT_ACTIVATE_READONLY;
 
-	r = crypt_activate_by_volume_key(cd, activated_name, NULL, 0, flags);
+	if (activated_name)
+		r = crypt_activate_by_volume_key(cd, activated_name, NULL, 0, flags);
 out:
 	crypt_free(cd);
 	crypt_safe_free(CONST_CAST(char*)params.passphrase);
@@ -1362,9 +1364,10 @@ int main(int argc, const char **argv)
 		      poptGetInvocationName(popt_context));
 
 	if (opt_test_passphrase &&
-	   strcmp(aname, "luksOpen"))
+	   strcmp(aname, "luksOpen") &&
+	   strcmp(aname, "tcryptOpen"))
 		usage(popt_context, EXIT_FAILURE,
-		      _("Option --test-passphrase is allowed only for luksOpen.\n"),
+		      _("Option --test-passphrase is allowed only for luksOpen and tcryptOpen.\n"),
 		      poptGetInvocationName(popt_context));
 
 	if (opt_key_size % 8)