diff options
Diffstat (limited to 'cli-tests')
| -rw-r--r-- | cli-tests/t_encrypt.out | 4 | ||||
| -rw-r--r-- | cli-tests/t_encrypt_custom.out | 4 | ||||
| -rw-r--r-- | cli-tests/t_encrypt_login.out | 10 | ||||
| -rw-r--r-- | cli-tests/t_encrypt_raw_key.out | 6 | ||||
| -rw-r--r-- | cli-tests/t_lock.out | 8 | ||||
| -rw-r--r-- | cli-tests/t_not_enabled.out | 2 | ||||
| -rw-r--r-- | cli-tests/t_setup.out | 4 | ||||
| -rw-r--r-- | cli-tests/t_unlock.out | 12 | ||||
| -rw-r--r-- | cli-tests/t_v1_policy.out | 14 | ||||
| -rw-r--r-- | cli-tests/t_v1_policy_fs_keyring.out | 6 |
10 files changed, 35 insertions, 35 deletions
diff --git a/cli-tests/t_encrypt.out b/cli-tests/t_encrypt.out index ecdc46b..4de05e4 100644 --- a/cli-tests/t_encrypt.out +++ b/cli-tests/t_encrypt.out @@ -65,7 +65,7 @@ desc2 Yes desc1 "MNT/dir" is encrypted with fscrypt. Policy: desc2 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -82,7 +82,7 @@ desc2 Yes desc1 "MNT/dir" is encrypted with fscrypt. Policy: desc2 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: diff --git a/cli-tests/t_encrypt_custom.out b/cli-tests/t_encrypt_custom.out index ac53d6f..2f1c03c 100644 --- a/cli-tests/t_encrypt_custom.out +++ b/cli-tests/t_encrypt_custom.out @@ -11,7 +11,7 @@ desc2 Yes desc1 "MNT/dir" is encrypted with fscrypt. Policy: desc2 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -40,7 +40,7 @@ desc7 Yes desc6 "MNT/dir" is encrypted with fscrypt. Policy: desc7 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: diff --git a/cli-tests/t_encrypt_login.out b/cli-tests/t_encrypt_login.out index bb91a46..b1f6c82 100644 --- a/cli-tests/t_encrypt_login.out +++ b/cli-tests/t_encrypt_login.out @@ -24,7 +24,7 @@ desc1 No login protector for fscrypt-test-user "MNT/dir" is encrypted with fscrypt. Policy: desc3 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 2 protectors: @@ -76,7 +76,7 @@ desc10 No login protector for fscrypt-test-user "MNT/dir" is encrypted with fscrypt. Policy: desc12 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 2 protectors: @@ -109,7 +109,7 @@ desc19 No login protector for fscrypt-test-user "MNT/dir" is encrypted with fscrypt. Policy: desc21 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 2 protectors: @@ -138,7 +138,7 @@ desc28 No login protector for fscrypt-test-user "MNT/dir" is encrypted with fscrypt. Policy: desc29 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -149,7 +149,7 @@ desc28 Yes (MNT_ROOT) login protector for fscrypt-test-user "MNT_ROOT/dir" is encrypted with fscrypt. Policy: desc34 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: diff --git a/cli-tests/t_encrypt_raw_key.out b/cli-tests/t_encrypt_raw_key.out index 4cfc050..78aa0b7 100644 --- a/cli-tests/t_encrypt_raw_key.out +++ b/cli-tests/t_encrypt_raw_key.out @@ -11,7 +11,7 @@ desc2 Yes desc1 "MNT/dir" is encrypted with fscrypt. Policy: desc2 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -30,7 +30,7 @@ desc7 Yes desc6 "MNT/dir" is encrypted with fscrypt. Policy: desc7 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -66,7 +66,7 @@ desc12 Yes desc11 "MNT/dir" is encrypted with fscrypt. Policy: desc12 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: diff --git a/cli-tests/t_lock.out b/cli-tests/t_lock.out index 0da8964..d630e74 100644 --- a/cli-tests/t_lock.out +++ b/cli-tests/t_lock.out @@ -3,7 +3,7 @@ "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -24,7 +24,7 @@ Enter custom passphrase for protector "prot": "MNT/dir" is now unlocked and read "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -48,7 +48,7 @@ Then re-run: "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Partially (incompletely locked) Protected with 1 protector: @@ -66,7 +66,7 @@ bash: MNT/dir/file2: Required key not available "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: No Protected with 1 protector: diff --git a/cli-tests/t_not_enabled.out b/cli-tests/t_not_enabled.out index 4553891..07c9aa3 100644 --- a/cli-tests/t_not_enabled.out +++ b/cli-tests/t_not_enabled.out @@ -55,7 +55,7 @@ for more details. "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: diff --git a/cli-tests/t_setup.out b/cli-tests/t_setup.out index 6ea03e3..ab0052c 100644 --- a/cli-tests/t_setup.out +++ b/cli-tests/t_setup.out @@ -45,7 +45,7 @@ https://github.com/google/fscrypt#setting-up-fscrypt-on-a-filesystem) [y/N] Meta Run "sudo fscrypt setup" to create this file. # bad config file -[ERROR] fscrypt setup: "FSCRYPT_CONF" is invalid: invalid - character 'b' looking for beginning of value +[ERROR] fscrypt setup: "FSCRYPT_CONF" is invalid: proto: + syntax error (line 1:1): invalid value bad Either fix this file manually, or run "sudo fscrypt setup" to recreate it. diff --git a/cli-tests/t_unlock.out b/cli-tests/t_unlock.out index 25430a0..b3c9b2a 100644 --- a/cli-tests/t_unlock.out +++ b/cli-tests/t_unlock.out @@ -5,7 +5,7 @@ "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: No Protected with 1 protector: @@ -23,7 +23,7 @@ Enter custom passphrase for protector "prot": "MNT/dir" is now unlocked and read "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -39,7 +39,7 @@ desc1 Yes desc2 "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: No Protected with 1 protector: @@ -55,7 +55,7 @@ desc1 No desc2 "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: No Protected with 1 protector: @@ -69,7 +69,7 @@ Enter custom passphrase for protector "prot": "MNT/dir" is now unlocked and read "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:2 Unlocked: Yes Protected with 1 protector: @@ -83,7 +83,7 @@ desc1 Yes desc2 # Try to unlock with corrupt policy metadata [ERROR] fscrypt unlock: fscrypt metadata file at "MNT/.fscrypt/policies/desc1" - is corrupt: unexpected EOF + is corrupt: proto: cannot parse invalid wire-format data # Try to unlock with missing policy metadata [ERROR] fscrypt unlock: filesystem "MNT" does not contain diff --git a/cli-tests/t_v1_policy.out b/cli-tests/t_v1_policy.out index 2353527..f14f357 100644 --- a/cli-tests/t_v1_policy.out +++ b/cli-tests/t_v1_policy.out @@ -30,7 +30,7 @@ problem in your PAM stack, enable pam_keyinit.so, or run "keyctl link @u @s". "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: Yes Protected with 1 protector: @@ -41,7 +41,7 @@ desc2 No custom protector "prot" "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: Partially (incompletely locked, or unlocked by another user) Protected with 1 protector: @@ -59,7 +59,7 @@ directories in an accessible state). "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: Yes Protected with 1 protector: @@ -77,7 +77,7 @@ use --user=root. "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: Yes Protected with 1 protector: @@ -90,7 +90,7 @@ Encrypted data removed from filesystem cache. "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: No Protected with 1 protector: @@ -114,7 +114,7 @@ Then re-run: "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: Partially (incompletely locked, or unlocked by another user) Protected with 1 protector: @@ -135,7 +135,7 @@ Encrypted data removed from filesystem cache. "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: No Protected with 1 protector: diff --git a/cli-tests/t_v1_policy_fs_keyring.out b/cli-tests/t_v1_policy_fs_keyring.out index cfc8f7c..9f0f0ab 100644 --- a/cli-tests/t_v1_policy_fs_keyring.out +++ b/cli-tests/t_v1_policy_fs_keyring.out @@ -17,7 +17,7 @@ re-create your encrypted directories using v2 encryption policies rather than v1 "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: No Protected with 1 protector: @@ -40,7 +40,7 @@ Enter custom passphrase for protector "prot": "MNT/dir" is now unlocked and read "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: Yes Protected with 1 protector: @@ -63,7 +63,7 @@ cat: MNT/dir/file: No such file or directory "MNT/dir" is encrypted with fscrypt. Policy: desc1 -Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 +Options: padding:32 contents:AES_256_XTS filenames:AES_256_CTS policy_version:1 Unlocked: No Protected with 1 protector: |