From 5d17fd0fec407da58e15792181555f065a5c0791 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 7 Nov 2013 00:57:21 +0100 Subject: [PATCH] * grub-core/disk/geli.c (geli_rekey): Fix error return type. --- ChangeLog | 4 ++++ grub-core/disk/geli.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3c09c50e5..fb8e24889 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-07 Vladimir Serbinenko + + * grub-core/disk/geli.c (geli_rekey): Fix error return type. + 2013-11-07 Vladimir Serbinenko * 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 c4864dc1b..305072778 100644 --- 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); -- 2.47.2