commit 8c008397141bf9a7d619eb2c53452bf3e397da39
author Paul Lawrence <paullawrence@google.com> Tue May 06 14:02:48 2014 -0700
committer Kenny Root <kroot@google.com> Tue May 06 22:16:16 2014 +0000
tree 6d6851b44a24d8f6f9bfcbfd47589c523c8fbdc6
parent 8ee0410a4d2557442bc7278d6b953ed423993ec3

Fix encryption on Nakasi

We need to make sure we don't try to read the flags on keymaster
version 2 or below, or we get random junk.

Requires
  https://googleplex-android-review.git.corp.google.com/#/c/460689/

Bug: 14384714
Change-Id: I5a4ede1bec0347b8319cedaae6535201c122cf48

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 493a670..0648231 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -121,6 +121,14 @@
         goto out;
     }
 
+    SLOGI("keymaster version is %d", keymaster_dev->common.module->module_api_version);
+
+    if (keymaster_dev->common.module->module_api_version
+            < KEYMASTER_MODULE_API_VERSION_0_3) {
+        rc = 0;
+        goto out;
+    }
+
     if (keymaster_dev->flags & KEYMASTER_BLOBS_ARE_STANDALONE) {
         rc = 1;
     }