* grub-core/fs/zfs/zfscrypt.c (grub_ccm_decrypt): Return right error type

Cherry-picked from upstream commit
8b66bb5d8d347a537738 ("* grub-core/fs/zfs/zfscrypt.c (grub_ccm_decrypt):
Return right error type")

Signed-off-by: Ani Sinha <ani@anisinha.ca>

Author: ani-sinha

grub-core/fs/zfs/zfscrypt.c

@@ -143,7 +143,7 @@ grub_ccm_decrypt (grub_crypto_cipher_handle_t cipher,
     return err;
   if (mac_out)
     grub_crypto_xor (mac_out, mac, mul, m);
-  return GRUB_ERR_NONE;
+  return GPG_ERR_NO_ERROR;
 }
 
 static void
@@ -244,7 +244,7 @@ grub_gcm_decrypt (grub_crypto_cipher_handle_t cipher,
   if (mac_out)
     grub_crypto_xor (mac_out, mac, mac_xor, m);
 
-  return GRUB_ERR_NONE;
+  return GPG_ERR_NO_ERROR;
 }
 
 
@@ -263,8 +263,7 @@ algo_decrypt (grub_crypto_cipher_handle_t cipher, grub_uint64_t algo,
       return grub_gcm_decrypt (cipher, out, in, psize, mac_out, nonce,
 			       15 - l, m);
     default:
-      return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "algorithm %" 
-			 PRIuGRUB_UINT64_T " is not supported yet", algo);
+      return GPG_ERR_CIPHER_ALGO;
     }
 }
 
@@ -279,7 +278,7 @@ grub_zfs_decrypt_real (grub_crypto_cipher_handle_t cipher,
   grub_uint32_t mac[4];
   unsigned i;
   grub_uint32_t sw[4];
-  grub_err_t err;
+  gcry_err_code_t err;
 
   grub_memcpy (sw, nonce, 16);
   if (endian != GRUB_ZFS_BIG_ENDIAN)
@@ -295,7 +294,7 @@ grub_zfs_decrypt_real (grub_crypto_cipher_handle_t cipher,
 		      size, mac,
 		      sw + 1, 3, 12);
   if (err)
-    return err;
+    return grub_crypto_gcry_error (err);
 
   for (i = 0; i < 3; i++)
     if (grub_zfs_to_cpu32 (expected_mac[i], endian)