summaryrefslogtreecommitdiffstats
path: root/cryptfs.h
diff options
context:
space:
mode:
authorKen Sumrall <ksumrall@android.com>2011-02-01 15:46:41 -0800
committerKen Sumrall <ksumrall@android.com>2011-02-01 15:46:41 -0800
commit7f7dbaa2784c10fd2989fb303e5edfb8136d53dc (patch)
tree07ff71d0fb7f169a6612dde12b7e53ca61cf5a72 /cryptfs.h
parentd33d417e3a057fffad22c23f5f002177531db2a5 (diff)
downloadsystem_vold-7f7dbaa2784c10fd2989fb303e5edfb8136d53dc.zip
system_vold-7f7dbaa2784c10fd2989fb303e5edfb8136d53dc.tar.gz
system_vold-7f7dbaa2784c10fd2989fb303e5edfb8136d53dc.tar.bz2
Improve detection of incomplete encryption
Bug 3384231 is punted to MR1, but the code to set the flag is already in the tree, so this CL does 3 things: 1. Comments out the lines that set the flag 2. Removes the change to the checkpw that was added in the last change. 3. Implements a new command to check the flag (which no one is calling yet and the flag won't be set anyhow). When MR1 comes, it will be a simple matter to enable the flag setting code and start testing it. The fear is a false positive detection of incomplete encryption could cause people to be prompted to wipe their data when MR1 comes out and the flag is checked. Not setting this for first release, and testing this more before MR1, will give us confidence that the code will not detect false positives of encryption failure. Change-Id: I6dfba11646e291fe5867e8375b71a53c815f3968
Diffstat (limited to 'cryptfs.h')
-rw-r--r--cryptfs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cryptfs.h b/cryptfs.h
index caf99a4..bb461ac 100644
--- a/cryptfs.h
+++ b/cryptfs.h
@@ -61,6 +61,7 @@ struct crypt_mnt_ftr {
#ifdef __cplusplus
extern "C" {
#endif
+ int cryptfs_crypto_complete(void);
int cryptfs_check_passwd(char *pw);
int cryptfs_restart(void);
int cryptfs_enable(char *flag, char *passwd);