Do not ignore errors in crypto backend (LUKS AF).

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@453 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/lib/loopaes/loopaes.c b/lib/loopaes/loopaes.c
index 3f0f05584233498a2cc5b12f8d02ddac46560952..115814e452ed07bef375db99b07e1203e84cb2c1 100644 (file)
--- a/lib/loopaes/loopaes.c
+++ b/lib/loopaes/loopaes.c
@@ -62,7 +62,7 @@ static int hash_key(const char *src, size_t src_len,
        r = crypt_hash_write(hd, src, src_len);
        if (!r)
                r = crypt_hash_final(hd, dst, dst_len);
-out:
+
        crypt_hash_destroy(hd);
        return r;
 }

diff --git a/lib/luks1/af.c b/lib/luks1/af.c
index 461a5a19933d535ecaa7075717109b4bc6db7084..9b99604bb53a716d65db1cfbd7ae367217621903 100644 (file)
--- a/lib/luks1/af.c
+++ b/lib/luks1/af.c
@@ -42,15 +42,22 @@ static int hash_buf(const char *src, char *dst, uint32_t iv,
 {
        struct crypt_hash *hd = NULL;
        char *iv_char = (char *)&iv;
+       int r;
 
        iv = htonl(iv);
        if (crypt_hash_init(&hd, hash_name))
-               return 1;
-       crypt_hash_write(hd, iv_char, sizeof(uint32_t));
-       crypt_hash_write(hd, src, len);
-       crypt_hash_final(hd, dst, len);
+               return -EINVAL;
+
+       if ((r = crypt_hash_write(hd, iv_char, sizeof(uint32_t))))
+               goto out;
+       
+       if ((r = crypt_hash_write(hd, src, len)))
+               goto out;
+       
+       r = crypt_hash_final(hd, dst, len);
+out:
        crypt_hash_destroy(hd);
-       return 0;
+       return r;
 }
 
 /* diffuse: Information spreading over the whole dataset with