commit 07987073341e7f49d49b287e265f7dee4ae3081c
author Paul Lawrence <paullawrence@google.com> Mon Mar 24 17:51:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 24 17:51:59 2014 +0000
tree 4060cb5286bf74d1a1ceb09e7271287955a9da43
parent cc215381dd5003b1d6c6b32c1745f8c06fb8a499
parent 8561b5c9f5d2f9c5e3f8e2963bdffe9ff3706b04

Merge "Fix setfield/getfield"

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 5a9a4da..3d0f30b 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -538,7 +538,8 @@
         return -1;
     }
 
-    if ((crypt_ftr.major_version != 1) || (crypt_ftr.minor_version != 1)) {
+    if ((crypt_ftr.major_version < 1)
+        || (crypt_ftr.major_version == 1 && crypt_ftr.minor_version < 1)) {
         SLOGE("Crypt_ftr version doesn't support persistent data");
         return -1;
     }
@@ -619,7 +620,8 @@
         return -1;
     }
 
-    if ((crypt_ftr.major_version != 1) || (crypt_ftr.minor_version != 1)) {
+    if ((crypt_ftr.major_version < 1)
+        || (crypt_ftr.major_version == 1 && crypt_ftr.minor_version < 1)) {
         SLOGE("Crypt_ftr version doesn't support persistent data");
         return -1;
     }