From 5c1f617c647eb0e9af5ce57758fa58f7e3f4db83 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 13 Jun 2020 10:06:15 -0700 Subject: cmd/fscrypt: adjust status message for v1-encrypted dirs When 'fscrypt status DIR' detects that a v1-encrypted directory is still usable but its key seems to be absent, it shows the status as "Unlocked: Partially (incompletely locked)". But actually it can also be the case that the directory is unlocked by another user. Adjust the status message accordingly. This commit also fixes cli-tests/t_v1_policy. --- cli-tests/t_v1_policy.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cli-tests/t_v1_policy.out') diff --git a/cli-tests/t_v1_policy.out b/cli-tests/t_v1_policy.out index b47bcca..9adb00a 100644 --- a/cli-tests/t_v1_policy.out +++ b/cli-tests/t_v1_policy.out @@ -42,7 +42,7 @@ desc2 No custom protector "prot" Policy: desc1 Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 -Unlocked: Yes +Unlocked: Partially (incompletely locked, or unlocked by another user) Protected with 1 protector: PROTECTOR LINKED DESCRIPTION @@ -115,7 +115,7 @@ Then re-run: Policy: desc1 Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 -Unlocked: Partially (incompletely locked) +Unlocked: Partially (incompletely locked, or unlocked by another user) Protected with 1 protector: PROTECTOR LINKED DESCRIPTION -- cgit v1.3