commit 8561b5c9f5d2f9c5e3f8e2963bdffe9ff3706b04
author Paul Lawrence <paullawrence@google.com> Mon Mar 17 14:10:51 2014 -0700
committer Paul Lawrence <paullawrence@google.com> Tue Mar 18 10:52:14 2014 -0700
tree 01ed7b35d9ec5e31996670dfd07e57250032375e
parent f8e9569507a641ece6713cb4be072d1d9cfd2dcd

Fix setfield/getfield

Check for versions >= feature version, not equal

Bug: 13526708
Change-Id: Ie07f6334e6b7c5ca0d7f83ba00827a508e2c2963

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index f8d14cf..afa168e 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -516,7 +516,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;
     }
@@ -597,7 +598,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;
     }