From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 24 Apr 2011 00:36:50 +0000 (+0200)
Subject: accept version 2 geli
X-Git-Tag: 2.00~1164^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972d86df5f68efecb9952fa994aa851bae44aa28;p=thirdparty%2Fgrub.git

accept version 2 geli
---

diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
index 565498ece..7d0c8621f 100644
--- a/grub-core/disk/geli.c
+++ b/grub-core/disk/geli.c
@@ -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;