From aaccfac3442ab48f5f94603c07427cc1bb00e12d Mon Sep 17 00:00:00 2001
From: Paul Lawrence <paullawrence@google.com>
Date: Mon, 4 May 2015 15:48:24 -0700
Subject: [PATCH] Simplify password checking logic

Bug: 18151196
Change-Id: I07ffde534dee7d1032149cfcbaa1a61c5246d759
---
 Ext4Crypt.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 0f6af6b..61edfeb 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -217,8 +217,7 @@ int e4crypt_change_password(const char* path, int crypt_type,
                             const char* password)
 {
     SLOGI("e4crypt_change_password");
-
-    UnencryptedProperties key_props = GetProps(path).GetChild(properties::key);
+    auto key_props = GetProps(path).GetChild(properties::key);
 
     crypt_mnt_ftr ftr;
     if (get_crypt_ftr_and_key(ftr, key_props)) {
@@ -259,8 +258,7 @@ int e4crypt_change_password(const char* path, int crypt_type,
 int e4crypt_crypto_complete(const char* path)
 {
     SLOGI("ext4 crypto complete called on %s", path);
-    UnencryptedProperties key_props
-        = GetPropsOrAltProps(path).GetChild(properties::key);
+    auto key_props = GetPropsOrAltProps(path).GetChild(properties::key);
     if (key_props.Get<std::string>(tag::master_key).empty()) {
         SLOGI("No master key, so not ext4enc");
         return -1;
@@ -289,12 +287,8 @@ static std::string generate_key_ref(const char* key, int length)
 int e4crypt_check_passwd(const char* path, const char* password)
 {
     SLOGI("e4crypt_check_password");
-
-    // ext4enc:TODO once we have password checking, fix this to be
-    // GetKeyOrAltKey
-    UnencryptedProperties props = *password ? GetAltProps(path)
-                                            : GetProps(path);
-    UnencryptedProperties key_props = props.GetChild(properties::key);
+    auto props = GetPropsOrAltProps(path);
+    auto key_props = props.GetChild(properties::key);
 
     crypt_mnt_ftr ftr;
     if (get_crypt_ftr_and_key(ftr, key_props)) {