diff options
| author | Eric Biggers <ebiggers@google.com> | 2021-09-14 14:12:39 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers3@gmail.com> | 2021-10-05 15:30:30 -0700 |
| commit | 7fed63a84963cbd790e86a0e59ff14724bcf33c4 (patch) | |
| tree | 246e2f723ba3cd7ed3a76e4b8698b1913edabc11 /cmd/fscrypt/format.go | |
| parent | 4d20c7b6eda7f4e9f25442e0ec48bdf5f959853b (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 'cmd/fscrypt/format.go')
| -rw-r--r-- | cmd/fscrypt/format.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) |