Revert "Two phases to set the password for disk encryption"
This reverts commit 92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4.
Bug: 28694324
Change-Id: Ibbbaff287f4dd28f4a13e122a3617987a8875a44
diff --git a/Ext4Crypt.h b/Ext4Crypt.h
index 2dcc197..89cfbab 100644
--- a/Ext4Crypt.h
+++ b/Ext4Crypt.h
@@ -28,9 +28,8 @@
bool e4crypt_init_user0();
bool e4crypt_vold_create_user_key(userid_t user_id, int serial, bool ephemeral);
bool e4crypt_destroy_user_key(userid_t user_id);
-bool e4crypt_add_user_key_auth(userid_t user_id, int serial, const char* token,
- const char* secret);
-bool e4crypt_fixate_newest_user_key_auth(userid_t user_id);
+bool e4crypt_change_user_key(userid_t user_id, int serial, const char* token,
+ const char* old_secret, const char* new_secret);
bool e4crypt_unlock_user_key(userid_t user_id, int serial, const char* token, const char* secret);
bool e4crypt_lock_user_key(userid_t user_id);