From 7fed63a84963cbd790e86a0e59ff14724bcf33c4 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 14 Sep 2021 14:12:39 -0700 Subject: 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 --- actions/recovery_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actions/recovery_test.go') diff --git a/actions/recovery_test.go b/actions/recovery_test.go index 4332972..5abd0a9 100644 --- a/actions/recovery_test.go +++ b/actions/recovery_test.go @@ -67,7 +67,8 @@ func TestRecoveryPassphrase(t *testing.T) { } // Test writing the recovery instructions. - if err = WriteRecoveryInstructions(passphrase, recoveryFile); err != nil { + if err = WriteRecoveryInstructions(passphrase, recoveryProtector, policy, + recoveryFile); err != nil { t.Fatal(err) } contentsBytes, err := ioutil.ReadFile(recoveryFile) -- cgit v1.3