[PATCH 2/4] luks2: Add error message strings to crypto errors

[Glenn Washburn]

Signed-off-by: Glenn Washburn <developm...@efficientek.com>
---
 grub-core/disk/luks2.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
index 199e11473..4b259cbdb 100644
--- a/grub-core/disk/luks2.c
+++ b/grub-core/disk/luks2.c
@@ -411,7 +411,8 @@ luks2_verify_key (grub_luks2_digest_t *d, grub_uint8_t 
*candidate_key,
                                 d->iterations,
                                 candidate_digest, digestlen);
   if (gcry_ret)
-    return grub_crypto_gcry_error (gcry_ret);
+    return grub_error (grub_crypto_gcry_error (gcry_ret),
+                      "grub_crypto_pbkdf2 failed with code %d", gcry_ret);
 
   if (grub_memcmp (candidate_digest, digest, digestlen) != 0)
     return grub_error (GRUB_ERR_ACCESS_DENIED, "Mismatching digests");
@@ -463,7 +464,8 @@ luks2_decrypt_key (grub_uint8_t *out_key,
                                       area_key, k->area.key_size);
        if (gcry_ret)
          {
-           ret = grub_crypto_gcry_error (gcry_ret);
+           ret = grub_error (grub_crypto_gcry_error (gcry_ret),
+                             "grub_crypto_pbkdf2 failed with code %d", 
gcry_ret);
            goto err;
          }
 
@@ -484,7 +486,8 @@ luks2_decrypt_key (grub_uint8_t *out_key,
   gcry_ret = grub_cryptodisk_setkey (crypt, area_key, k->area.key_size);
   if (gcry_ret)
     {
-      ret = grub_crypto_gcry_error (gcry_ret);
+      ret = grub_error (grub_crypto_gcry_error (gcry_ret),
+                       "grub_cryptodisk_setkey failed with code %d", gcry_ret);
       goto err;
     }
 
@@ -512,7 +515,8 @@ luks2_decrypt_key (grub_uint8_t *out_key,
                                      GRUB_LUKS1_LOG_SECTOR_SIZE);
   if (gcry_ret)
     {
-      ret = grub_crypto_gcry_error (gcry_ret);
+      ret = grub_error (grub_crypto_gcry_error (gcry_ret),
+                       "grub_cryptodisk_decrypt failed with code %d", 
gcry_ret);
       goto err;
     }
 
@@ -529,7 +533,8 @@ luks2_decrypt_key (grub_uint8_t *out_key,
   gcry_ret = AF_merge (hash, split_key, out_key, k->key_size, k->af.stripes);
   if (gcry_ret)
     {
-      ret = grub_crypto_gcry_error (gcry_ret);
+      ret = grub_error (grub_crypto_gcry_error (gcry_ret),
+                       "AF_merge failed with code %d", gcry_ret);
       goto err;
     }
 
@@ -770,7 +775,8 @@ luks2_recover_key (grub_disk_t source,
   gcry_ret = grub_cryptodisk_setkey (crypt, candidate_key, candidate_key_len);
   if (gcry_ret)
     {
-      ret = grub_crypto_gcry_error (gcry_ret);
+      ret = grub_error (grub_crypto_gcry_error (gcry_ret),
+                       "grub_cryptodisk_setkey failed with code %d", gcry_ret);
       goto err;
     }
 
-- 
2.27.0


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel