aboutsummaryrefslogtreecommitdiff
path: root/cli-tests/t_encrypt_login.out
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2021-09-14 14:12:39 -0700
committerEric Biggers <ebiggers3@gmail.com>2021-10-05 15:30:30 -0700
commit7fed63a84963cbd790e86a0e59ff14724bcf33c4 (patch)
tree246e2f723ba3cd7ed3a76e4b8698b1913edabc11 /cli-tests/t_encrypt_login.out
parent4d20c7b6eda7f4e9f25442e0ec48bdf5f959853b (diff)
Adjust recovery passphrase generation
As per the feedback at https://github.com/google/fscrypt/issues/115 where users didn't understand that the recovery passphrase is important, restore the original behavior where recovery passphrase generation happens automatically without a prompt. This applies to the case where 'fscrypt encrypt' is using a login protector on a non-root filesystem. However, leave the --no-recovery option so that the recovery passphrase can still be disabled if the user really wants to. Also, clarify the information provided about the recovery passphrase. Update https://github.com/google/fscrypt/issues/115
Diffstat (limited to 'cli-tests/t_encrypt_login.out')
-rw-r--r--cli-tests/t_encrypt_login.out25
1 files changed, 21 insertions, 4 deletions
diff --git a/cli-tests/t_encrypt_login.out b/cli-tests/t_encrypt_login.out
index 0d77799..c531f73 100644
--- a/cli-tests/t_encrypt_login.out
+++ b/cli-tests/t_encrypt_login.out
@@ -1,6 +1,12 @@
# Encrypt with login protector
-See "MNT/dir/fscrypt_recovery_readme.txt" for important recovery instructions!
+
+IMPORTANT: See "MNT/dir/fscrypt_recovery_readme.txt" for
+ important recovery instructions. It is *strongly recommended* to
+ record the recovery passphrase in a secure location; otherwise you
+ will lose access to this directory if you reinstall the operating
+ system or move this filesystem to another system.
+
ext4 filesystem "MNT" has 2 protectors and 1 policy
PROTECTOR LINKED DESCRIPTION
@@ -43,8 +49,13 @@ IMPORTANT: Before continuing, ensure you have properly set up your system for
https://github.com/google/fscrypt#setting-up-for-login-protectors
Enter login passphrase for fscrypt-test-user:
-Protector is on a different filesystem! Generate a recovery passphrase (recommended)? [Y/n] y
-See "MNT/dir/fscrypt_recovery_readme.txt" for important recovery instructions!
+
+IMPORTANT: See "MNT/dir/fscrypt_recovery_readme.txt" for
+ important recovery instructions. It is *strongly recommended* to
+ record the recovery passphrase in a secure location; otherwise you
+ will lose access to this directory if you reinstall the operating
+ system or move this filesystem to another system.
+
"MNT/dir" is now encrypted, unlocked, and ready for use.
ext4 filesystem "MNT" has 2 protectors and 1 policy
@@ -70,7 +81,13 @@ desc10 Yes (MNT_ROOT) login protector for fscrypt-test-user
desc11 No custom protector "Recovery passphrase for dir"
# Encrypt with login protector as root
-See "MNT/dir/fscrypt_recovery_readme.txt" for important recovery instructions!
+
+IMPORTANT: See "MNT/dir/fscrypt_recovery_readme.txt" for
+ important recovery instructions. It is *strongly recommended* to
+ record the recovery passphrase in a secure location; otherwise you
+ will lose access to this directory if you reinstall the operating
+ system or move this filesystem to another system.
+
ext4 filesystem "MNT" has 2 protectors and 1 policy
PROTECTOR LINKED DESCRIPTION