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 --- cmd/fscrypt/format.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/fscrypt/format.go') diff --git a/cmd/fscrypt/format.go b/cmd/fscrypt/format.go index fc10d31..28cc22d 100644 --- a/cmd/fscrypt/format.go +++ b/cmd/fscrypt/format.go @@ -65,7 +65,7 @@ func init() { // We use the width of the terminal unless we cannot get the width. width, _, err := term.GetSize(int(os.Stdout.Fd())) - if err != nil { + if err != nil || width <= 0 { lineLength = fallbackLineLength } else { lineLength = util.MinInt(width, maxLineLength) -- cgit v1.2.3