]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
accept version 2 geli
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 24 Apr 2011 00:36:50 +0000 (02:36 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 24 Apr 2011 00:36:50 +0000 (02:36 +0200)
grub-core/disk/geli.c

index 565498ece67bed38fa2d1ae513f8ba656c1ec614..7d0c8621ffdd6a6260d459cb28d42570842f71af 100644 (file)
@@ -107,7 +107,8 @@ configure_ciphers (const struct grub_geli_phdr *header)
 
   /* Look for GELI magic sequence.  */
   if (grub_memcmp (header->magic, GELI_MAGIC, sizeof (GELI_MAGIC))
-      || grub_le_to_cpu32 (header->version) != 3)
+      || grub_le_to_cpu32 (header->version) > 3
+      || grub_le_to_cpu32 (header->version) < 2)
     {
       grub_dprintf ("geli", "wrong magic %02x\n", header->magic[0]);
       return NULL;