commit c96a5f8edf65a8abe441d0cfd3ce227bdf1bf55f
author Kenny Root <kroot@google.com> Fri Jun 14 12:08:28 2013 -0700
committer Kenny Root <kroot@google.com> Fri Jun 14 12:50:02 2013 -0700
tree a73bea20c00e3ec16a3a3278723801d2d22f9ca6
parent 7434b3111b80d2b84ddf656b66b7bf6591de5ab6

Extract some version constants to header

In order to make it easier to upgrade the crypto footer, extract some
constants to a header file instead. Then the header can control what the
current version is and the upgrade_crypto_ftr code should be the only
thing that needs to be updated.

Change-Id: I3ed5a7d3b640419cd8af91388d94a00de8cc09db

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index c938402..fd3246b 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -339,21 +339,21 @@
     goto errout;
   }
 
-  if (crypt_ftr->major_version != 1) {
-    SLOGE("Cannot understand major version %d real block device footer\n",
-          crypt_ftr->major_version);
+  if (crypt_ftr->major_version != CURRENT_MAJOR_VERSION) {
+    SLOGE("Cannot understand major version %d real block device footer; expected %d\n",
+          crypt_ftr->major_version, CURRENT_MAJOR_VERSION);
     goto errout;
   }
 
-  if ((crypt_ftr->minor_version != 0) && (crypt_ftr->minor_version != 1)) {
-    SLOGW("Warning: crypto footer minor version %d, expected 0 or 1, continuing...\n",
-          crypt_ftr->minor_version);
+  if (crypt_ftr->minor_version > CURRENT_MINOR_VERSION) {
+    SLOGW("Warning: crypto footer minor version %d, expected <= %d, continuing...\n",
+          crypt_ftr->minor_version, CURRENT_MINOR_VERSION);
   }
 
   /* If this is a verion 1.0 crypt_ftr, make it a 1.1 crypt footer, and update the
    * copy on disk before returning.
    */
-  if (crypt_ftr->minor_version == 0) {
+  if (crypt_ftr->minor_version < CURRENT_MINOR_VERSION) {
     upgrade_crypt_ftr(fd, crypt_ftr, starting_off);
   }
 
@@ -1282,8 +1282,8 @@
 
     memset(ftr, 0, sizeof(struct crypt_mnt_ftr));
     ftr->magic = CRYPT_MNT_MAGIC;
-    ftr->major_version = 1;
-    ftr->minor_version = 1;
+    ftr->major_version = CURRENT_MAJOR_VERSION;
+    ftr->minor_version = CURRENT_MINOR_VERSION;
     ftr->ftr_size = sizeof(struct crypt_mnt_ftr);
     ftr->keysize = KEY_LEN_BYTES;