diff options
author | Yang Yingliang <yangyingliang@huawei.com> | 2020-02-13 12:11:26 +0800 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2020-03-24 11:17:33 -0400 |
commit | 3fd53533a8bcc5a7f1fa275e28dfb6b05f28a941 (patch) | |
tree | 6acff14f0c0042ce29f513d47bb139e48c8be72f /drivers/md/dm-crypt.c | |
parent | fb33c6510d5595144d585aa194d377cf74d31911 (diff) | |
download | linux-stable-3fd53533a8bcc5a7f1fa275e28dfb6b05f28a941.tar.gz linux-stable-3fd53533a8bcc5a7f1fa275e28dfb6b05f28a941.tar.bz2 linux-stable-3fd53533a8bcc5a7f1fa275e28dfb6b05f28a941.zip |
dm crypt: use crypt_integrity_aead() helper
Replace test_bit(CRYPT_MODE_INTEGRITY_AEAD, XXX) with
crypt_integrity_aead().
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-crypt.c')
-rw-r--r-- | drivers/md/dm-crypt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index c6a529873d0f..3df90daba89e 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -230,6 +230,8 @@ static void kcryptd_queue_crypt(struct dm_crypt_io *io); static struct scatterlist *crypt_get_sg_data(struct crypt_config *cc, struct scatterlist *sg); +static bool crypt_integrity_aead(struct crypt_config *cc); + /* * Use this to access cipher attributes that are independent of the key. */ @@ -346,7 +348,7 @@ static int crypt_iv_benbi_ctr(struct crypt_config *cc, struct dm_target *ti, unsigned bs; int log; - if (test_bit(CRYPT_MODE_INTEGRITY_AEAD, &cc->cipher_flags)) + if (crypt_integrity_aead(cc)) bs = crypto_aead_blocksize(any_tfm_aead(cc)); else bs = crypto_skcipher_blocksize(any_tfm(cc)); @@ -712,7 +714,7 @@ static int crypt_iv_random_gen(struct crypt_config *cc, u8 *iv, static int crypt_iv_eboiv_ctr(struct crypt_config *cc, struct dm_target *ti, const char *opts) { - if (test_bit(CRYPT_MODE_INTEGRITY_AEAD, &cc->cipher_flags)) { + if (crypt_integrity_aead(cc)) { ti->error = "AEAD transforms not supported for EBOIV"; return -EINVAL; } |