commit c0c0f3e82729cac76992c9355e05f8caf07f21ab
author Michael Bestas <mkbestas@lineageos.org> Sun Mar 03 01:33:52 2019 +0200
committer pimpmaneaton <shaunsibu@gmail.com> Mon Jun 24 18:43:23 2019 -0600
tree 6dec5afc4f55a04ef13e1ac12bcd11ebc87d805c
parent d68b38b4e02a7ab039a78857378a8767f9d0321b

cryptfs_hw: Cleanup should_use_keymaster

* Remove duplicated logic

Change-Id: I7a644b2bb7954c9491d6111b3d9614fd9d6ac64b

cryptfs_hw.c

diff --git a/cryptfs_hw.c b/cryptfs_hw.c
index 53c3198..fbbd536 100644
--- a/cryptfs_hw.c
+++ b/cryptfs_hw.c
@@ -506,26 +506,15 @@
 
 int should_use_keymaster()
 {
-    int rc = 1;
-#ifdef LEGACY_HW_DISK_ENCRYPTION
-    /*
-     * HW FDE key should be tied to keymaster only if
-     * new Keymaster is available
-     */
-    if (get_keymaster_version() != KEYMASTER_MODULE_API_VERSION_1_0) {
-        SLOGI("Keymaster version is not 1.0");
-        rc = 0;
-    }
-#else
     /*
      * HW FDE key should be tied to keymaster
      * if version is above 0.3. this is to
      * support msm8909 go target.
      */
-     if (get_keymaster_version() == KEYMASTER_MODULE_API_VERSION_0_3) {
+    int rc = 1;
+    if (get_keymaster_version() == KEYMASTER_MODULE_API_VERSION_0_3) {
         SLOGI("Keymaster version is 0.3");
         rc = 0;
-     }
-#endif
-     return rc;
+    }
+    return rc;
 }