* grub-core/disk/geli.c (geli_rekey): Fix error return type.

diff --git a/ChangeLog b/ChangeLog
index 3c09c50e5b260fdc4d8b25c4054e9061f61fc7e0..fb8e248893a1290533237945a92c45c98f6e8488 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/geli.c (geli_rekey): Fix error return type.
+
 2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/usbms.c (grub_usbms_cbi_cmd): Fix error type.

diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
index c4864dc1b30dd0e25d6651646935ada405599984..3050727782cde948f5aebfc286bab123f531b6c0 100644 (file)
--- a/grub-core/disk/geli.c
+++ b/grub-core/disk/geli.c
@@ -153,7 +153,7 @@ geli_rekey (struct grub_cryptodisk *dev, grub_uint64_t zoneno)
   gcry_err = grub_crypto_hmac_buffer (dev->hash, dev->rekey_key, 64,
                                      &tohash, sizeof (tohash), key);
   if (gcry_err)
-    return grub_crypto_gcry_error (gcry_err);
+    return gcry_err;
 
   return grub_cryptodisk_setkey (dev, (grub_uint8_t *) key,
                                 dev->rekey_derived_size);