Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[platform/kernel/linux-exynos.git] / fs / crypto / fname.c

diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
index 5e4ddee..5d6d491 100644 (file)
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
@@ -10,11 +10,8 @@
  * This has not yet undergone a rigorous security audit.
  */
 
-#include <crypto/hash.h>
-#include <crypto/sha.h>
 #include <keys/encrypted-type.h>
 #include <keys/user-type.h>
-#include <linux/crypto.h>
 #include <linux/scatterlist.h>
 #include <linux/ratelimit.h>
 #include <linux/fscrypto.h>
@@ -48,10 +45,10 @@ static int fname_encrypt(struct inode *inode,
                        const struct qstr *iname, struct fscrypt_str *oname)
 {
        u32 ciphertext_len;
-       struct ablkcipher_request *req = NULL;
+       struct skcipher_request *req = NULL;
        DECLARE_FS_COMPLETION_RESULT(ecr);
        struct fscrypt_info *ci = inode->i_crypt_info;
-       struct crypto_ablkcipher *tfm = ci->ci_ctfm;
+       struct crypto_skcipher *tfm = ci->ci_ctfm;
        int res = 0;
        char iv[FS_CRYPTO_BLOCK_SIZE];
        struct scatterlist src_sg, dst_sg;
@@ -78,14 +75,14 @@ static int fname_encrypt(struct inode *inode,
        }
 
        /* Allocate request */
-       req = ablkcipher_request_alloc(tfm, GFP_NOFS);
+       req = skcipher_request_alloc(tfm, GFP_NOFS);
        if (!req) {
                printk_ratelimited(KERN_ERR
                        "%s: crypto_request_alloc() failed\n", __func__);
                kfree(alloc_buf);
                return -ENOMEM;
        }
-       ablkcipher_request_set_callback(req,
+       skcipher_request_set_callback(req,
                        CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,
                        dir_crypt_complete, &ecr);
 
@@ -100,14 +97,14 @@ static int fname_encrypt(struct inode *inode,
        /* Create encryption request */
        sg_init_one(&src_sg, workbuf, ciphertext_len);
        sg_init_one(&dst_sg, oname->name, ciphertext_len);
-       ablkcipher_request_set_crypt(req, &src_sg, &dst_sg, ciphertext_len, iv);
-       res = crypto_ablkcipher_encrypt(req);
+       skcipher_request_set_crypt(req, &src_sg, &dst_sg, ciphertext_len, iv);
+       res = crypto_skcipher_encrypt(req);
        if (res == -EINPROGRESS || res == -EBUSY) {
                wait_for_completion(&ecr.completion);
                res = ecr.res;
        }
        kfree(alloc_buf);
-       ablkcipher_request_free(req);
+       skcipher_request_free(req);
        if (res < 0)
                printk_ratelimited(KERN_ERR
                                "%s: Error (error code %d)\n", __func__, res);
@@ -127,11 +124,11 @@ static int fname_decrypt(struct inode *inode,
                                const struct fscrypt_str *iname,
                                struct fscrypt_str *oname)
 {
-       struct ablkcipher_request *req = NULL;
+       struct skcipher_request *req = NULL;
        DECLARE_FS_COMPLETION_RESULT(ecr);
        struct scatterlist src_sg, dst_sg;
        struct fscrypt_info *ci = inode->i_crypt_info;
-       struct crypto_ablkcipher *tfm = ci->ci_ctfm;
+       struct crypto_skcipher *tfm = ci->ci_ctfm;
        int res = 0;
        char iv[FS_CRYPTO_BLOCK_SIZE];
        unsigned lim;
@@ -141,13 +138,13 @@ static int fname_decrypt(struct inode *inode,
                return -EIO;
 
        /* Allocate request */
-       req = ablkcipher_request_alloc(tfm, GFP_NOFS);
+       req = skcipher_request_alloc(tfm, GFP_NOFS);
        if (!req) {
                printk_ratelimited(KERN_ERR
                        "%s: crypto_request_alloc() failed\n",  __func__);
                return -ENOMEM;
        }
-       ablkcipher_request_set_callback(req,
+       skcipher_request_set_callback(req,
                CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,
                dir_crypt_complete, &ecr);
 
@@ -157,13 +154,13 @@ static int fname_decrypt(struct inode *inode,
        /* Create decryption request */
        sg_init_one(&src_sg, iname->name, iname->len);
        sg_init_one(&dst_sg, oname->name, oname->len);
-       ablkcipher_request_set_crypt(req, &src_sg, &dst_sg, iname->len, iv);
-       res = crypto_ablkcipher_decrypt(req);
+       skcipher_request_set_crypt(req, &src_sg, &dst_sg, iname->len, iv);
+       res = crypto_skcipher_decrypt(req);
        if (res == -EINPROGRESS || res == -EBUSY) {
                wait_for_completion(&ecr.completion);
                res = ecr.res;
        }
-       ablkcipher_request_free(req);
+       skcipher_request_free(req);
        if (res < 0) {
                printk_ratelimited(KERN_ERR
                                "%s: Error (error code %d)\n", __func__, res);